Merge pull request #3113 from Microsoft/bobbrow/cc

bobbrow · web-flow · commit f978719dea3f · 2019-01-29T14:07:32.000-08:00
#3102 - fix compilerPath/compileCommands policy
diff --git a/Extension/src/LanguageServer/configurations.ts b/Extension/src/LanguageServer/configurations.ts
@@ -242,7 +242,10 @@ export class CppProperties {
             if (isUnset(settings.defaultWindowsSdkVersion) && this.defaultWindowsSdkVersion && process.platform === 'win32') {
                 configuration.windowsSdkVersion = this.defaultWindowsSdkVersion;
             }
-            if (isUnset(settings.defaultCompilerPath) && this.defaultCompilerPath) {
+            if (isUnset(settings.defaultCompilerPath) && this.defaultCompilerPath &&
+                isUnset(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 (isUnset(settings.defaultCStandard) && this.defaultCStandard) {

Original file line number	Diff line number	Diff line change
`@@ -242,7 +242,10 @@ export class CppProperties {`
`242`	`242`	`if (isUnset(settings.defaultWindowsSdkVersion) && this.defaultWindowsSdkVersion && process.platform === 'win32') {`
`243`	`243`	`configuration.windowsSdkVersion = this.defaultWindowsSdkVersion;`
`244`	`244`	`}`
`245`		`- if (isUnset(settings.defaultCompilerPath) && this.defaultCompilerPath) {`
	`245`	`+ if (isUnset(settings.defaultCompilerPath) && this.defaultCompilerPath &&`
	`246`	`+ isUnset(settings.defaultCompileCommands) && !configuration.compileCommands) {`
	`247`	`+ // compile_commands.json already specifies a compiler. compilerPath overrides the compile_commands.json compiler so`
	`248`	`+ // don't set a default when compileCommands is in use.`
`246`	`249`	`configuration.compilerPath = this.defaultCompilerPath;`
`247`	`250`	`}`
`248`	`251`	`if (isUnset(settings.defaultCStandard) && this.defaultCStandard) {`