rubyのプロンプト仕様を整備

Author: na-trium-144

app/terminal/page.tsx

@@ -60,7 +60,7 @@ const sampleConfig: Record<RuntimeLang, SampleConfig> = {
   },
   ruby: {
     repl: true,
-    replInitContent: '>> puts "Hello, World!"\nHello, World!',
+    replInitContent: 'irb(main):001:0> puts "Hello, World!"\nHello, World!',
     editor: {
       "main.rb": 'puts "Hello, World!"',
     },

app/terminal/repl.tsx

@@ -28,7 +28,9 @@ export type SyntaxStatus = "complete" | "incomplete" | "invalid"; // 構文チ
 export function writeOutput(
   term: Terminal,
   outputs: ReplOutput[],
-  endNewLine: boolean
+  endNewLine: boolean,
+  returnPrefix: string | undefined,
+  language: RuntimeLang
 ) {
   for (let i = 0; i < outputs.length; i++) {
     const output = outputs[i];
@@ -47,6 +49,12 @@ export function writeOutput(
       case "system":
         term.write(systemMessageColor(message));
         break;
+      case "return":
+        if (returnPrefix) {
+          term.write(returnPrefix);
+        }
+        term.write(highlightCodeToAnsi(message, language));
+        break;
       default:
         term.write(message);
         break;
@@ -77,7 +85,7 @@ export function ReplTerminal({
     checkSyntax,
     splitReplExamples,
   } = useRuntime(language);
-  const { tabSize, prompt, promptMore } = langConstants(language);
+  const { tabSize, prompt, promptMore, returnPrefix } = langConstants(language);
   if (!prompt) {
     console.warn(`prompt not defined for language: ${language}`);
   }
@@ -160,12 +168,18 @@ export function ReplTerminal({
   const handleOutput = useCallback(
     (outputs: ReplOutput[]) => {
       if (terminalInstanceRef.current) {
-        writeOutput(terminalInstanceRef.current, outputs, true);
+        writeOutput(
+          terminalInstanceRef.current,
+          outputs,
+          true,
+          returnPrefix,
+          language
+        );
         // 出力が終わったらプロンプトを表示
         updateBuffer(() => [""]);
       }
     },
-    [updateBuffer, terminalInstanceRef]
+    [updateBuffer, terminalInstanceRef, returnPrefix, language]
   );
 
   const keyHandler = useCallback(

app/terminal/runtime.tsx

@@ -30,6 +30,7 @@ export interface LangConstants {
   tabSize: number;
   prompt?: string;
   promptMore?: string;
+  returnPrefix?: string;
 }
 export type RuntimeLang = "python" | "ruby" | "cpp" | "javascript";
 
@@ -99,8 +100,9 @@ export function langConstants(lang: RuntimeLang | AceLang): LangConstants {
     case "ruby":
       return {
         tabSize: 2,
-        prompt: ">> ",
-        promptMore: "?> ",
+        // TODO: 実際のirbのプロンプトは静的でなく、(main)や番号などの動的な表示がある
+        prompt: "irb> ",
+        returnPrefix: "=> ",
       };
     case "javascript":
       return {

app/terminal/worker/ruby.ts

@@ -21,13 +21,17 @@ export function useRuby() {
 function splitReplExamples(content: string): ReplCommand[] {
   const initCommands: { command: string; output: ReplOutput[] }[] = [];
   for (const line of content.split("\n")) {
-    if (line.startsWith(">> ")) {
-      // Ruby IRB uses >> as the prompt
-      initCommands.push({ command: line.slice(3), output: [] });
-    } else if (line.startsWith("?> ")) {
-      // Ruby IRB uses ?> for continuation
+    if (line.startsWith("irb")) {
+      initCommands.push({
+        command: line.slice(line.indexOf(" ") + 1),
+        output: [],
+      });
+    } else if (line.startsWith("=> ")) {
       if (initCommands.length > 0) {
-        initCommands[initCommands.length - 1].command += "\n" + line.slice(3);
+        initCommands[initCommands.length - 1].output.push({
+          type: "return",
+          message: line.slice(3),
+        });
       }
     } else {
       // Lines without prompt are output from the previous command