Do not throw if initializing deactivate script fails (microsoft#22566)

For microsoft#20950
eleanorjboyd · Nov 29, 2023 · db6e15e · db6e15e
1 parent caa50dc
commit db6e15e
Show file tree

Hide file tree

Showing 2 changed files with 5 additions and 1 deletion.
diff --git a/src/client/terminals/envCollectionActivation/service.ts b/src/client/terminals/envCollectionActivation/service.ts
@@ -243,7 +243,9 @@ export class TerminalEnvVarCollectionService implements IExtensionActivationServ
         envVarCollection.description = description;
 
         await this.trackTerminalPrompt(shell, resource, env);
-        await this.terminalDeactivateService.initializeScriptParams(shell);
+        await this.terminalDeactivateService.initializeScriptParams(shell).catch((ex) => {
+            traceError(`Failed to initialize deactivate script`, shell, ex);
+        });
     }
 
     private isPromptSet = new Map<number | undefined, boolean>();

diff --git a/src/test/interpreters/activation/terminalEnvVarCollectionService.unit.test.ts b/src/test/interpreters/activation/terminalEnvVarCollectionService.unit.test.ts
@@ -341,6 +341,7 @@ suite('Terminal Environment Variable Collection Service', () => {
 
     test('Also prepend deactivate script location if available', async () => {
         reset(terminalDeactivateService);
+        when(terminalDeactivateService.initializeScriptParams(anything())).thenResolve();
         when(terminalDeactivateService.getScriptLocation(anything(), anything())).thenResolve('scriptLocation');
         const processEnv = { PATH: 'hello/1/2/3' };
         reset(environmentActivationService);
@@ -409,6 +410,7 @@ suite('Terminal Environment Variable Collection Service', () => {
 
     test('Prepend full PATH with separator otherwise', async () => {
         reset(terminalDeactivateService);
+        when(terminalDeactivateService.initializeScriptParams(anything())).thenResolve();
         when(terminalDeactivateService.getScriptLocation(anything(), anything())).thenResolve('scriptLocation');
         const processEnv = { PATH: 'hello/1/2/3' };
         reset(environmentActivationService);