Add done button

microsoft · Oct 4, 2023 · a62665d · a62665d
1 parent 03597e6
commit a62665d
Show file tree

Hide file tree

Showing 3 changed files with 26 additions and 3 deletions.
diff --git a/src/client/common/utils/localize.ts b/src/client/common/utils/localize.ts
@@ -204,6 +204,7 @@ export namespace Interpreters {
     export const terminalDeactivatePrompt = l10n.t(
         'Deactivating virtual environments may not work by default due to a technical limitation in our activation approach, but it can be resolved with a few simple steps.',
     );
+    export const deactivateDoneButton = l10n.t('Done, it works');
     export const activatedCondaEnvLaunch = l10n.t(
         'We noticed VS Code was launched from an activated conda environment, would you like to select it?',
     );

diff --git a/src/client/terminals/envCollectionActivation/deactivatePrompt.ts b/src/client/terminals/envCollectionActivation/deactivatePrompt.ts
@@ -65,7 +65,7 @@ export class TerminalDeactivateLimitationPrompt implements IExtensionSingleActiv
         if (!notificationPromptEnabled.value) {
             return;
         }
-        const prompts = [Common.seeInstructions, Common.doNotShowAgain];
+        const prompts = [Common.seeInstructions, Interpreters.deactivateDoneButton, Common.doNotShowAgain];
         const selection = await this.appShell.showWarningMessage(Interpreters.terminalDeactivatePrompt, ...prompts);
         if (!selection) {
             return;
@@ -74,7 +74,7 @@ export class TerminalDeactivateLimitationPrompt implements IExtensionSingleActiv
             const url = `https://aka.ms/AAmx2ft`;
             this.browserService.launch(url);
         }
-        if (selection === prompts[1]) {
+        if (selection === prompts[1] || selection === prompts[2]) {
             await notificationPromptEnabled.updateValue(false);
         }
     }

diff --git a/src/test/terminals/envCollectionActivation/deactivatePrompt.unit.test.ts b/src/test/terminals/envCollectionActivation/deactivatePrompt.unit.test.ts
@@ -31,7 +31,7 @@ suite('Terminal Deactivation Limitation Prompt', () => {
     let notificationEnabled: IPersistentState<boolean>;
     let browserService: IBrowserService;
     let interpreterService: IInterpreterService;
-    const prompts = [Common.seeInstructions, Common.doNotShowAgain];
+    const prompts = [Common.seeInstructions, Interpreters.deactivateDoneButton, Common.doNotShowAgain];
     const expectedMessage = Interpreters.terminalDeactivatePrompt;
 
     setup(async () => {
@@ -184,6 +184,28 @@ suite('Terminal Deactivation Limitation Prompt', () => {
         verify(notificationEnabled.updateValue(false)).once();
     });
 
+    test('Disable notification if `Done, it works` is clicked', async () => {
+        const resource = Uri.file('a');
+        const terminal = ({
+            creationOptions: {
+                cwd: resource,
+            },
+        } as unknown) as Terminal;
+        when(notificationEnabled.value).thenReturn(true);
+        when(interpreterService.getActiveInterpreter(anything())).thenResolve(({
+            type: PythonEnvType.Virtual,
+        } as unknown) as PythonEnvironment);
+        when(shell.showWarningMessage(expectedMessage, ...prompts)).thenReturn(
+            Promise.resolve(Interpreters.deactivateDoneButton),
+        );
+
+        await deactivatePrompt.activate();
+        terminalWriteEvent.fire({ data: 'Please deactivate me', terminal });
+        await sleep(1);
+
+        verify(notificationEnabled.updateValue(false)).once();
+    });
+
     test('Open link to workaround if `See instructions` is clicked', async () => {
         const resource = Uri.file('a');
         const terminal = ({