Skip to content

Commit db6e15e

Browse files
author
Kartik Raj
authored
Do not throw if initializing deactivate script fails (#22566)
For #20950
1 parent caa50dc commit db6e15e

File tree

2 files changed

+5
-1
lines changed

2 files changed

+5
-1
lines changed

src/client/terminals/envCollectionActivation/service.ts

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -243,7 +243,9 @@ export class TerminalEnvVarCollectionService implements IExtensionActivationServ
243243
envVarCollection.description = description;
244244

245245
await this.trackTerminalPrompt(shell, resource, env);
246-
await this.terminalDeactivateService.initializeScriptParams(shell);
246+
await this.terminalDeactivateService.initializeScriptParams(shell).catch((ex) => {
247+
traceError(`Failed to initialize deactivate script`, shell, ex);
248+
});
247249
}
248250

249251
private isPromptSet = new Map<number | undefined, boolean>();

src/test/interpreters/activation/terminalEnvVarCollectionService.unit.test.ts

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -341,6 +341,7 @@ suite('Terminal Environment Variable Collection Service', () => {
341341

342342
test('Also prepend deactivate script location if available', async () => {
343343
reset(terminalDeactivateService);
344+
when(terminalDeactivateService.initializeScriptParams(anything())).thenResolve();
344345
when(terminalDeactivateService.getScriptLocation(anything(), anything())).thenResolve('scriptLocation');
345346
const processEnv = { PATH: 'hello/1/2/3' };
346347
reset(environmentActivationService);
@@ -409,6 +410,7 @@ suite('Terminal Environment Variable Collection Service', () => {
409410

410411
test('Prepend full PATH with separator otherwise', async () => {
411412
reset(terminalDeactivateService);
413+
when(terminalDeactivateService.initializeScriptParams(anything())).thenResolve();
412414
when(terminalDeactivateService.getScriptLocation(anything(), anything())).thenResolve('scriptLocation');
413415
const processEnv = { PATH: 'hello/1/2/3' };
414416
reset(environmentActivationService);

0 commit comments

Comments
 (0)