Various quick fixes

package.json

@@ -212,7 +212,17 @@
                 "severity": 4,
                 "message": 5
               }
-            }
+            },
+            {
+               "name": "msvc",
+               "source": "msvc",
+               "owner": "makefile-tools",
+               "base": "$msCompile",
+               "fileLocation": [
+                 "autoDetect",
+                 "${command:makefile.getLaunchTargetDirectory}"
+               ]
+             }
           ],
         "configuration": {
             "type": "object",
@@ -255,7 +265,7 @@
                                 "items": {
                                     "type": "string"
                                 },
-                                "default": [],
+                                "default": ["$gcc", "$msvc"],
                                 "description": "Problem matcher names to use when building the current target"
                             },
                             "buildLog": {

src/configuration.ts

@@ -641,6 +641,9 @@ export function getCommandForConfiguration(configuration: string | undefined): v
         } else {
             vscode.commands.executeCommand('setContext', "makefile:fullFeatureSet", true);
         }
+    } else {
+        // If we have a build log, then we want Makefile Tools to be fully active and the UI visible.
+        vscode.commands.executeCommand('setContext', "makefile:fullFeatureSet", true);
     }
 }
 

src/parser.ts

@@ -24,7 +24,7 @@ import * as vscode from 'vscode';
 // that would make parseLineAsTool to not match the regular expression,
 // therefore wrongly skipping over compilation lines?
 const compilers: string[] = ["ccache", "clang\\+\\+", "clang-cl", "clang-cpp", "clang", "gcc", "gpp", "cpp", "icc", "cc", "icl", "cl", "g\\+\\+", "c\\+\\+"];
-const linkers: string[] = ["ccache", "ilink", "link", "ld", "gcc", "clang\\+\\+", "clang", "cc", "g\\+\\+", "c\\+\\+"];
+const linkers: string[] = ["ccache", "ilink", "link", "ld", "ccld", "gcc", "clang\\+\\+", "clang", "cc", "g\\+\\+", "c\\+\\+"];
 const sourceFileExtensions: string[] = ["cpp", "cc", "cxx", "c"];
 
 const chunkSize: number = 100;
@@ -280,11 +280,15 @@ async function parseLineAsTool(
     });
 
     // Add any additional tools specified by the user
-    configuration.getAdditionalCompilerNames()?.forEach(compiler => {
-        if (!toolNames.includes(compiler)) {
-            versionedToolNames.push(`${prefixRegex}${compiler}${suffixRegex}`);
-        }
-    });
+    // when we are looking at compilers or linkers,
+    // not when we parse for binary targets.
+    if (isCompilerOrLinker) {
+        configuration.getAdditionalCompilerNames()?.forEach(compiler => {
+            if (!toolNames.includes(compiler)) {
+                versionedToolNames.push(`${prefixRegex}${compiler}${suffixRegex}`);
+            }
+        });
+    }
 
     // - any spaces/tabs before the tool invocation
     // - with or without path (relative -to the makefile location- or full)

src/util.ts

@@ -267,7 +267,8 @@ export function spawnChildProcess(
         let shellType: string | undefined;
         let shellPlatform: string = (process.platform === "win32") ? "windows" : (process.platform === "linux") ? "linux" : "osx";
         let workspaceConfiguration: vscode.WorkspaceConfiguration = vscode.workspace.getConfiguration("terminal");
-        shellType = workspaceConfiguration.get<string>(`integrated.automationShell.${shellPlatform}`);
+        shellType = workspaceConfiguration.get<string>(`integrated.automationProfile.${shellPlatform}`) || // automationShell is deprecated
+                    workspaceConfiguration.get<string>(`integrated.automationShell.${shellPlatform}`); // and replaced with automationProfile
 
         // Final quoting decisions for process name and args before being executed.
         let qProcessName: string = ensureQuoted ? quoteStringIfNeeded(processName) : processName;