Merge branch 'bobbrow/devEnvironment' of https://github.com/microsoft/vscode-cpptools into bobbrow/devEnvironment

Author: bobbrow

Extension/src/LanguageServer/extension.ts

@@ -17,7 +17,7 @@ import { TargetPopulation } from 'vscode-tas-client';
 import * as which from 'which';
 import { logAndReturn } from '../Utility/Async/returns';
 import * as util from '../common';
-import { modelSelector } from '../constants';
+import { isWindows, modelSelector } from '../constants';
 import { instrument } from '../instrumentation';
 import { getCrashCallStacksChannel } from '../logger';
 import { PlatformInformation } from '../platform';
@@ -1570,6 +1570,9 @@ async function onSetDevEnvironment(sender?: any): Promise<void> {
         void vscode.window.showInformationMessage(`${util.extensionContext?.environmentVariableCollection.description} successfully set.`);
     } catch (error: any) {
         success = false;
+        if (!isWindows) {
+            throw error;
+        }
         void vscode.window.showErrorMessage(`Developer environment not set: ${error.message}`);
     }
     telemetry.logLanguageServerEvent("SetDevEnvironment", { "sender": util.getSenderType(sender), success: success.toString() });

Extension/test/scenarios/SimpleCppProject/tests/devEnvironment.test.ts

@@ -20,7 +20,15 @@ suite("set developer environment", () => {
             equal(util.hasMsvcEnvironment(), true, "MSVC environment not set correctly.");
         });
     } else {
-        test("set developer environment (Linux/macOS)", () => {
+        test("set developer environment (Linux/macOS)", async () => {
+            try {
+                await vscode.commands.executeCommand('C_Cpp.SetDevEnvironment', 'test');
+                equal(false, true, "Should not be able to set developer environment on non-Windows platform.");
+            }
+            catch (e) {
+                equal((e as Error).message, 'This command is only available on Windows', "Should throw error when trying to set developer environment on non-Windows platform.");
+            }
+            equal(util.hasMsvcEnvironment(), false, "MSVC environment should not be set on non-Windows platforms.");
         });
     }
 });