feat: add enable persistent terminal session preference

opensumi · Nov 1, 2023 · cb1b28f · cb1b28f
1 parent 33359fd
commit cb1b28f
Show file tree

Hide file tree

Showing 4 changed files with 17 additions and 8 deletions.
diff --git a/packages/i18n/src/common/en-US.lang.ts b/packages/i18n/src/common/en-US.lang.ts
@@ -481,6 +481,7 @@ export const localizationBundle = {
     'preference.terminal.integrated.xtermRenderType': 'Xterm Render Type',
     'preference.terminal.integrated.xtermRenderTypeDesc':
       'Choose Xterm render type, Webgl for better performance, Canvas better compatibility',
+    'preference.terminal.integrated.enablePersistentSessionDesc': 'Persist terminal sessions/history for the workspace across window reloads.',
     'preference.terminal.integrated.cursorStyle': 'Terminal > Cursor Style',
     'preference.terminal.integrated.cursorStyleDesc': 'Control the style of terminal cursor',
     'common.preference.open': 'Settings',

diff --git a/packages/i18n/src/common/zh-CN.lang.ts b/packages/i18n/src/common/zh-CN.lang.ts
@@ -462,6 +462,7 @@ export const localizationBundle = {
     'preference.terminal.integrated.localEchoStyleDesc': '本地回显文本的终端样式；字体样式或 RGB 颜色。',
     'preference.terminal.integrated.xtermRenderType': 'Xterm 渲染类型',
     'preference.terminal.integrated.xtermRenderTypeDesc': '选择 Xterm 渲染类型，WebGL 性能更强，Canvas 兼容性更佳。',
+    'preference.terminal.integrated.enablePersistentSessionDesc': '窗口重载时持久化终端会话',
     'preference.terminal.integrated.cursorStyle': '终端输入指针样式',
     'preference.terminal.integrated.cursorStyleDesc': '修改终端输入指针样式',
     'settings.group.general': '常规',

diff --git a/packages/terminal-next/src/browser/terminal.controller.ts b/packages/terminal-next/src/browser/terminal.controller.ts
@@ -58,6 +58,8 @@ import {
 
 import { TerminalContextKey } from './terminal.context-key';
 import { TerminalGroupViewService } from './terminal.view';
+import { PreferenceService } from '@opensumi/ide-core-browser/lib/preferences/types';
+import { CodeTerminalSettingId } from '../common/preference';
 
 @Injectable()
 export class TerminalController extends WithEventBus implements ITerminalController {
@@ -136,6 +138,9 @@ export class TerminalController extends WithEventBus implements ITerminalControl
   @Autowired(ICtxMenuRenderer)
   private ctxMenuRenderer: ICtxMenuRenderer;
 
+  @Autowired(PreferenceService)
+  private readonly preferenceService: PreferenceService;
+
   @Autowired(AppConfig)
   protected readonly appConfig: AppConfig;
 
@@ -556,15 +561,11 @@ export class TerminalController extends WithEventBus implements ITerminalControl
 
       wGroup.widgets.forEach((widget) => {
         const client = this._clients.get(widget.id);
-        if (!client) {
-          return;
-        }
-
-        if (client.launchConfig?.isExtensionOwnedTerminal || client.launchConfig?.disablePersistence) {
-          return;
-        }
+        const disablePersistence =
+          !this.preferenceService.get(CodeTerminalSettingId.EnablePersistentSessions) ||
+          client?.launchConfig?.disablePersistence;
 
-        if (client.isTaskExecutor) {
+        if (!client || disablePersistence || client?.isTaskExecutor) {
           return;
         }
 

diff --git a/packages/terminal-next/src/common/preference.ts b/packages/terminal-next/src/common/preference.ts
@@ -129,6 +129,7 @@ export const enum CodeTerminalSettingId {
   PersistentSessionReviveProcess = 'terminal.integrated.persistentSessionReviveProcess',
   CustomGlyphs = 'terminal.integrated.customGlyphs',
   PersistentSessionScrollback = 'terminal.integrated.persistentSessionScrollback',
+  PersistentSession = 'terminal.integrated.enablePersistentSession',
   InheritEnv = 'terminal.integrated.inheritEnv',
   ShowLinkHover = 'terminal.integrated.showLinkHover',
   IgnoreProcessNames = 'terminal.integrated.ignoreProcessNames',
@@ -344,5 +345,10 @@ export const terminalPreferenceSchema: PreferenceSchema = {
       enum: [RenderType.WebGL, RenderType.Canvas, RenderType.Dom],
       default: RenderType.WebGL,
     },
+    [CodeTerminalSettingId.PersistentSession]: {
+      type: 'boolean',
+      description: '%preference.terminal.integrated.enablePersistentSessionDesc%',
+      default: true,
+    },
   },
 };