diff options
Diffstat (limited to 'src/vs/workbench/contrib/terminal/browser/terminalInstance.ts')
| -rw-r--r-- | src/vs/workbench/contrib/terminal/browser/terminalInstance.ts | 5 |
1 files changed, 2 insertions, 3 deletions
diff --git a/src/vs/workbench/contrib/terminal/browser/terminalInstance.ts b/src/vs/workbench/contrib/terminal/browser/terminalInstance.ts index 1f8a4970e50..bbfb4d97207 100644 --- a/src/vs/workbench/contrib/terminal/browser/terminalInstance.ts +++ b/src/vs/workbench/contrib/terminal/browser/terminalInstance.ts @@ -276,6 +276,7 @@ export class TerminalInstance extends Disposable implements ITerminalInstance { // TODO: Should this be an event as it can fire twice? get processReady(): Promise<void> { return this._processManager.ptyProcessReady; } get hasChildProcesses(): boolean { return this.shellLaunchConfig.attachPersistentProcess?.hasChildProcesses || this._processManager.hasChildProcesses; } + get reconnectionOwner(): string | undefined { return this.shellLaunchConfig.attachPersistentProcess?.reconnectionOwner || this.shellLaunchConfig.reconnectionOwner; } get areLinksReady(): boolean { return this._areLinksReady; } get initialDataEvents(): string[] | undefined { return this._initialDataEvents; } get exitCode(): number | undefined { return this._exitCode; } @@ -1236,7 +1237,6 @@ export class TerminalInstance extends Disposable implements ITerminalInstance { } private _setShellIntegrationContextKey(): void { - console.log('set', this.xterm?.shellIntegration.status === ShellIntegrationStatus.VSCode); if (this.xterm) { this._terminalShellIntegrationEnabledContextKey.set(this.xterm.shellIntegration.status === ShellIntegrationStatus.VSCode); } @@ -1727,7 +1727,6 @@ export class TerminalInstance extends Disposable implements ITerminalInstance { if (this._isExiting) { return; } - const parsedExitResult = parseExitResult(exitCodeOrError, this.shellLaunchConfig, this._processManager.processState, this._initialCwd); if (this._usedShellIntegrationInjection && this._processManager.processState === ProcessState.KilledDuringLaunch && parsedExitResult?.code !== 0) { @@ -2356,7 +2355,7 @@ export class TerminalInstance extends Disposable implements ITerminalInstance { info.requiresAction && this._configHelper.config.environmentChangesRelaunch && !this._processManager.hasWrittenData && - !this._shellLaunchConfig.isFeatureTerminal && + (this.reconnectionOwner || !this._shellLaunchConfig.isFeatureTerminal) && !this._shellLaunchConfig.customPtyImplementation && !this._shellLaunchConfig.isExtensionOwnedTerminal && !this._shellLaunchConfig.attachPersistentProcess |