PR feedback

Author: bobbrow

Extension/package.json

@@ -3380,7 +3380,7 @@
                     "C_Cpp.persistVsDeveloperEnvironment": {
                         "type": "boolean",
                         "default": true,
-                        "markdownDescription": "%c_cpp.configuration.persistVsDeveloperEnvironment.markdownDescription%",
+                        "markdownDescription": "%c_cpp.configuration.persistVsDeveloperEnvironment.description%",
                         "scope": "window"
                     }
                 }

Extension/package.nls.json

@@ -845,7 +845,7 @@
         ]
     },
     "c_cpp.configuration.debugShortcut.description": "Show the \"Run and Debug\" play button and \"Add Debug Configuration\" gear in the editor title bar for C++ files.",
-    "c_cpp.configuration.persistVsDeveloperEnvironment.markdownDescription": "Remember the last used Visual Studio developer environment for the current workspace. This setting is only applicable for Windows.",
+    "c_cpp.configuration.persistVsDeveloperEnvironment.description": "Remember the last used Visual Studio developer environment for the current workspace. This setting is only applicable for Windows.",
     "c_cpp.debuggers.pipeTransport.description": "When present, this tells the debugger to connect to a remote computer using another executable as a pipe that will relay standard input/output between VS Code and the MI-enabled debugger backend executable (such as gdb).",
     "c_cpp.debuggers.pipeTransport.default.pipeProgram": "enter the fully qualified path for the pipe program name, for example '/usr/bin/ssh'.",
     "c_cpp.debuggers.pipeTransport.default.debuggerPath": "The full path to the debugger on the target machine, for example /usr/bin/gdb.",

Extension/src/LanguageServer/client.ts

@@ -1748,18 +1748,18 @@ export class DefaultClient implements Client {
 
         if (Object.keys(changedSettings).length > 0) {
             if (this === defaultClient) {
-                if (changedSettings.commentContinuationPatterns) {
+                if (changedSettings.commentContinuationPatterns !== undefined) {
                     updateLanguageConfigurations();
                 }
-                if (changedSettings.loggingLevel) {
+                if (changedSettings.loggingLevel !== undefined) {
                     const oldLoggingLevelLogged: boolean = this.loggingLevel > 1;
                     this.loggingLevel = util.getNumericLoggingLevel(changedSettings.loggingLevel);
                     if (oldLoggingLevelLogged || this.loggingLevel > 1) {
                         getOutputChannelLogger().appendLine(localize({ key: "loggingLevel.changed", comment: ["{0} is the setting name 'loggingLevel', {1} is a string value such as 'Debug'"] }, "{0} has changed to: {1}", "loggingLevel", changedSettings.loggingLevel));
                     }
                 }
                 const settings: CppSettings = new CppSettings();
-                if (changedSettings.enhancedColorization) {
+                if (changedSettings.enhancedColorization !== undefined) {
                     if (settings.isEnhancedColorizationEnabled && semanticTokensLegend) {
                         this.semanticTokensProvider = new SemanticTokensProvider();
                         this.semanticTokensProviderDisposable = vscode.languages.registerDocumentSemanticTokensProvider(util.documentSelector, this.semanticTokensProvider, semanticTokensLegend);
@@ -1801,12 +1801,18 @@ export class DefaultClient implements Client {
                     void ui.ShowConfigureIntelliSenseButton(false, this, ConfigurationType.CompilerPath, showButtonSender);
                 }
             }
-            if (changedSettings.legacyCompilerArgsBehavior) {
+            if (changedSettings.legacyCompilerArgsBehavior !== undefined) {
                 this.configuration.handleConfigurationChange();
             }
             if (changedSettings["default.compilerPath"] !== undefined || changedSettings["default.compileCommands"] !== undefined || changedSettings["default.configurationProvider"] !== undefined) {
                 void ui.ShowConfigureIntelliSenseButton(false, this).catch(logAndReturn.undefined);
             }
+            if (changedSettings.persistVsDeveloperEnvironment !== undefined) {
+                if (util.extensionContext) {
+                    const settings: CppSettings = new CppSettings();
+                    util.extensionContext.environmentVariableCollection.persistent = settings.persistVSDeveloperEnvironment;
+                }
+            }
             this.configuration.onDidChangeSettings();
             telemetry.logLanguageServerEvent("CppSettingsChange", changedSettings, undefined);
         }

Extension/src/LanguageServer/devcmd.ts

@@ -68,7 +68,7 @@ export async function setEnvironment(context?: vscode.ExtensionContext) {
         host: match(host, { 'x86': 'x86', 'x64': 'x64' }) ?? 'x64',
         target: match(target, { 'x86': 'x86', 'x64': 'x64', 'arm64': 'ARM64', 'arm': 'ARM' }) ?? 'x64'
     });
-    const settings = new CppSettings(vscode.workspace.workspaceFolders?.at(0)?.uri);
+    const settings = new CppSettings();
 
     context.environmentVariableCollection.clear();
     for (const key of Object.keys(vars)) {