Merge pull request #10815 from microsoft/main

Don't put the compiler selection in the global settings if using the …

Author: michelleangela

Extension/src/LanguageServer/client.ts

@@ -989,7 +989,7 @@ export class DefaultClient implements Client {
     }
 
     public async handleIntelliSenseConfigurationQuickPick(showSecondPrompt: boolean, sender?: any, compilersOnly?: boolean): Promise<void> {
-        const settings: CppSettings = new CppSettings();
+        const settings: CppSettings = new CppSettings(compilersOnly ? undefined : this.RootUri);
         const selectCompiler: string = localize("selectCompiler.string", "Select IntelliSense Configuration...");
         const paths: string[] = [];
         const configProviders: CustomConfigurationProvider1[] | undefined = compilersOnly ? undefined : this.configStateReceived.configProviders;

Extension/src/LanguageServer/settings.ts

@@ -382,10 +382,13 @@ export class CppSettings extends Settings {
     public set defaultCompilerPath(value: string | undefined) {
         const defaultCompilerPathStr: string = "default.compilerPath";
         const compilerPathInfo: any = this.Section.inspect(defaultCompilerPathStr);
-        this.Section.update(defaultCompilerPathStr, value,
-            compilerPathInfo.workspaceFolderValue !== undefined ? vscode.ConfigurationTarget.WorkspaceFolder :
-                (compilerPathInfo.workspaceValue !== undefined ? vscode.ConfigurationTarget.Workspace :
-                    vscode.ConfigurationTarget.Global));
+        let target: vscode.ConfigurationTarget = vscode.ConfigurationTarget.Global;
+        if (this.resource !== undefined || compilerPathInfo.workspaceFolderValue !== undefined) {
+            target = vscode.ConfigurationTarget.WorkspaceFolder;
+        } else if (compilerPathInfo.workspaceValue !== undefined) {
+            target = vscode.ConfigurationTarget.Workspace;
+        }
+        this.Section.update(defaultCompilerPathStr, value, target);
     }
     public get defaultCompilerArgs(): string[] | undefined { return super.getWithUndefinedDefault<string[]>("default.compilerArgs"); }
     public get defaultCStandard(): string | undefined { return super.Section.get<string>("default.cStandard"); }