fix: missing world error failing to parse

bump test wit files to newer versions
Refactor validator

Signed-off-by: Gordon Smith <GordonJSmith@gmail.com>

Author: GordonSmith

.vscode/settings.json

@@ -1,6 +1,7 @@
 {
     "editor.formatOnSave": true,
     "editor.defaultFormatter": "vscode.typescript-language-features",
+    "files.insertFinalNewline": true,
     "editor.codeActionsOnSave": {
         "source.fixAll.eslint": "explicit"
     },
@@ -13,11 +14,11 @@
         "editor.formatOnSave": true
     },
     "[json]": {
-        "editor.defaultFormatter": "vscode.json-language-features",
+        "editor.defaultFormatter": "esbenp.prettier-vscode",
         "editor.formatOnSave": true
     },
     "[jsonc]": {
-        "editor.defaultFormatter": "vscode.json-language-features",
+        "editor.defaultFormatter": "esbenp.prettier-vscode",
         "editor.formatOnSave": true
     }
 }

prettier.config.mjs

@@ -12,4 +12,5 @@ export default {
     semi: true,
     singleQuote: false,
     printWidth: 120,
+    endOfLine: "auto",
 };

src/errorParser.ts

@@ -3,17 +3,22 @@
  */
 
 /**
- * Regex pattern to extract error information from WIT validation errors
- * Groups:
- * 1. Main error message (after "Error: ")
- * 2. Detailed error message (after "Caused by:")
- * 3. File path (from the arrow line)
- * 4. Row number
- * 5. Column number
+ * Regex patterns to extract error information from WIT validation errors
  */
-const witErrorRegex =
+
+/**
+ * Pattern for errors with file location information
+ * Groups: 1=main error, 2=detailed error, 3=file path, 4=row, 5=column
+ */
+const witErrorWithLocationRegex =
     /Error:\s*([^\n]+)(?:\n\nCaused by:\s*\n\s*([^\n]+(?:\n[^\n-]+)*?))?[\s\S]*?-->\s*([^:]+):(\d+):(\d+)/;
 
