Skip to content

Commit 5416e79

Browse files
authored
Values set in settings are not immediately available for use (#12881)
1 parent e58e963 commit 5416e79

File tree

1 file changed

+5
-4
lines changed

1 file changed

+5
-4
lines changed

Extension/src/LanguageServer/client.ts

Lines changed: 5 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1046,7 +1046,7 @@ export class DefaultClient implements Client {
10461046
if (index === paths.length - 1) {
10471047
action = "disable";
10481048
settings.defaultCompilerPath = "";
1049-
await this.configuration.updateCompilerPathIfSet(settings.defaultCompilerPath);
1049+
await this.configuration.updateCompilerPathIfSet("");
10501050
configurationSelected = true;
10511051
await this.showPrompt(sender);
10521052
return ui.ShowConfigureIntelliSenseButton(false, this, ConfigurationType.CompilerPath, "disablePrompt");
@@ -1066,7 +1066,7 @@ export class DefaultClient implements Client {
10661066
configurationSelected = true;
10671067
action = "compiler browsed";
10681068
settings.defaultCompilerPath = result[0].fsPath;
1069-
await this.configuration.updateCompilerPathIfSet(settings.defaultCompilerPath);
1069+
await this.configuration.updateCompilerPathIfSet(result[0].fsPath);
10701070
void SessionState.trustedCompilerFound.set(true);
10711071
} else {
10721072
configurationSelected = true;
@@ -1084,8 +1084,9 @@ export class DefaultClient implements Client {
10841084
return ui.ShowConfigureIntelliSenseButton(false, this, ConfigurationType.CompileCommands, showButtonSender);
10851085
} else {
10861086
action = "select compiler";
1087-
settings.defaultCompilerPath = util.isCl(paths[index]) ? "cl.exe" : paths[index];
1088-
await this.configuration.updateCompilerPathIfSet(settings.defaultCompilerPath);
1087+
const newCompiler: string = util.isCl(paths[index]) ? "cl.exe" : paths[index];
1088+
settings.defaultCompilerPath = newCompiler;
1089+
await this.configuration.updateCompilerPathIfSet(newCompiler);
10891090
void SessionState.trustedCompilerFound.set(true);
10901091
}
10911092
}

0 commit comments

Comments
 (0)