added tests for problem parser resolver

fixed infinity loop with building command

Author: Ievgenii.Mykhalevskyi

.vscode/launch.json

@@ -25,12 +25,12 @@
             "testConfiguration": "${workspaceFolder}/.vscode-test.mjs",
             "args": [
                 "--extensionDevelopmentPath=${workspaceFolder}",
-                "--extensionTestsPath=${workspaceFolder}/out/test/suite/index"
+                "--extensionTestsPath=${workspaceFolder}/out/test/"
             ],
             "outFiles": [
                 "${workspaceFolder}/out/test/**/*.js"
             ],
-            "preLaunchTask": "${defaultBuildTask}"
+            "preLaunchTask": "npm: pretest"
         },
         {
             "name": "Show IOS",

.vscode/tasks.json

@@ -17,6 +17,22 @@
                 "isDefault": true
             }
         },
+        {
+            "type": "npm",
+            "script": "pretest",
+            "group": "build",
+            "problemMatcher": "$esbuild-watch",
+            "isBackground": true,
+            "label": "npm: pretest",
+            "dependsOn": [
+                "npm: watch:tsc",
+                "npm: watch:esbuild"
+            ],
+            "presentation": {
+                "group": "watch",
+                "reveal": "never"
+            }
+        },
         {
             "type": "npm",
             "script": "watch:esbuild",

CHANGELOG.md

@@ -1,5 +1,11 @@
 # Change Log
 
+## 0.5.9 - 2024-11-20
+
+### Fixed
+
+-   Build was looped at error
+
 ## 0.5.8 - 2024-11-20
 
 ### Fixed

make.sh

@@ -17,4 +17,4 @@ npm run test
 
 vsce package
 
-code --install-extension vscode-ios-0.5.8.vsix
+code --install-extension vscode-ios-0.5.9.vsix

package.json

@@ -45,7 +45,7 @@
     "recommendation": [
         "connor4312.esbuild-problem-matchers"
     ],
-    "version": "0.5.8",
+    "version": "0.5.9",
     "os": [
         "darwin"
     ],

src/ProblemDiagnosticResolver.ts

@@ -18,7 +18,7 @@ export class RawBuildParser {
 }
 
 export class ProblemDiagnosticResolver implements HandleProblemDiagnosticResolver {
-    private static xcodebuild = "xcodebuild";
+    static xcodebuild = "xcodebuild";
     static isSourcekit: SourcePredicate = source => this.xcodebuild !== source;
     static isXcodebuild: SourcePredicate = source => this.xcodebuild === source;
 
@@ -205,7 +205,7 @@ export class ProblemDiagnosticResolver implements HandleProblemDiagnosticResolve
         }
         if (lastErrorIndex !== -1) {
             rawParser.triggerCharacter = "^";
-            const problems = this.parseBuildLog(
+            const problems = parseBuildLog(
                 rawParser.buildLogFile,
                 rawParser.stdout.substring(0, lastErrorIndex + 1),
                 rawParser.numberOfLines
@@ -238,134 +238,138 @@ export class ProblemDiagnosticResolver implements HandleProblemDiagnosticResolve
             this.buildErrors.clear();
         }
     }
+}
 
-    private problemPattern = /^(.*?):(\d+)(?::(\d+))?:\s+(warning|error|note):\s+(.*)$/gm;
-    private problemLinkerPattern = /^(clang):\s+(error):\s+(.*)$/gm;
-    private frameworkErrorPattern = /^(error: )(.*?)$/gm;
+const problemPattern = /^(.*?):(\d+)(?::(\d+))?:\s+(warning|error|note):\s+(.*)$/gm;
+const problemLinkerPattern = /^(clang):\s+(error):\s+(.*)$/gm;
+const frameworkErrorPattern = /^(error: )(.*?)$/gm;
 
-    private column(output: string, messageEnd: number) {
-        let newLineCounter = 0;
-        let str = "";
-        let shouldBreak = false;
-        for (let i = messageEnd; i < output.length; ++i) {
-            if (output[i] === "\n") {
-                if (shouldBreak) {
-                    break;
-                }
-                str = "";
-                newLineCounter += 1;
-            } else {
-                str += output[i];
-            }
-            if (output[i] === "^") {
-                shouldBreak = true;
-            }
-            if (newLineCounter >= 3) {
+function column(output: string, messageEnd: number) {
+    let newLineCounter = 0;
+    let str = "";
+    let shouldBreak = false;
+    for (let i = messageEnd; i < output.length; ++i) {
+        if (output[i] === "\n") {
+            if (shouldBreak) {
                 break;
             }
+            str = "";
+            newLineCounter += 1;
+        } else {
+            str += output[i];
         }
-        let start = str.length,
-            end = 0;
-        for (let i = 0; i < str.length; ++i) {
-            if (str[i] !== " ") {
-                start = Math.min(i, start);
-                end = Math.max(end, i);
-            }
+        if (output[i] === "^") {
+            shouldBreak = true;
         }
-        if (start > end) {
-            return [0, 10000];
+        if (newLineCounter >= 3) {
+            break;
         }
-        return [start, end];
     }
+    let start = str.length,
+        end = 0;
+    for (let i = 0; i < str.length; ++i) {
+        if (str[i] !== " ") {
+            start = Math.min(i, start);
+            end = Math.max(end, i);
+        }
+    }
+    if (start > end) {
+        return [0, 10000];
+    }
+    return [start, end];
+}
 
-    private parseBuildLog(buildLogFile: string, output: string, numberOfLines: number) {
-        const files: { [key: string]: vscode.Diagnostic[] } = {};
-        try {
-            let matches = [...output.matchAll(this.problemPattern)];
-            for (const match of matches) {
-                const file = match[1];
-                const line = Number(match[2]) - 1;
-                const column = this.column(output, (match?.index || 0) + match[0].length);
-
-                const severity = match[4];
-                const message = match[5];
-                let errorSeverity = vscode.DiagnosticSeverity.Error;
+function parseBuildLog(buildLogFile: string, output: string, numberOfLines: number) {
+    const files: { [key: string]: vscode.Diagnostic[] } = {};
+    try {
+        let matches = [...output.matchAll(problemPattern)];
+        for (const match of matches) {
+            const file = match[1];
+            const line = Number(match[2]) - 1;
+            const localColumn = column(output, (match?.index || 0) + match[0].length);
 
-                switch (severity) {
-                    case "warning":
-                        errorSeverity = vscode.DiagnosticSeverity.Warning;
-                        break;
-                    case "note":
-                        errorSeverity = vscode.DiagnosticSeverity.Information;
-                        break;
-                    default:
-                        break;
-                }
+            const severity = match[4];
+            const message = match[5];
+            let errorSeverity = vscode.DiagnosticSeverity.Error;
 
-                const diagnostic = new vscode.Diagnostic(
-                    new vscode.Range(
-                        new vscode.Position(line, column[0]),
-                        new vscode.Position(line, column[1])
-                    ),
-                    message,
-                    errorSeverity
-                );
-                diagnostic.source = ProblemDiagnosticResolver.xcodebuild;
-                const value = files[file] || [];
-                value.push(diagnostic);
-                if (fs.existsSync(file)) {
-                    files[file] = value;
-                }
+            switch (severity) {
+                case "warning":
+                    errorSeverity = vscode.DiagnosticSeverity.Warning;
+                    break;
+                case "note":
+                    errorSeverity = vscode.DiagnosticSeverity.Information;
+                    break;
+                default:
+                    break;
             }
-            // parsing linker errors
-            matches = [...output.matchAll(this.problemLinkerPattern)];
-            for (const match of matches) {
-                const file = buildLogFile;
-
-                let line = numberOfLines;
-                for (let i = 0; i < (match.index || 0); ++i) {
-                    line += output[i] === "\n" ? 1 : 0;
-                }
-
-                const message = match[3];
-                const errorSeverity = vscode.DiagnosticSeverity.Error;
 
-                const diagnostic = new vscode.Diagnostic(
-                    new vscode.Range(new vscode.Position(line, 0), new vscode.Position(line, 0)),
-                    message,
-                    errorSeverity
-                );
-                diagnostic.source = ProblemDiagnosticResolver.xcodebuild;
-                const value = files[file] || [];
-                value.push(diagnostic);
+            const diagnostic = new vscode.Diagnostic(
+                new vscode.Range(
+                    new vscode.Position(line, localColumn[0]),
+                    new vscode.Position(line, localColumn[1])
+                ),
+                message,
+                errorSeverity
+            );
+            diagnostic.source = ProblemDiagnosticResolver.xcodebuild;
+            const value = files[file] || [];
+            value.push(diagnostic);
+            if (fs.existsSync(file)) {
                 files[file] = value;
             }
-            // parsing framework errors
-            matches = [...output.matchAll(this.frameworkErrorPattern)];
-            for (const match of matches) {
-                const file = buildLogFile;
+        }
+        // parsing linker errors
+        matches = [...output.matchAll(problemLinkerPattern)];
+        for (const match of matches) {
+            const file = buildLogFile;
 
-                let line = numberOfLines;
-                for (let i = 0; i < (match.index || 0); ++i) {
-                    line += output[i] === "\n" ? 1 : 0;
-                }
+            let line = numberOfLines;
+            for (let i = 0; i < (match.index || 0); ++i) {
+                line += output[i] === "\n" ? 1 : 0;
+            }
 
-                const message = match[2];
-                const errorSeverity = vscode.DiagnosticSeverity.Error;
+            const message = match[3];
+            const errorSeverity = vscode.DiagnosticSeverity.Error;
 
-                const diagnostic = new vscode.Diagnostic(
-                    new vscode.Range(new vscode.Position(line, 0), new vscode.Position(line, 0)),
-                    message,
-                    errorSeverity
-                );
-                diagnostic.source = ProblemDiagnosticResolver.xcodebuild;
-                const value = files[file] || [];
-                value.push(diagnostic);
-                files[file] = value;
+            const diagnostic = new vscode.Diagnostic(
+                new vscode.Range(new vscode.Position(line, 0), new vscode.Position(line, 0)),
+                message,
+                errorSeverity
+            );
+            diagnostic.source = ProblemDiagnosticResolver.xcodebuild;
+            const value = files[file] || [];
+            value.push(diagnostic);
+            files[file] = value;
+        }
+        // parsing framework errors
+        matches = [...output.matchAll(frameworkErrorPattern)];
+        for (const match of matches) {
+            const file = buildLogFile;
+
+            let line = numberOfLines;
+            for (let i = 0; i < (match.index || 0); ++i) {
+                line += output[i] === "\n" ? 1 : 0;
             }
-        } catch (err) {
-            console.log(`Error parsing build logs: ${err}`);
+
+            const message = match[2];
+            const errorSeverity = vscode.DiagnosticSeverity.Error;
+
+            const diagnostic = new vscode.Diagnostic(
+                new vscode.Range(new vscode.Position(line, 0), new vscode.Position(line, 0)),
+                message,
+                errorSeverity
+            );
+            diagnostic.source = ProblemDiagnosticResolver.xcodebuild;
+            const value = files[file] || [];
+            value.push(diagnostic);
+            files[file] = value;
         }
-        return files;
+    } catch (err) {
+        console.log(`Error parsing build logs: ${err}`);
     }
+    return files;
 }
+
+export const _private = {
+    parseBuildLog,
+};

src/extension.ts

@@ -479,8 +479,17 @@ export async function handleValidationErrors<T>(
     if (typeof error === "object" && error !== null && "code" in error) {
         switch (error.code) {
             case 65: // scheme is not valid
-                await commandContext.projectEnv.setProjectScheme("");
-                return await repeatOnChange();
+                if ("stderr" in error) {
+                    const stderr = error.stderr as string;
+                    const searchPattern = `does not contain a scheme named "${await commandContext.projectEnv.projectScheme}"`;
+
+                    if (stderr.indexOf(searchPattern) !== -1) {
+                        await commandContext.projectEnv.setProjectScheme("");
+                        return await repeatOnChange();
+                    }
+                }
+                break;
+
             case 70: // device destination is not valid
                 await commandContext.projectEnv.setDebugDeviceID(null);
                 return await repeatOnChange();