diagnosticディレクトリを削除

Author: na-trium-144

packages/runtime/src/diagnostics/index.ts

@@ -7,8 +7,12 @@ import { loadPyodide } from "pyodide";
 import { version as pyodideVersion } from "pyodide/package.json";
 import type { PyCallable } from "pyodide/ffi";
 import type { WorkerAPI, WorkerCapabilities } from "./runtime";
-import type { Diagnostic, ReplOutput, UpdatedFile } from "../interface";
-import { parsePythonTraceback } from "../diagnostics/python";
+import type {
+  Diagnostic,
+  DiagnosticFrame,
+  ReplOutput,
+  UpdatedFile,
+} from "../interface";
 
 import execfile_py from "./pyodide/execfile.py?raw";
 import check_syntax_py from "./pyodide/check_syntax.py?raw";
@@ -176,7 +180,7 @@ async function runFile(
             .trim(),
         });
         if (onDiagnostic) {
-          const diagnostics = parsePythonTraceback(e.message, HOME);
+          const diagnostics = parsePythonTraceback(e.message);
           for (const diag of diagnostics) {
             await onDiagnostic(diag);
           }
@@ -227,6 +231,95 @@ async function restoreState(): Promise<object> {
   throw new Error("not implemented");
 }
 
+/**
+ * Parses Python error/traceback string into a single Diagnostic with multiple frames.
+ *
+ * @param traceback - The traceback string or error message from Python
+ * @returns Array of Diagnostic objects (at most 1 per error)
+ */
+export function parsePythonTraceback(traceback: string): Diagnostic[] {
+  if (!traceback) return [];
+
+  const lines = traceback.trim().split("\n");
+  if (lines.length === 0) return [];
+
+  // Extract the last error message line (e.g., "Exception: This is a test error" or "SyntaxError: ...")
+  let errorMessage = "";
+  for (let i = lines.length - 1; i >= 0; i--) {
+    const line = lines[i].trim();
+    if (
+      line &&
+      !line.startsWith("^") &&
+      !line.startsWith('File "') &&
+      !line.startsWith("Traceback")
+    ) {
+      errorMessage = line;
+      break;
+    }
+  }
+
+  const frames: DiagnosticFrame[] = [];
+  const fileLineRegex = /File "([^"]+)", line (\d+)(?:, in (.+))?/;
+
+  for (let i = 0; i < lines.length; i++) {
+    const match = fileLineRegex.exec(lines[i]);
+    if (match) {
+      let rawFilename = match[1];
+      const lineNum = parseInt(match[2], 10);
+
+      // Normalize filename by removing homePrefix or leading slashes
+      if (rawFilename.startsWith(HOME)) {
+        rawFilename = rawFilename.slice(HOME.length);
+      }
+      if (rawFilename.startsWith("/")) {
+        rawFilename = rawFilename.replace(/^\/+/, "");
+      }
+
+      // Ignore internal names like <exec>, <string> if not matching normal files
+      if (rawFilename === "<exec>" || rawFilename === "<string>") {
+        continue;
+      }
+
+      // Check if there is a column indicator on subsequent lines (e.g. for SyntaxError with ^)
+      let startColumn: number | undefined = undefined;
+      let endColumn: number | undefined = undefined;
+      for (let j = i + 1; j < Math.min(i + 4, lines.length); j++) {
+        const nextLine = lines[j];
+        if (fileLineRegex.test(nextLine)) break;
+        const caretIndex = nextLine.indexOf("^");
+        if (caretIndex !== -1) {
+          // In Python SyntaxError output, caret points to character (1-indexed)
+          startColumn = caretIndex + 1;
+          const caretEnd = nextLine.lastIndexOf("^");
+          if (caretEnd > caretIndex) {
+            endColumn = caretEnd + 2;
+          }
+          break;
+        }
+      }
+
+      frames.push({
+        filename: rawFilename,
+        startLineNumber: lineNum,
+        startColumn,
+        endLineNumber: lineNum,
+        endColumn,
+      });
+    }
+  }
+
+  if (frames.length === 0) return [];
+
+  // Return a single Diagnostic with all frames (1 error = 1 Diagnostic)
+  return [
+    {
+      frames,
+      message: errorMessage,
+      severity: "error",
+    },
+  ];
+}
+
 const api: WorkerAPI = {
   init,
   runCode,