+/**
+ * Pattern for errors without file location information
+ * Groups: 1=main error
+ */
+const witErrorWithoutLocationRegex = /(?:Error|RuntimeError):\s*([^\n]+)/;
+
 /**
  * Extracts error information from a WIT validation error stack trace
  * @param errorStack - The error stack trace string
@@ -26,19 +31,33 @@ export function extractErrorInfo(errorStack: string): {
     row?: number;
     column?: number;
 } | null {
-    const match = errorStack.match(witErrorRegex);
+    // First try to match errors with file location
+    let match = errorStack.match(witErrorWithLocationRegex);
 
-    if (!match) {
-        return null;
+    if (match) {
+        const [, mainError, detailedError, filePath, rowStr, columnStr] = match;
+        return {
+            mainError: mainError.trim(),
+            detailedError: detailedError?.trim(),
+            filePath: filePath.trim(),
+            row: parseInt(rowStr, 10),
+            column: parseInt(columnStr, 10),
+        };
     }
 
-    const [, mainError, detailedError, filePath, rowStr, columnStr] = match;
+    // If no location match, try simple error format
+    match = errorStack.match(witErrorWithoutLocationRegex);
+
+    if (match) {
+        const [, mainError] = match;
+        return {
+            mainError: mainError.trim(),
+            detailedError: undefined,
+            filePath: undefined,
+            row: undefined,
+            column: undefined,
+        };
+    }
 
-    return {
-        mainError: mainError.trim(),
-        detailedError: detailedError?.trim(),
-        filePath: filePath.trim(),
-        row: parseInt(rowStr, 10),
-        column: parseInt(columnStr, 10),
-    };
+    return null;
 }

src/extension.ts

@@ -1,5 +1,5 @@
 import * as vscode from "vscode";
-import { WitSyntaxValidator } from "./witValidator.js";
+import { WitSyntaxValidator } from "./validator.js";
 
 const builtinTypes = [
     "u8",
@@ -89,20 +89,20 @@ export function activate(context: vscode.ExtensionContext) {
             return;
         }
 
-        await syntaxCheckCurrentFile(activeEditor, validator);
+        await validator.syntaxCheckCurrentFile(activeEditor);
     });
 
     // Register syntax check for workspace command
     const syntaxCheckWorkspaceCommand = vscode.commands.registerCommand("wit-idl.syntaxCheckWorkspace", async () => {
-        await syntaxCheckWorkspace(validator);
+        await validator.syntaxCheckWorkspace();
     });
 
     // Auto-validate on file save
     const onSaveListener = vscode.workspace.onDidSaveTextDocument(async (document) => {
         if (document.languageId === "wit") {
             const editor = vscode.window.visibleTextEditors.find((e) => e.document === document);
             if (editor) {
-                await syntaxCheckCurrentFile(editor, validator);
+                await validator.syntaxCheckCurrentFile(editor);
             }
         }
     });
@@ -112,7 +112,7 @@ export function activate(context: vscode.ExtensionContext) {
         if (document.languageId === "wit") {
             const editor = vscode.window.visibleTextEditors.find((e) => e.document === document);
             if (editor) {
-                await syntaxCheckCurrentFile(editor, validator);
+                await validator.syntaxCheckCurrentFile(editor);
             }
         }
     });
@@ -135,179 +135,6 @@ export function activate(context: vscode.ExtensionContext) {
     );
 }
 
-/**
- * Perform syntax check on the current active WIT file
- * @param editor - The active text editor
- * @param validator - The WIT syntax validator instance
- */
-async function syntaxCheckCurrentFile(editor: vscode.TextEditor, validator: WitSyntaxValidator): Promise<void> {
-    const document = editor.document;
-    const content = document.getText();
-
-    try {
-        // Clear existing diagnostics for this file
-        validator.clearDiagnostics(document.uri);
-
-        // Validate the file
-        const errorInfo = await validator.validate(document.uri.fsPath, content);
-
-        if (errorInfo) {
-            // Create a diagnostic from the error information
-            const diagnostic = createDiagnosticFromError(errorInfo, document);
-
-            // Set the diagnostic for this file
-            validator.getDiagnosticCollection().set(document.uri, [diagnostic]);
-
-            // Show error message
-            vscode.window.showErrorMessage(
-                `WIT Syntax Error in ${vscode.workspace.asRelativePath(document.uri)}: ${errorInfo.mainError}`
-            );
-        } else {
-            // Validation succeeded - show success message
-            vscode.window.showInformationMessage(`WIT file ${vscode.workspace.asRelativePath(document.uri)} is valid`);
-        }
-    } catch (error) {
-        // Handle unexpected errors
-        console.error("Error during WIT validation:", error);
-        vscode.window.showErrorMessage(
-            `Failed to validate WIT file: ${error instanceof Error ? error.message : String(error)}`
-        );
-    }
-}
-
-/**
- * Create a VS Code diagnostic from WIT error information
- * @param errorInfo - The parsed error information
- * @param document - The text document
- * @returns A VS Code diagnostic
- */
-function createDiagnosticFromError(
-    errorInfo: NonNullable<ReturnType<typeof import("./errorParser.js").extractErrorInfo>>,
-    document: vscode.TextDocument
-): vscode.Diagnostic {
-    // Convert 1-based row/column to 0-based for VS Code
-    const line = Math.max(0, (errorInfo.row || 1) - 1);
-    const character = Math.max(0, (errorInfo.column || 1) - 1);
-
-    // Try to get the actual line length for better range highlighting
-    const documentLine = document.lineAt(Math.min(line, document.lineCount - 1));
-    const endCharacter = Math.min(character + 10, documentLine.text.length); // Highlight ~10 characters or to end of line
-
-    const range = new vscode.Range(new vscode.Position(line, character), new vscode.Position(line, endCharacter));
-
-    const message = errorInfo.detailedError || errorInfo.mainError || "Unknown WIT syntax error";
-
-    const diagnostic = new vscode.Diagnostic(range, message, vscode.DiagnosticSeverity.Error);
-
-    // Add additional information
-    diagnostic.source = "wit-syntax";
-    diagnostic.code = "wit-parse-error";
-
-    if (errorInfo.mainError && errorInfo.detailedError) {
-        diagnostic.relatedInformation = [
-            new vscode.DiagnosticRelatedInformation(
-                new vscode.Location(document.uri, range),
-                `Context: ${errorInfo.mainError}`
-            ),
-        ];
-    }
-
-    return diagnostic;
-}
-
-/**
- * Perform syntax check on all WIT files in the workspace
- * @param validator - The WIT syntax validator instance
- */
-async function syntaxCheckWorkspace(validator: WitSyntaxValidator): Promise<void> {
-    const witFiles = await vscode.workspace.findFiles("**/*.wit", "**/node_modules/**");
-
-    if (witFiles.length === 0) {
-        vscode.window.showInformationMessage("No WIT files found in workspace");
-        return;
-    }
-
-    // Clear all existing diagnostics
-    validator.clearAllDiagnostics();
-
-    let totalErrors = 0;
-    let totalFiles = 0;
-    const validFiles: string[] = [];
-    const errorFiles: string[] = [];
-
-    await vscode.window.withProgress(
-        {
-            location: vscode.ProgressLocation.Notification,
-            title: "Checking WIT files syntax...",
-            cancellable: false,
-        },
-        async (progress) => {
-            for (let i = 0; i < witFiles.length; i++) {
-                const file = witFiles[i];
-                const fileName = vscode.workspace.asRelativePath(file);
-
-                progress.report({
-                    message: `Checking ${fileName} (${i + 1}/${witFiles.length})`,
-                    increment: 100 / witFiles.length,
-                });
-
-                try {
-                    const document = await vscode.workspace.openTextDocument(file);
-                    const content = document.getText();
-                    const errorInfo = await validator.validate(document.uri.fsPath, content);
-
-                    totalFiles++;
-
-                    if (errorInfo) {
-                        // Create and set diagnostic
-                        const diagnostic = createDiagnosticFromError(errorInfo, document);
-                        validator.getDiagnosticCollection().set(document.uri, [diagnostic]);
-
-                        totalErrors++;
-                        errorFiles.push(fileName);
-                    } else {
-                        // File is valid
-                        validFiles.push(fileName);
-                    }
-                } catch (error) {
-                    console.error(`Error checking ${fileName}:`, error);
-                    totalErrors++;
-                    errorFiles.push(fileName);
-                }
-            }
-        }
-    );
-
-    // Show summary
-    const validCount = totalFiles - totalErrors;
-    const message = `WIT Syntax Check Complete: ${validCount}/${totalFiles} files valid, ${totalErrors} error(s)`;
-
-    if (totalErrors > 0) {
-        vscode.window.showErrorMessage(message);
-
-        // Show details in output channel
-        const outputChannel = vscode.window.createOutputChannel("WIT Syntax Check");
-        outputChannel.appendLine("WIT Syntax Check Results:");
-        outputChannel.appendLine(`Total files checked: ${totalFiles}`);
-        outputChannel.appendLine(`Valid files: ${validCount}`);
-        outputChannel.appendLine(`Files with errors: ${totalErrors}`);
-
-        if (errorFiles.length > 0) {
-            outputChannel.appendLine("\nFiles with errors:");
-            errorFiles.forEach((file) => outputChannel.appendLine(`  - ${file}`));
-        }
-
-        if (validFiles.length > 0) {
-            outputChannel.appendLine("\nValid files:");
-            validFiles.forEach((file) => outputChannel.appendLine(`  - ${file}`));
-        }
-
-        outputChannel.show();
-    } else {
-        vscode.window.showInformationMessage(message);
-    }
-}
-
 export function deactivate() {
     // Extension cleanup is handled by context.subscriptions
 }