fix: problem matcher used in makefile tasks is undefined. [fixes #123]

spmeesseman · Feb 6, 2021 · cae79ea · yannickowow · Feb 24, 2021 · cae79ea
1 parent f5a92fc
commit cae79ea
Show file tree

Hide file tree

Showing 6 changed files with 36 additions and 70 deletions.
diff --git a/.vscode/tasks.json b/.vscode/tasks.json
@@ -20,55 +20,5 @@
         "problemMatcher": [
             "$tsc"
         ]
-    },
-    {
-        "label": "cmd1",
-        "type": "shell",
-        "command": "cmd",
-        "args": [
-            "/c",
-            "echo",
-            "hello1"
-        ],
-        "group": "build",
-        "presentation": {
-            "echo": true,
-            "reveal": "always",
-            "focus": false,
-            "panel": "shared"
-        }
-    },
-    {
-        "label": "cmd2",
-        "type": "shell",
-        "command": "cmd",
-        "args": [
-            "/c",
-            "echo",
-            "hello111112222"
-        ],
-        "group": "build",
-        "presentation": {
-            "echo": true,
-            "reveal": "always",
-            "focus": false,
-            "panel": "shared"
-        }
-    },
-    {
-        "label": "tetcmpx",
-        "detail": "",
-        "type": "shell",
-        "dependsOn": ["cmd1", "cmd2"],
-        "presentation": {
-            "echo": true,
-            "reveal": "always",
-            "focus": false,
-            "panel": "shared",
-            "showReuseMessage": true,
-            "clear": true
-        },
-        "promptOnClose": true,
-
     }]
 }
diff --git a/package.json b/package.json
@@ -1283,6 +1283,25 @@
                     }
                 }
             }
+        ],
+        "problemMatchers": [
+            {
+                "name": "gccte",
+                "owner": "cpp",
+                "label": "Task Explorer gcc",
+                "fileLocation": [
+                    "relative",
+                    "${workspaceRoot}"
+                ],
+                "pattern": {
+                    "regexp": "^(.*):(\\d+):(\\d+):\\s+(warning|error):\\s+(.*)$",
+                    "file": 1,
+                    "line": 2,
+                    "column": 3,
+                    "severity": 4,
+                    "message": 5
+                }
+            }
         ]
     }
 }
diff --git a/src/taskProviderGrunt.ts b/src/taskProviderGrunt.ts
@@ -252,5 +252,5 @@ function createGruntTask(target: string, cmd: string, folder: WorkspaceFolder, u
 
     const execution = new ShellExecution("npx", args, options);
 
-    return new Task(kind, folder, target, "grunt", execution, undefined);
+    return new Task(kind, folder, target, "grunt", execution, "$msCompile");
 }
diff --git a/src/taskProviderGulp.ts b/src/taskProviderGulp.ts
@@ -372,5 +372,5 @@ function createGulpTask(target: string, cmd: string, folder: WorkspaceFolder, ur
 
     const execution = new ShellExecution("npx", args, options);
 
-    return new Task(kind, folder, target, "gulp", execution, undefined);
+    return new Task(kind, folder, target, "gulp", execution, "$msCompile");
 }
diff --git a/src/taskProviderMake.ts b/src/taskProviderMake.ts
@@ -1,7 +1,7 @@
 
 import {
     Task, TaskGroup, WorkspaceFolder, RelativePattern, ShellExecution, Uri,
-    workspace, TaskProvider, TaskDefinition
+    workspace, TaskProvider, TaskDefinition, ShellExecutionOptions, extensions
 } from "vscode";
 import * as path from "path";
 import * as util from "./util";
@@ -229,8 +229,11 @@ async function findTargets(fsPath: string): Promise<StringMap>
             // Don't include object targets
             //
             if (tgtName.indexOf("/") === -1 && tgtName.indexOf("=") === -1 && tgtName.indexOf("\\") === -1 &&
-                isNormalTarget(tgtName))
+                tgtName.indexOf("(") === -1 && tgtName.indexOf("$") === -1 && isNormalTarget(tgtName))
             {
+                console.log(tgtName);
+                console.log("   " + dependsName);
+
                 scripts[tgtName] = "";
                 util.log("   found target");
                 util.logValue("      name", tgtName);
@@ -278,29 +281,23 @@ function createMakeTask(target: string, cmd: string, folder: WorkspaceFolder, ur
         script: target,
         path: getRelativePath(folder, uri),
         fileName: path.basename(uri.path),
+        problemMatcher: "",
         uri
     };
 
     const cwd = path.dirname(uri.fsPath);
     const args = [target];
-    const options = {
+    const options: ShellExecutionOptions = {
         cwd
     };
 
     const execution = new ShellExecution(getCommand(folder, cmd), args, options);
+    let problemMatcher = "$gccte";
+    let cPlusPlusExtension = extensions.getExtension("spmeesseman.vscode-taskexplorer");
+    if (cPlusPlusExtension)
+    {
+        problemMatcher = "$gcc";
+    }
 
-    // const pm = {
-    //     owner: "cpp",
-    //     fileLocation: ["absolute"],
-    //     pattern: {
-    //         regexp: "^(.*):(\\d+):(\\d+):\\s+(warning|error):\\s+(.*)$",
-    //         file: 1,
-    //         line: 2,
-    //         column: 3,
-    //         severity: 4,
-    //         message: 5
-    //     }
-    // };
-
-    return new Task(kind, folder, target, "make", execution, "cpp");
+    return new Task(kind, folder, target, "make", execution, problemMatcher);
 }
diff --git a/src/taskProviderScript.ts b/src/taskProviderScript.ts
@@ -321,5 +321,5 @@ function createScriptTask(scriptDef: any, folder: WorkspaceFolder, uri: Uri): Ta
     // Create the shell execution object and task
     //
     const execution = new ShellExecution(exec, args, options);
-    return new Task(kind, folder, scriptDef.type !== "python" ? fileName : "build egg", scriptDef.type, execution, undefined);
+    return new Task(kind, folder, scriptDef.type !== "python" ? fileName : "build egg", scriptDef.type, execution, "$msCompile");
 }