From 1d4c0b5d270bdb72be53a1520fbb7512448620a7 Mon Sep 17 00:00:00 2001 From: Kartik Raj Date: Tue, 13 Feb 2024 14:33:41 +0000 Subject: [PATCH 1/2] Add more shell integration sequences to check for --- .../envCollectionActivation/shellIntegrationService.ts | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/src/client/terminals/envCollectionActivation/shellIntegrationService.ts b/src/client/terminals/envCollectionActivation/shellIntegrationService.ts index 03b7d25de986..b61779fcf23a 100644 --- a/src/client/terminals/envCollectionActivation/shellIntegrationService.ts +++ b/src/client/terminals/envCollectionActivation/shellIntegrationService.ts @@ -57,7 +57,8 @@ export class ShellIntegrationService implements IShellIntegrationService { } this.appShell.onDidWriteTerminalData( (e) => { - if (e.data.includes('\x1b]633;A\x07')) { + traceVerbose(e.data); + if (e.data.includes('\x1b]633;A\x07') || e.data.includes('\x1b]133;A\x07')) { let { shell } = this.appEnvironment; if ('shellPath' in e.terminal.creationOptions && e.terminal.creationOptions.shellPath) { shell = e.terminal.creationOptions.shellPath; From f533c3cb5dd04406fe6bdbc3a2355fbb5fbeb216 Mon Sep 17 00:00:00 2001 From: Kartik Raj Date: Tue, 13 Feb 2024 14:34:13 +0000 Subject: [PATCH 2/2] Add comment --- .../envCollectionActivation/shellIntegrationService.ts | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/client/terminals/envCollectionActivation/shellIntegrationService.ts b/src/client/terminals/envCollectionActivation/shellIntegrationService.ts index b61779fcf23a..cba2ccbc6867 100644 --- a/src/client/terminals/envCollectionActivation/shellIntegrationService.ts +++ b/src/client/terminals/envCollectionActivation/shellIntegrationService.ts @@ -57,7 +57,7 @@ export class ShellIntegrationService implements IShellIntegrationService { } this.appShell.onDidWriteTerminalData( (e) => { - traceVerbose(e.data); + traceVerbose(e.data); // Log this temporarily for analysis if (e.data.includes('\x1b]633;A\x07') || e.data.includes('\x1b]133;A\x07')) { let { shell } = this.appEnvironment; if ('shellPath' in e.terminal.creationOptions && e.terminal.creationOptions.shellPath) {