Fix: some error not matched by the problem matcher

yoctoproject · Jan 9, 2024 · 47126b2 · 47126b2
1 parent 8b826e2
commit 47126b2
Show file tree

Hide file tree

Showing 2 changed files with 35 additions and 9 deletions.
diff --git a/client/package.json b/client/package.json
@@ -205,12 +205,22 @@
           "autoDetect",
           "${cwd}"
         ],
-        "pattern": {
-          "regexp": "^.*ParseError (at|in) (.+?):(\\d+)?:? (.+)$",
-          "file": 2,
-          "line": 3,
-          "message": 4
-        }
+        "pattern": [
+          {
+            "regexp": "^.*ParseError (at|in) (.+?):(\\d+)?:? (unparsed line: '(.+)')$",
+            "file": 2,
+            "line": 3,
+            "message": 4,
+            "code": 5,
+            "column": 0
+          },
+          {
+            "regexp": "(ERROR): (Unable to parse (.+))$",
+            "severity": 1,
+            "file": 3,
+            "message": 2
+          }
+        ]
       },
       {
         "name": "bitbake-UnableToParse",
@@ -244,20 +254,36 @@
         }
       },
       {
-        "name": "bitbake-generic",
+        "name": "bitbake-compilation-python-function",
         "source": "bitbake",
         "owner": "bitbake",
         "fileLocation": [
           "autoDetect",
           "${cwd}"
         ],
         "pattern": {
-          "regexp": "^Parsing recipes...(ERROR): (.+?): (.*)$",
+          "regexp": "(ERROR): (.+): (Error in compiling python function) in (.*), line (\\d+):$",
           "file": 2,
           "severity": 1,
+          "line": 5,
           "message": 3
         }
       },
+      {
+        "name": "bitbake-execution-error",
+        "source": "bitbake",
+        "owner": "bitbake",
+        "fileLocation": [
+          "autoDetect",
+          "${cwd}"
+        ],
+        "pattern": {
+          "regexp": "(^Parsing recipes...)?(ERROR): (.+?): (.*):?$",
+          "file": 3,
+          "severity": 2,
+          "message": 4
+        }
+      },
       {
         "name": "bitbake-task-error",
         "source": "bitbake",

diff --git a/client/src/ui/BitbakeTaskProvider.ts b/client/src/ui/BitbakeTaskProvider.ts
@@ -51,7 +51,7 @@ export class BitbakeTaskProvider implements vscode.TaskProvider {
             this.bitbakeDriver.composeBitbakeScript(bitbakeCommand))
           return pty
         }),
-        ['$bitbake-ParseError', '$bitbake-Variable', '$bitbake-generic', '$bitbake-task-error', '$bitbake-UnableToParse']
+        ['$bitbake-ParseError', '$bitbake-Variable', '$bitbake-compilation-python-function', '$bitbake-execution-error', '$bitbake-task-error', '$bitbake-UnableToParse']
       )
       if ((bitbakeTaskDefinition.task === undefined || bitbakeTaskDefinition.task.includes('build')) &&
           bitbakeTaskDefinition.options?.parseOnly !== true) {