fix problem matcher regex (#749)

espressif · Jul 4, 2022 · 660f761 · 660f761
1 parent a9060b9
commit 660f761
Show file tree

Hide file tree

Showing 6 changed files with 11 additions and 24 deletions.
diff --git a/package.json b/package.json
@@ -101,27 +101,14 @@
   "contributes": {
     "problemMatchers": [
       {
-        "name": "idfRelative",
+        "name": "espIdf",
         "owner": "cpp",
         "fileLocation": [
-          "relative",
-          "${workspaceFolder}"
+          "autoDetect",
+          "${cwd}"
         ],
         "pattern": {
-          "regexp": "^\\.\\.(.*):(\\d+):(\\d+):\\s+(warning|error):\\s+(.*)$",
-          "file": 1,
-          "line": 2,
-          "column": 3,
-          "severity": 4,
-          "message": 5
-        }
-      },
-      {
-        "name": "idfAbsolute",
-        "owner": "cpp",
-        "fileLocation": "absolute",
-        "pattern": {
-          "regexp": "^[^\\.](.*):(\\d+):(\\d+):\\s+(warning|error):\\s+(.*)$",
+          "regexp": "^(.*?):(\\d+):(\\d*):?\\s+(?:fatal\\s+)?(warning|error):\\s+(.*)$",
           "file": 1,
           "line": 2,
           "column": 3,

diff --git a/src/build/buildTask.ts b/src/build/buildTask.ts
@@ -183,7 +183,7 @@ export class BuildTask {
         vscode.TaskScope.Workspace,
         "ESP-IDF Compile",
         compileExecution,
-        ["idfRelative", "idfAbsolute"],
+        ["espIdf"],
         compilePresentationOptions
       );
     }
@@ -204,7 +204,7 @@ export class BuildTask {
       vscode.TaskScope.Workspace,
       "ESP-IDF Build",
       buildExecution,
-      ["idfRelative", "idfAbsolute"],
+      ["espIdf"],
       buildPresentationOptions
     );
   }
@@ -243,7 +243,7 @@ export class BuildTask {
       vscode.TaskScope.Workspace,
       "ESP-IDF Write DFU.bin",
       writeExecution,
-      ["idfRelative", "idfAbsolute"],
+      ["espIdf"],
       buildPresentationOptions
     );
   }

diff --git a/src/customTasks/customTaskProvider.ts b/src/customTasks/customTaskProvider.ts
@@ -110,7 +110,7 @@ export class CustomTask {
       TaskScope.Workspace,
       `ESP-IDF ${taskName}`,
       customExecution,
-      ["idfRelative", "idfAbsolute"],
+      ["espIdf"],
       customTaskPresentationOptions
     );
   }

diff --git a/src/espIdf/size/idfSizeTask.ts b/src/espIdf/size/idfSizeTask.ts
@@ -98,7 +98,7 @@ export class IdfSizeTask {
       TaskScope.Workspace,
       "ESP-IDF Size",
       sizeExecution,
-      ["idfRelative", "idfAbsolute"],
+      ["espIdf"],
       sizePresentationOptions
     );
   }

diff --git a/src/flash/flashTask.ts b/src/flash/flashTask.ts
@@ -114,7 +114,7 @@ export class FlashTask {
       vscode.TaskScope.Workspace,
       "ESP-IDF Flash",
       flashExecution,
-      ["idfRelative", "idfAbsolute"],
+      ["espIdf"],
       flashPresentationOptions
     );
   }

diff --git a/src/qemu/mergeFlashBin.ts b/src/qemu/mergeFlashBin.ts
@@ -131,7 +131,7 @@ export async function mergeFlashBinaries(
     TaskScope.Workspace,
     "Merge flash binaries",
     mergeExecution,
-    ["idfRelative", "idfAbsolute"],
+    ["espIdf"],
     mergePresentationOptions
   );
   await TaskManager.runTasks();