Remove the full path for the cl.exe compilerPath generated for c_cpp_properties.json (#10485)

* change description for natvisDiagnostics

* update natvisDiagnostics

* update compiler logic to only set "cl.exe"

* fix lint errors

* resolve PR

* resolve PR

* resolve PR

* resolve PR

* resolve PR

* resolve PR

Author: browntarik

Extension/src/LanguageServer/client.ts

@@ -920,21 +920,13 @@ export class DefaultClient implements Client {
 
         const items: IndexableQuickPickItem[] = [];
         for (let i: number = 0; i < paths.length; i++) {
-            let option: string | undefined;
-            let isCompiler: boolean = false;
-            const slash: string = (os.platform() === 'win32') ? "\\" : "/";
+            const compilerName: string = path.basename(paths[i]);
+            const isCompiler: boolean = compilerName !== paths[i];
 
-            if (paths[i].includes(slash)) {
-                if (paths[i].split(slash).pop() !== undefined) {
-                    option = paths[i].split(slash).pop();
-                    isCompiler = true;
-                }
-            }
-
-            if (option !== undefined && isCompiler) {
-                const path: string | undefined = paths[i].replace(option, "");
+            if (isCompiler) {
+                const path: string | undefined = paths[i].replace(compilerName, "");
                 const description: string = localize("found.string", "Found at {0}", path);
-                items.push({ label: option, description: description, index: i });
+                items.push({ label: compilerName, description: description, index: i });
             } else {
                 items.push({ label: paths[i], index: i });
             }

Extension/src/LanguageServer/configurations.ts

@@ -396,7 +396,15 @@ export class CppProperties {
             (isUnset(settings.defaultCompileCommands) || settings.defaultCompileCommands === "") && !configuration.compileCommands) {
             // compile_commands.json already specifies a compiler. compilerPath overrides the compile_commands.json compiler so
             // don't set a default when compileCommands is in use.
-            configuration.compilerPath = this.defaultCompilerPath;
+
+            // if the compiler is a cl.exe compiler, replace the full path with the "cl.exe" string.
+            const compiler: string = path.basename(this.defaultCompilerPath).toLowerCase();
+
+            if (compiler === "cl.exe") {
+                configuration.compilerPath = "cl.exe";
+            } else {
+                configuration.compilerPath = this.defaultCompilerPath;
+            }
         }
         if ((isUnset(settings.defaultCStandard) || settings.defaultCStandard === "") && this.defaultCStandard) {
             configuration.cStandard = this.defaultCStandard;