From 4edcd16944ac085658e63751f242794a29d25f1b Mon Sep 17 00:00:00 2001 From: Rob Lourens Date: Tue, 27 Oct 2020 16:44:40 -0700 Subject: [PATCH] Rename new terminal setting --- .../contrib/terminal/browser/remoteTerminalService.ts | 2 +- src/vs/workbench/contrib/terminal/browser/terminalService.ts | 2 +- src/vs/workbench/contrib/terminal/common/terminal.ts | 2 +- .../contrib/terminal/common/terminalConfiguration.ts | 4 ++-- 4 files changed, 5 insertions(+), 5 deletions(-) diff --git a/src/vs/workbench/contrib/terminal/browser/remoteTerminalService.ts b/src/vs/workbench/contrib/terminal/browser/remoteTerminalService.ts index c5ae6ecd2f5..01acdf5a2f8 100644 --- a/src/vs/workbench/contrib/terminal/browser/remoteTerminalService.ts +++ b/src/vs/workbench/contrib/terminal/browser/remoteTerminalService.ts @@ -137,7 +137,7 @@ export class RemoteTerminalProcess extends Disposable implements ITerminalChildP const result = await this._remoteTerminalChannel.createTerminalProcess( shellLaunchConfigDto, this._activeWorkspaceRootUri, - !this._shellLaunchConfig.isFeatureTerminal && this._configHelper.config.enableTerminalReconnection, + !this._shellLaunchConfig.isFeatureTerminal && this._configHelper.config.enablePersistentSessions, this._cols, this._rows, isWorkspaceShellAllowed, diff --git a/src/vs/workbench/contrib/terminal/browser/terminalService.ts b/src/vs/workbench/contrib/terminal/browser/terminalService.ts index 41973a7d859..81a08e0041e 100644 --- a/src/vs/workbench/contrib/terminal/browser/terminalService.ts +++ b/src/vs/workbench/contrib/terminal/browser/terminalService.ts @@ -347,7 +347,7 @@ export class TerminalService implements ITerminalService { } public async initializeTerminals(): Promise { - const enableTerminalReconnection = this.configHelper.config.enableTerminalReconnection; + const enableTerminalReconnection = this.configHelper.config.enablePersistentSessions; const serverSpawn = this.configHelper.config.serverSpawn; if (!!this._environmentService.remoteAuthority && enableTerminalReconnection && serverSpawn) { let emptyTab: TerminalTab | undefined; diff --git a/src/vs/workbench/contrib/terminal/common/terminal.ts b/src/vs/workbench/contrib/terminal/common/terminal.ts index cd533aa96b9..c157fc579cb 100644 --- a/src/vs/workbench/contrib/terminal/common/terminal.ts +++ b/src/vs/workbench/contrib/terminal/common/terminal.ts @@ -138,7 +138,7 @@ export interface ITerminalConfiguration { typeaheadThreshold: number; typeaheadStyle: number | string; serverSpawn: boolean; - enableTerminalReconnection: boolean; + enablePersistentSessions: boolean; } export interface ITerminalConfigHelper { diff --git a/src/vs/workbench/contrib/terminal/common/terminalConfiguration.ts b/src/vs/workbench/contrib/terminal/common/terminalConfiguration.ts index 4cc6289ce59..a564585da2a 100644 --- a/src/vs/workbench/contrib/terminal/common/terminalConfiguration.ts +++ b/src/vs/workbench/contrib/terminal/common/terminalConfiguration.ts @@ -387,8 +387,8 @@ export const terminalConfiguration: IConfigurationNode = { type: 'boolean', default: true }, - 'terminal.integrated.enableTerminalReconnection': { - description: localize('terminal.integrated.enableTerminalReconnection', "Experimental: reconnect to terminals when reopening the workspace. Currently only supported in VS Code Remote workspaces."), + 'terminal.integrated.enablePersistentSessions': { + description: localize('terminal.integrated.enablePersistentSessions', "Experimental: persist terminal sessions for the workspace across window reloads. Currently only supported in VS Code Remote workspaces."), type: 'boolean', default: true } -- GitLab