Resolve compiler path before verification (fixes issue #4141) (#4142)

mistersandman · michelleangela · commit d51ae12747d7 · 2019-08-26T14:08:24.000-07:00
diff --git a/Extension/src/LanguageServer/configurations.ts b/Extension/src/LanguageServer/configurations.ts
@@ -403,7 +403,8 @@ export class CppProperties {
             configuration.intelliSenseMode === "${default}") {
             return true;
         }
-        let compilerPathAndArgs: util.CompilerPathAndArgs = util.extractCompilerPathAndArgs(configuration.compilerPath);
+        let resolvedCompilerPath: string = this.resolvePath(configuration.compilerPath, true);
+        let compilerPathAndArgs: util.CompilerPathAndArgs = util.extractCompilerPathAndArgs(resolvedCompilerPath);
         return (compilerPathAndArgs.compilerName === "cl.exe") === (configuration.intelliSenseMode === "msvc-x64" || configuration.intelliSenseMode === "msvc-x86");
     }
 

Original file line number	Diff line number	Diff line change
`@@ -403,7 +403,8 @@ export class CppProperties {`
`403`	`403`	`configuration.intelliSenseMode === "${default}") {`
`404`	`404`	`return true;`
`405`	`405`	`}`
`406`		`- let compilerPathAndArgs: util.CompilerPathAndArgs = util.extractCompilerPathAndArgs(configuration.compilerPath);`
	`406`	`+ let resolvedCompilerPath: string = this.resolvePath(configuration.compilerPath, true);`
	`407`	`+ let compilerPathAndArgs: util.CompilerPathAndArgs = util.extractCompilerPathAndArgs(resolvedCompilerPath);`
`407`	`408`	`return (compilerPathAndArgs.compilerName === "cl.exe") === (configuration.intelliSenseMode === "msvc-x64" \|\| configuration.intelliSenseMode === "msvc-x86");`
`408`	`409`	`}`
`409`	`410`