npm - @opensumi/ide-terminal-next - Versions diffs - 2.17.9 → 2.18.1 - Mend

@opensumi/ide-terminal-next 2.17.9 → 2.18.1

This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.

Files changed (157) hide show

package/lib/browser/component/tab.item.d.ts.map +1 -1
package/lib/browser/component/tab.item.js +33 -12
package/lib/browser/component/tab.item.js.map +1 -1
package/lib/browser/component/tab.module.less +41 -12
package/lib/browser/component/tab.view.d.ts.map +1 -1
package/lib/browser/component/tab.view.js +25 -7
package/lib/browser/component/tab.view.js.map +1 -1
package/lib/browser/component/terminal.view.d.ts.map +1 -1
package/lib/browser/component/terminal.view.js +25 -24
package/lib/browser/component/terminal.view.js.map +1 -1
package/lib/browser/contribution/terminal.menu.d.ts.map +1 -1
package/lib/browser/contribution/terminal.menu.js +3 -4
package/lib/browser/contribution/terminal.menu.js.map +1 -1
package/lib/browser/index.d.ts.map +1 -1
package/lib/browser/index.js +0 -5
package/lib/browser/index.js.map +1 -1
package/lib/browser/links/link-manager.d.ts.map +1 -1
package/lib/browser/links/link-manager.js +11 -12
package/lib/browser/links/link-manager.js.map +1 -1
package/lib/browser/links/validated-local-link-provider.d.ts.map +1 -1
package/lib/browser/links/validated-local-link-provider.js +1 -2
package/lib/browser/links/validated-local-link-provider.js.map +1 -1
package/lib/browser/terminal.addon.d.ts.map +1 -1
package/lib/browser/terminal.addon.js +3 -1
package/lib/browser/terminal.addon.js.map +1 -1
package/lib/browser/terminal.api.d.ts +8 -7
package/lib/browser/terminal.api.d.ts.map +1 -1
package/lib/browser/terminal.api.js +31 -17
package/lib/browser/terminal.api.js.map +1 -1
package/lib/browser/terminal.client.d.ts +7 -4
package/lib/browser/terminal.client.d.ts.map +1 -1
package/lib/browser/terminal.client.js +21 -45
package/lib/browser/terminal.client.js.map +1 -1
package/lib/browser/terminal.context-menu.d.ts +2 -0
package/lib/browser/terminal.context-menu.d.ts.map +1 -1
package/lib/browser/terminal.context-menu.js +23 -4
package/lib/browser/terminal.context-menu.js.map +1 -1
package/lib/browser/terminal.controller.d.ts +16 -7
package/lib/browser/terminal.controller.d.ts.map +1 -1
package/lib/browser/terminal.controller.js +169 -33
package/lib/browser/terminal.controller.js.map +1 -1
package/lib/browser/terminal.input.js +2 -2
package/lib/browser/terminal.input.js.map +1 -1
package/lib/browser/terminal.internal.service.d.ts +6 -6
package/lib/browser/terminal.internal.service.d.ts.map +1 -1
package/lib/browser/terminal.internal.service.js +6 -25
package/lib/browser/terminal.internal.service.js.map +1 -1
package/lib/browser/terminal.profile.d.ts +18 -9
package/lib/browser/terminal.profile.d.ts.map +1 -1
package/lib/browser/terminal.profile.internal.d.ts.map +1 -1
package/lib/browser/terminal.profile.internal.js +4 -6
package/lib/browser/terminal.profile.internal.js.map +1 -1
package/lib/browser/terminal.profile.js +59 -9
package/lib/browser/terminal.profile.js.map +1 -1
package/lib/browser/terminal.restore.d.ts.map +1 -1
package/lib/browser/terminal.restore.js +3 -1
package/lib/browser/terminal.restore.js.map +1 -1
package/lib/browser/terminal.search.d.ts.map +1 -1
package/lib/browser/terminal.search.js +6 -0
package/lib/browser/terminal.search.js.map +1 -1
package/lib/browser/terminal.service.d.ts +5 -17
package/lib/browser/terminal.service.d.ts.map +1 -1
package/lib/browser/terminal.service.js +6 -79
package/lib/browser/terminal.service.js.map +1 -1
package/lib/browser/terminal.view.d.ts +5 -3
package/lib/browser/terminal.view.d.ts.map +1 -1
package/lib/browser/terminal.view.js +9 -5
package/lib/browser/terminal.view.js.map +1 -1
package/lib/browser/xterm.d.ts +2 -1
package/lib/browser/xterm.d.ts.map +1 -1
package/lib/browser/xterm.js.map +1 -1
package/lib/common/api.d.ts +3 -2
package/lib/common/api.d.ts.map +1 -1
package/lib/common/client.d.ts +19 -1
package/lib/common/client.d.ts.map +1 -1
package/lib/common/client.js +2 -1
package/lib/common/client.js.map +1 -1
package/lib/common/controller.d.ts +20 -5
package/lib/common/controller.d.ts.map +1 -1
package/lib/common/controller.js.map +1 -1
package/lib/common/environmentVariable.d.ts +2 -3
package/lib/common/environmentVariable.d.ts.map +1 -1
package/lib/common/environmentVariable.js.map +1 -1
package/lib/common/environmentVariableCollection.d.ts +2 -3
package/lib/common/environmentVariableCollection.d.ts.map +1 -1
package/lib/common/environmentVariableCollection.js +2 -2
package/lib/common/environmentVariableCollection.js.map +1 -1
package/lib/common/extension.d.ts +3 -0
package/lib/common/extension.d.ts.map +1 -1
package/lib/common/extension.js.map +1 -1
package/lib/common/profile.d.ts +6 -9
package/lib/common/profile.d.ts.map +1 -1
package/lib/common/profile.js +1 -2
package/lib/common/profile.js.map +1 -1
package/lib/common/pty.d.ts +92 -11
package/lib/common/pty.d.ts.map +1 -1
package/lib/common/pty.js +40 -1
package/lib/common/pty.js.map +1 -1
package/lib/common/render.d.ts +5 -0
package/lib/common/render.d.ts.map +1 -1
package/lib/common/render.js.map +1 -1
package/lib/common/resize.d.ts +2 -0
package/lib/common/resize.d.ts.map +1 -1
package/lib/common/service.d.ts +8 -11
package/lib/common/service.d.ts.map +1 -1
package/lib/common/service.js.map +1 -1
package/lib/common/xterm.d.ts +16 -0
package/lib/common/xterm.d.ts.map +1 -0
package/lib/common/xterm.js +3 -0
package/lib/common/xterm.js.map +1 -0
package/lib/node/index.d.ts.map +1 -1
package/lib/node/index.js +5 -0
package/lib/node/index.js.map +1 -1
package/lib/node/pty.d.ts +9 -5
package/lib/node/pty.d.ts.map +1 -1
package/lib/node/pty.js +13 -10
package/lib/node/pty.js.map +1 -1
package/lib/node/pty.manager.d.ts +52 -0
package/lib/node/pty.manager.d.ts.map +1 -0
package/lib/node/pty.manager.js +149 -0
package/lib/node/pty.manager.js.map +1 -0
package/lib/node/pty.manager.remote.d.ts +10 -0
package/lib/node/pty.manager.remote.d.ts.map +1 -0
package/lib/node/pty.manager.remote.js +92 -0
package/lib/node/pty.manager.remote.js.map +1 -0
package/lib/node/pty.proxy.d.ts +45 -0
package/lib/node/pty.proxy.d.ts.map +1 -0
package/lib/node/pty.proxy.js +255 -0
package/lib/node/pty.proxy.js.map +1 -0
package/lib/node/pty.proxy.remote.exec.d.ts +2 -0
package/lib/node/pty.proxy.remote.exec.d.ts.map +1 -0
package/lib/node/pty.proxy.remote.exec.js +7 -0
package/lib/node/pty.proxy.remote.exec.js.map +1 -0
package/lib/node/shell.d.ts +1 -1
package/lib/node/shell.d.ts.map +1 -1
package/lib/node/shell.js +14 -15
package/lib/node/shell.js.map +1 -1
package/lib/node/terminal.profile.service.d.ts.map +1 -1
package/lib/node/terminal.profile.service.js +4 -6
package/lib/node/terminal.profile.service.js.map +1 -1
package/lib/node/terminal.service.client.d.ts +3 -8
package/lib/node/terminal.service.client.d.ts.map +1 -1
package/lib/node/terminal.service.client.js +8 -39
package/lib/node/terminal.service.client.js.map +1 -1
package/lib/node/terminal.service.d.ts +3 -2
package/lib/node/terminal.service.d.ts.map +1 -1
package/lib/node/terminal.service.js +36 -10
package/lib/node/terminal.service.js.map +1 -1
package/package.json +16 -16
package/lib/browser/terminal.contribution.d.ts +0 -7
package/lib/browser/terminal.contribution.d.ts.map +0 -1
package/lib/browser/terminal.contribution.js +0 -32
package/lib/browser/terminal.contribution.js.map +0 -1
package/lib/common/menu.d.ts +0 -5
package/lib/common/menu.d.ts.map +0 -1
package/lib/common/menu.js +0 -9
package/lib/common/menu.js.map +0 -1

package/lib/browser/terminal.controller.js.map CHANGED Viewed

	@@ -1 +1 @@
1	- {"version":3,"file":"terminal.controller.js","sourceRoot":"","sources":["../../src/browser/terminal.controller.ts"],"names":[],"mappings":"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"}
1	+ {"version":3,"file":"terminal.controller.js","sourceRoot":"","sources":["../../src/browser/terminal.controller.ts"],"names":[],"mappings":"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"}

package/lib/browser/terminal.input.js CHANGED Viewed

@@ -3,7 +3,7 @@ Object.defineProperty(exports, "__esModule", { value: true });
 exports.TerminalKeyBoardInputService = void 0;
 const tslib_1 = require("tslib");
 const di_1 = require("@opensumi/di");
-const platform_1 = require("@opensumi/ide-core-common/lib/platform");
+const ide_core_common_1 = require("@opensumi/ide-core-common");
 let TerminalKeyBoardInputService = class TerminalKeyBoardInputService {
     constructor() {
         this._isCommandOrCtrl = false;
@@ -12,7 +12,7 @@ let TerminalKeyBoardInputService = class TerminalKeyBoardInputService {
         return this._isCommandOrCtrl;
     }
     listen() {
-        const key = platform_1.isMacintosh ? 'Meta' : 'Control';
+        const key = ide_core_common_1.isMacintosh ? 'Meta' : 'Control';
         document.addEventListener('keydown', (e) => {
             if (e.key === key) {
                 this._isCommandOrCtrl = true;

package/lib/browser/terminal.input.js.map CHANGED Viewed

	@@ -1 +1 @@
1	- {"version":3,"file":"terminal.input.js","sourceRoot":"","sources":["../../src/browser/terminal.input.ts"],"names":[],"mappings":";;;;AAAA,qCAA0C;AAC1C~~,qEAAqE~~;~~AAGrE~~,IAAa,4BAA4B,GAAzC,MAAa,4BAA4B;IAAzC;QACU,qBAAgB,GAAG,KAAK,CAAC;IAqBnC,CAAC;IAnBC,IAAI,eAAe;QACjB,OAAO,IAAI,CAAC,gBAAgB,CAAC;IAC/B,CAAC;IAED,MAAM;QACJ,MAAM,GAAG,GAAG,~~sBAAW~~,CAAC,CAAC,CAAC,MAAM,CAAC,CAAC,CAAC,SAAS,CAAC;QAE7C,QAAQ,CAAC,gBAAgB,CAAC,SAAS,EAAE,CAAC,CAAC,EAAE,EAAE;YACzC,IAAI,CAAC,CAAC,GAAG,KAAK,GAAG,EAAE;gBACjB,IAAI,CAAC,gBAAgB,GAAG,IAAI,CAAC;aAC9B;QACH,CAAC,CAAC,CAAC;QAEH,QAAQ,CAAC,gBAAgB,CAAC,OAAO,EAAE,CAAC,CAAC,EAAE,EAAE;YACvC,IAAI,CAAC,CAAC,GAAG,KAAK,GAAG,EAAE;gBACjB,IAAI,CAAC,gBAAgB,GAAG,KAAK,CAAC;aAC/B;QACH,CAAC,CAAC,CAAC;IACL,CAAC;CACF,CAAA;AAtBY,4BAA4B;IADxC,IAAA,eAAU,GAAE;GACA,4BAA4B,CAsBxC;AAtBY,oEAA4B"}
1	+ {"version":3,"file":"terminal.input.js","sourceRoot":"","sources":["../../src/browser/terminal.input.ts"],"names":[],"mappings":";;;;AAAA,qCAA0C;AAC1C,+DAAwD;AAGxD,IAAa,4BAA4B,GAAzC,MAAa,4BAA4B;IAAzC;QACU,qBAAgB,GAAG,KAAK,CAAC;IAqBnC,CAAC;IAnBC,IAAI,eAAe;QACjB,OAAO,IAAI,CAAC,gBAAgB,CAAC;IAC/B,CAAC;IAED,MAAM;QACJ,MAAM,GAAG,GAAG,6BAAW,CAAC,CAAC,CAAC,MAAM,CAAC,CAAC,CAAC,SAAS,CAAC;QAE7C,QAAQ,CAAC,gBAAgB,CAAC,SAAS,EAAE,CAAC,CAAC,EAAE,EAAE;YACzC,IAAI,CAAC,CAAC,GAAG,KAAK,GAAG,EAAE;gBACjB,IAAI,CAAC,gBAAgB,GAAG,IAAI,CAAC;aAC9B;QACH,CAAC,CAAC,CAAC;QAEH,QAAQ,CAAC,gBAAgB,CAAC,OAAO,EAAE,CAAC,CAAC,EAAE,EAAE;YACvC,IAAI,CAAC,CAAC,GAAG,KAAK,GAAG,EAAE;gBACjB,IAAI,CAAC,gBAAgB,GAAG,KAAK,CAAC;aAC/B;QACH,CAAC,CAAC,CAAC;IACL,CAAC;CACF,CAAA;AAtBY,4BAA4B;IADxC,IAAA,eAAU,GAAE;GACA,4BAA4B,CAsBxC;AAtBY,oEAA4B"}

package/lib/browser/terminal.internal.service.d.ts CHANGED Viewed

@@ -1,6 +1,7 @@
-import { Terminal as XTermTerminal } from 'xterm';
-import { OperatingSystem } from '@opensumi/ide-core-common/lib/platform';
-import { ITerminalService, ITerminalInternalService, ITerminalError, IPtyExitEvent, ITerminalController, TerminalOptions, ITerminalProfile, IShellLaunchConfig, ITerminalConnection, IPtyProcessChangeEvent } from '../common';
+/// <reference types="xterm" />
+import { OperatingSystem } from '@opensumi/ide-core-common';
+import { ITerminalService, ITerminalInternalService, ITerminalError, IPtyExitEvent, ITerminalController, ITerminalProfile, IShellLaunchConfig, ITerminalConnection, IPtyProcessChangeEvent } from '../common';
+import { IXTerm } from '../common/xterm';
 export declare class TerminalInternalService implements ITerminalInternalService {
     protected readonly service: ITerminalService;
     protected readonly controller: ITerminalController;
@@ -9,7 +10,6 @@ export declare class TerminalInternalService implements ITerminalInternalService
     getOptions(): import("xterm").ITerminalOptions;
     check(sessionIds: string[]): Promise<boolean>;
     private _getExtHostProxy;
-    attach(sessionId: string, xterm: XTermTerminal, rows: number, cols: number, options: TerminalOptions | undefined, type: string): Promise<ITerminalConnection | undefined>;
     sendText(sessionId: string, message: string): Promise<void>;
     resize(sessionId: string, cols: number, rows: number): Promise<void>;
     disposeById(sessionId: string): void;
@@ -17,10 +17,10 @@ export declare class TerminalInternalService implements ITerminalInternalService
     onError(handler: (error: ITerminalError) => void): import("@opensumi/ide-core-common").IDisposable;
     onExit(handler: (event: IPtyExitEvent) => void): import("@opensumi/ide-core-common").IDisposable;
     onProcessChange(handler: (event: IPtyProcessChangeEvent) => void): import("@opensumi/ide-core-common").IDisposable;
-    getOs(): Promise<OperatingSystem>;
+    getOS(): Promise<OperatingSystem>;
     getProfiles(autoDetect: boolean): Promise<ITerminalProfile[]>;
     getDefaultSystemShell(): Promise<string>;
     getCodePlatformKey(): Promise<'osx' | 'windows' | 'linux'>;
-    attachByLaunchConfig(sessionId: string, cols: number, rows: number, launchConfig: IShellLaunchConfig): Promise<ITerminalConnection | undefined>;
+    attachByLaunchConfig(sessionId: string, cols: number, rows: number, launchConfig: IShellLaunchConfig, xterm: IXTerm): Promise<ITerminalConnection | undefined>;
 }
 //# sourceMappingURL=terminal.internal.service.d.ts.map

package/lib/browser/terminal.internal.service.d.ts.map CHANGED Viewed

	@@ -1 +1 @@
1	- {"version":3,"file":"terminal.internal.service.d.ts","sourceRoot":"","sources":["../../src/browser/terminal.internal.service.ts"],"names":[],"mappings":"~~AAAA,OAAO,EAAE,QAAQ,IAAI,aAAa,EAAE,MAAM,OAAO,CAAC~~;~~AAGlD~~,OAAO,EAAE,eAAe,EAAE,MAAM,~~wCAAwC~~,CAAC;~~AAEzE~~,OAAO,EAEL,gBAAgB,EAChB,wBAAwB,EACxB,cAAc,EACd,aAAa,EACb,mBAAmB,EACnB,~~eAAe,EACf,~~gBAAgB,EAChB,kBAAkB,EAClB,mBAAmB,EACnB,sBAAsB,~~EACvB~~,MAAM,WAAW,CAAC;~~AAInB~~,qBACa,uBAAwB,YAAW,wBAAwB;IAEtE,SAAS,CAAC,QAAQ,CAAC,OAAO,EAAE,gBAAgB,CAAC;IAG7C,SAAS,CAAC,QAAQ,CAAC,UAAU,EAAE,mBAAmB,CAAC;IAEnD,OAAO,CAAC,sBAAsB,CAAkD;IAEhF,iBAAiB;IAIjB,UAAU;IAIV,KAAK,CAAC,UAAU,EAAE,MAAM,EAAE;IAI1B,OAAO,CAAC,gBAAgB;IAIlB,~~MAAM,CACV,SAAS,EAAE,MAAM,EACjB,KAAK,EAAE,aAAa,EACpB,IAAI,EAAE,MAAM,EACZ,IAAI,EAAE,MAAM,EACZ,OAAO,6BAAsB,EAC7B,IAAI,EAAE,MAAM;IAoBR,~~QAAQ,CAAC,SAAS,EAAE,MAAM,EAAE,OAAO,EAAE,MAAM;IAQ3C,MAAM,CAAC,SAAS,EAAE,MAAM,EAAE,IAAI,EAAE,MAAM,EAAE,IAAI,EAAE,MAAM;IAQ1D,WAAW,CAAC,SAAS,EAAE,MAAM;IASvB,YAAY,CAAC,SAAS,EAAE,MAAM;IAQpC,OAAO,CAAC,OAAO,EAAE,CAAC,KAAK,EAAE,cAAc,KAAK,IAAI;IAIhD,MAAM,CAAC,OAAO,EAAE,CAAC,KAAK,EAAE,aAAa,KAAK,IAAI;IAI9C,eAAe,CAAC,OAAO,EAAE,CAAC,KAAK,EAAE,sBAAsB,KAAK,IAAI;IAI1D,KAAK,IAAI,OAAO,CAAC,eAAe,CAAC;IAIjC,WAAW,CAAC,UAAU,EAAE,OAAO,GAAG,OAAO,CAAC,gBAAgB,EAAE,CAAC;IAI7D,qBAAqB,IAAI,OAAO,CAAC,MAAM,CAAC;IAIxC,kBAAkB,IAAI,OAAO,CAAC,KAAK,GAAG,SAAS,GAAG,OAAO,CAAC;IAI1D,oBAAoB,CACxB,SAAS,EAAE,MAAM,EACjB,IAAI,EAAE,MAAM,EACZ,IAAI,EAAE,MAAM,EACZ,YAAY,EAAE,kBAAkB,~~GAC/B~~,OAAO,CAAC,mBAAmB,GAAG,SAAS,CAAC;CAkB5C"}
1	+ {"version":3,"file":"terminal.internal.service.d.ts","sourceRoot":"","sources":["../../src/browser/terminal.internal.service.ts"],"names":[],"mappings":";AACA,OAAO,EAAE,eAAe,EAAE,MAAM,2BAA2B,CAAC;AAE5D,OAAO,EAEL,gBAAgB,EAChB,wBAAwB,EACxB,cAAc,EACd,aAAa,EACb,mBAAmB,EACnB,gBAAgB,EAChB,kBAAkB,EAClB,mBAAmB,EACnB,sBAAsB,EAEvB,MAAM,WAAW,CAAC;AACnB,OAAO,EAAE,MAAM,EAAE,MAAM,iBAAiB,CAAC;AAIzC,qBACa,uBAAwB,YAAW,wBAAwB;IAEtE,SAAS,CAAC,QAAQ,CAAC,OAAO,EAAE,gBAAgB,CAAC;IAG7C,SAAS,CAAC,QAAQ,CAAC,UAAU,EAAE,mBAAmB,CAAC;IAEnD,OAAO,CAAC,sBAAsB,CAAkD;IAEhF,iBAAiB;IAIjB,UAAU;IAIV,KAAK,CAAC,UAAU,EAAE,MAAM,EAAE;IAI1B,OAAO,CAAC,gBAAgB;IAIlB,QAAQ,CAAC,SAAS,EAAE,MAAM,EAAE,OAAO,EAAE,MAAM;IAQ3C,MAAM,CAAC,SAAS,EAAE,MAAM,EAAE,IAAI,EAAE,MAAM,EAAE,IAAI,EAAE,MAAM;IAQ1D,WAAW,CAAC,SAAS,EAAE,MAAM;IASvB,YAAY,CAAC,SAAS,EAAE,MAAM;IAQpC,OAAO,CAAC,OAAO,EAAE,CAAC,KAAK,EAAE,cAAc,KAAK,IAAI;IAIhD,MAAM,CAAC,OAAO,EAAE,CAAC,KAAK,EAAE,aAAa,KAAK,IAAI;IAI9C,eAAe,CAAC,OAAO,EAAE,CAAC,KAAK,EAAE,sBAAsB,KAAK,IAAI;IAI1D,KAAK,IAAI,OAAO,CAAC,eAAe,CAAC;IAIjC,WAAW,CAAC,UAAU,EAAE,OAAO,GAAG,OAAO,CAAC,gBAAgB,EAAE,CAAC;IAI7D,qBAAqB,IAAI,OAAO,CAAC,MAAM,CAAC;IAIxC,kBAAkB,IAAI,OAAO,CAAC,KAAK,GAAG,SAAS,GAAG,OAAO,CAAC;IAI1D,oBAAoB,CACxB,SAAS,EAAE,MAAM,EACjB,IAAI,EAAE,MAAM,EACZ,IAAI,EAAE,MAAM,EACZ,YAAY,EAAE,kBAAkB,EAChC,KAAK,EAAE,MAAM,GACZ,OAAO,CAAC,mBAAmB,GAAG,SAAS,CAAC;CAkB5C"}

package/lib/browser/terminal.internal.service.js CHANGED Viewed

@@ -4,7 +4,6 @@ exports.TerminalInternalService = void 0;
 const tslib_1 = require("tslib");
 const di_1 = require("@opensumi/di");
 const common_1 = require("../common");
-const terminal_ext_host_proxy_1 = require("./terminal.ext.host.proxy");
 let TerminalInternalService = class TerminalInternalService {
     constructor() {
         this._processExtHostProxies = new Map();
@@ -18,26 +17,8 @@ let TerminalInternalService = class TerminalInternalService {
     check(sessionIds) {
         return this.service.check ? this.service.check(sessionIds) : Promise.resolve(true);
     }
-    _getExtHostProxy(id) {
-        return this._processExtHostProxies.get(id);
-    }
-    async attach(sessionId, xterm, rows, cols, options = {}, type) {
-        if (options.isExtensionTerminal) {
-            const proxy = new terminal_ext_host_proxy_1.TerminalProcessExtHostProxy(sessionId, cols, rows, this.controller);
-            proxy.start();
-            proxy.onProcessExit(() => {
-                this._processExtHostProxies.delete(sessionId);
-            });
-            this._processExtHostProxies.set(sessionId, proxy);
-            return {
-                name: options.name || 'ExtensionTerminal-' + sessionId,
-                readonly: false,
-                onData: proxy.onProcessData.bind(proxy),
-                sendData: proxy.input.bind(proxy),
-                onExit: proxy.onProcessExit.bind(proxy),
-            };
-        }
-        return this.service.attach(sessionId, xterm, rows, cols, options, type);
+    _getExtHostProxy(longId) {
+        return this._processExtHostProxies.get(longId);
     }
     async sendText(sessionId, message) {
         const proxy = this._getExtHostProxy(sessionId);
@@ -77,8 +58,8 @@ let TerminalInternalService = class TerminalInternalService {
     onProcessChange(handler) {
         return this.service.onProcessChange(handler);
     }
-    async getOs() {
-        return await this.service.getOs();
+    async getOS() {
+        return await this.service.getOS();
     }
     async getProfiles(autoDetect) {
         return await this.service.getProfiles(autoDetect);
@@ -89,7 +70,7 @@ let TerminalInternalService = class TerminalInternalService {
     async getCodePlatformKey() {
         return await this.service.getCodePlatformKey();
     }
-    async attachByLaunchConfig(sessionId, cols, rows, launchConfig) {
+    async attachByLaunchConfig(sessionId, cols, rows, launchConfig, xterm) {
         if (launchConfig.customPtyImplementation) {
             const proxy = launchConfig.customPtyImplementation(sessionId, cols, rows);
             proxy.start();
@@ -105,7 +86,7 @@ let TerminalInternalService = class TerminalInternalService {
                 onExit: proxy.onProcessExit.bind(proxy),
             };
         }
-        return await this.service.attachByLaunchConfig(sessionId, cols, rows, launchConfig);
+        return await this.service.attachByLaunchConfig(sessionId, cols, rows, launchConfig, xterm);
     }
 };
 tslib_1.__decorate([

package/lib/browser/terminal.internal.service.js.map CHANGED Viewed

	@@ -1 +1 @@
1	- {"version":3,"file":"terminal.internal.service.js","sourceRoot":"","sources":["../../src/browser/terminal.internal.service.ts"],"names":[],"mappings":";;;;~~AAEA~~,qCAAqD;AAGrD,sCAYmB;~~AAEnB~~,~~uEAAwE;AAGxE,~~IAAa,uBAAuB,GAApC,MAAa,uBAAuB;IAApC;QAOU,2BAAsB,GAAG,IAAI,GAAG,EAAuC,CAAC;~~IAgIlF~~,CAAC;~~IA9HC~~,iBAAiB;QACf,OAAO,IAAI,CAAC,OAAO,CAAC,iBAAiB,CAAC,CAAC,CAAC,IAAI,CAAC,OAAO,CAAC,iBAAiB,EAAE,CAAC,CAAC,CAAC,IAAA,0BAAiB,GAAE,CAAC;IACjG,CAAC;IAED,UAAU;QACR,OAAO,IAAI,CAAC,OAAO,CAAC,UAAU,CAAC,CAAC,CAAC,IAAI,CAAC,OAAO,CAAC,UAAU,EAAE,CAAC,CAAC,CAAC,EAAE,CAAC;IAClE,CAAC;IAED,KAAK,CAAC,UAAoB;QACxB,OAAO,IAAI,CAAC,OAAO,CAAC,KAAK,CAAC,CAAC,CAAC,IAAI,CAAC,OAAO,CAAC,KAAK,CAAC,UAAU,CAAC,CAAC,CAAC,CAAC,OAAO,CAAC,OAAO,CAAC,IAAI,CAAC,CAAC;IACrF,CAAC;IAEO,gBAAgB,CAAC,~~EAAU~~;~~QACjC~~,OAAO,IAAI,CAAC,sBAAsB,CAAC,GAAG,CAAC,~~EAAE,CAAC,CAAC;IAC7C,CAAC;IAED,KAAK,CAAC,~~MAAM,~~CACV,SAAiB,EACjB,KAAoB,EACpB,IAAY,EACZ,IAAY,EACZ,UAA2B,EAAE,EAC7B,IAAY;QAEZ,IAAI,OAAO,~~CAAC,~~mBAAmB,EAAE;YAC/B,MAAM,KAAK,GAAG,IAAI,qDAA2B,~~CAAC~~,SAAS,EAAE,IAAI,EAAE,IAAI,EAAE,IAAI,CAAC,UAAU,CAAC,CAAC~~;~~YACtF~~,~~KAAK,~~CAAC~~,KAAK,EAAE,CAAC~~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~~QAEhC~~,IAAI,YAAY,CAAC,uBAAuB,EAAE;YACxC,MAAM,KAAK,GAAG,YAAY,CAAC,uBAAuB,CAAC,SAAS,EAAE,IAAI,EAAE,IAAI,CAAgC,CAAC;YACzG,KAAK,CAAC,KAAK,EAAE,CAAC;YACd,KAAK,CAAC,aAAa,CAAC,GAAG,EAAE;gBACvB,IAAI,CAAC,sBAAsB,CAAC,MAAM,CAAC,SAAS,CAAC,CAAC;YAChD,CAAC,CAAC,CAAC;YACH,IAAI,CAAC,sBAAsB,CAAC,GAAG,CAAC,SAAS,EAAE,KAAK,CAAC,CAAC;YAClD,OAAO;gBACL,IAAI,EAAE,YAAY,CAAC,IAAI,IAAI,oBAAoB,GAAG,SAAS;gBAC3D,QAAQ,EAAE,KAAK;gBACf,MAAM,EAAE,KAAK,CAAC,aAAa,CAAC,IAAI,CAAC,KAAK,CAAC;gBACvC,QAAQ,EAAE,KAAK,CAAC,KAAK,CAAC,IAAI,CAAC,KAAK,CAAC;gBACjC,MAAM,EAAE,KAAK,CAAC,aAAa,CAAC,IAAI,CAAC,KAAK,CAAC;aACxC,CAAC;SACH;QACD,OAAO,MAAM,IAAI,CAAC,OAAO,CAAC,oBAAoB,CAAC,SAAS,EAAE,IAAI,EAAE,IAAI,EAAE,YAAY,CAAC,CAAC;~~IACtF~~,CAAC;CACF,CAAA;~~AArIC~~;IADC,IAAA,cAAS,EAAC,yBAAgB,CAAC;;wDACiB;AAG7C;IADC,IAAA,cAAS,EAAC,4BAAmB,CAAC;;2DACoB;AALxC,uBAAuB;IADnC,IAAA,eAAU,GAAE;GACA,uBAAuB,~~CAuInC~~;~~AAvIY~~,0DAAuB"}
1	+ {"version":3,"file":"terminal.internal.service.js","sourceRoot":"","sources":["../../src/browser/terminal.internal.service.ts"],"names":[],"mappings":"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"}

package/lib/browser/terminal.profile.d.ts CHANGED Viewed

@@ -1,28 +1,37 @@
-import { PreferenceService } from '@opensumi/ide-core-browser';
 import { WithEventBus, IDisposable, Event } from '@opensumi/ide-core-common';
-import { IExtensionTerminalProfile, IRegisterContributedProfileArgs, IShellLaunchConfig, ITerminalContributionService, ITerminalProfile, ITerminalProfileProvider, ITerminalProfileService } from '../common';
+import { IExtensionTerminalProfile, ISaveContributedProfileArgs, IShellLaunchConfig, ITerminalProfile, ITerminalProfileProvider, ITerminalProfileService, ICreateContributedTerminalProfileOptions, ITerminalContributions } from '../common';
 export declare class TerminalProfileService extends WithEventBus implements ITerminalProfileService {
-    private _availableProfiles;
-    private terminalService;
-    preferenceService: PreferenceService;
-    terminalContributionService: ITerminalContributionService;
-    private _profilesReadyBarrier;
+    private readonly terminalService;
+    private readonly preferenceService;
+    private readonly logger;
+    private readonly _profilesReadyBarrier;
+    private onTerminalProfileResolvedEmitter;
+    /**
+     * 当用户创建了一个 Profile 时发出的事件
+     */
+    get onTerminalProfileResolved(): Event<string>;
     get profilesReady(): Promise<void>;
     private readonly _onDidChangeAvailableProfiles;
     get onDidChangeAvailableProfiles(): Event<ITerminalProfile[]>;
     constructor();
     private readonly _profileProviders;
+    private _availableProfiles;
     get availableProfiles(): ITerminalProfile[];
     private _contributedProfiles;
     get contributedProfiles(): IExtensionTerminalProfile[];
     getDefaultProfileName(): string | undefined;
     refreshAvailableProfiles(): void;
     getContributedProfileProvider(extensionIdentifier: string, id: string): ITerminalProfileProvider | undefined;
-    registerTerminalProfileProvider(extensionIdentifierenfifier: string, id: string, profileProvider: ITerminalProfileProvider): IDisposable;
+    createContributedTerminalProfile(extensionIdentifier: string, id: string, options: ICreateContributedTerminalProfileOptions): Promise<void>;
+    registerTerminalProfileProvider(extensionIdentifier: string, id: string, profileProvider: ITerminalProfileProvider): IDisposable;
     private _detectProfiles;
     private _updateContributedProfiles;
     protected _refreshAvailableProfilesNow(): Promise<void>;
     getContributedDefaultProfile(shellLaunchConfig: IShellLaunchConfig): Promise<IExtensionTerminalProfile | undefined>;
-    registerContributedProfile(args: IRegisterContributedProfileArgs): Promise<void>;
+    saveContributedProfile(args: ISaveContributedProfileArgs): Promise<void>;
+    private _rawContributedProfileMap;
+    get rawContributedProfiles(): IExtensionTerminalProfile[];
+    addContributedProfile(extensionId: string, contributions: ITerminalContributions): void;
+    removeContributedProfile(extensionId: string): void;
 }
 //# sourceMappingURL=terminal.profile.d.ts.map

package/lib/browser/terminal.profile.d.ts.map CHANGED Viewed

	@@ -1 +1 @@
1	- {"version":3,"file":"terminal.profile.d.ts","sourceRoot":"","sources":["../../src/browser/terminal.profile.ts"],"names":[],"mappings":"~~AACA~~,OAAO,~~EAAE,iBAAiB,EAAE,MAAM,4BAA4B,CAAC;AAC/D,OAAO,~~EAGL,YAAY,EACZ,WAAW,EACX,KAAK,~~EAKN~~,MAAM,2BAA2B,CAAC;~~AAEnC~~,OAAO,EACL,yBAAyB,EACzB~~,+BAA+B~~,~~EAC/B~~,kBAAkB,EAClB,~~4BAA4B,EAC5B,~~gBAAgB,EAEhB,wBAAwB,EACxB,uBAAuB,~~EAGxB~~,MAAM,WAAW,CAAC;~~AAInB~~,qBACa,sBAAuB,SAAQ,YAAa,YAAW,uBAAuB;~~IACzF~~,OAAO,CAAC,~~kBAAkB~~,~~CAAiC~~;~~IAG3D~~,OAAO,CAAC,~~eAAe~~,~~CAAmB;IAG1C~~,iBAAiB,~~EAAE~~,~~iBAAiB~~,CAAC~~;IAGrC~~,~~2BAA2B~~,~~EAAE~~,~~4BAA4B~~,~~CAAC~~;~~IAE1D~~,OAAO,CAAC,qBAAqB,CAAkB;~~IAE/C~~,IAAI,aAAa,IAAI,OAAO,CAAC,IAAI,CAAC,CAEjC;IACD,OAAO,CAAC,QAAQ,CAAC,6BAA6B,CAAqC;IACnF,IAAI,4BAA4B,IAAI,KAAK,CAAC,gBAAgB,EAAE,CAAC,CAE5D;;IAWD,OAAO,CAAC,QAAQ,CAAC,iBAAiB,CACtB;IAEZ,IAAI,iBAAiB,IAAI,gBAAgB,EAAE,CAE1C;IAED,OAAO,CAAC,oBAAoB,CAAmC;IAC/D,IAAI,mBAAmB,IAAI,yBAAyB,EAAE,CAErD;IAED,qBAAqB,IAAI,MAAM,GAAG,SAAS;IAO3C,wBAAwB,IAAI,IAAI;IAIhC,6BAA6B,CAAC,mBAAmB,EAAE,MAAM,EAAE,EAAE,EAAE,MAAM,GAAG,wBAAwB,GAAG,SAAS;~~IAKrG~~,+BAA+B,CACpC,~~2BAA2B~~,EAAE,MAAM,~~EACnC~~,EAAE,EAAE,MAAM,EACV,eAAe,EAAE,wBAAwB,GACxC,WAAW;YAUA,eAAe;YAIf,0BAA0B;cAyBxB,4BAA4B,IAAI,OAAO,CAAC,IAAI,CAAC;~~IAYvD~~,4BAA4B,CAChC,iBAAiB,EAAE,kBAAkB,GACpC,OAAO,CAAC,yBAAyB,GAAG,SAAS,CAAC;IAY3C,~~0BAA0B~~,CAAC,IAAI,EAAE~~,+BAA+B~~,GAAG,OAAO,CAAC,IAAI,CAAC;~~CAqBvF~~"}
1	+ {"version":3,"file":"terminal.profile.d.ts","sourceRoot":"","sources":["../../src/browser/terminal.profile.ts"],"names":[],"mappings":"AAEA,OAAO,EAGL,YAAY,EACZ,WAAW,EACX,KAAK,EAMN,MAAM,2BAA2B,CAAC;AAGnC,OAAO,EACL,yBAAyB,EACzB,2BAA2B,EAC3B,kBAAkB,EAClB,gBAAgB,EAEhB,wBAAwB,EACxB,uBAAuB,EAGvB,wCAAwC,EAExC,sBAAsB,EACvB,MAAM,WAAW,CAAC;AAKnB,qBACa,sBAAuB,SAAQ,YAAa,YAAW,uBAAuB;IAEzF,OAAO,CAAC,QAAQ,CAAC,eAAe,CAAmB;IAGnD,OAAO,CAAC,QAAQ,CAAC,iBAAiB,CAAoB;IAGtD,OAAO,CAAC,QAAQ,CAAC,MAAM,CAAU;IAEjC,OAAO,CAAC,QAAQ,CAAC,qBAAqB,CAAkB;IAExD,OAAO,CAAC,gCAAgC,CAAkC;IAE1E;;OAEG;IACH,IAAI,yBAAyB,kBAE5B;IAED,IAAI,aAAa,IAAI,OAAO,CAAC,IAAI,CAAC,CAEjC;IACD,OAAO,CAAC,QAAQ,CAAC,6BAA6B,CAAqC;IACnF,IAAI,4BAA4B,IAAI,KAAK,CAAC,gBAAgB,EAAE,CAAC,CAE5D;;IAWD,OAAO,CAAC,QAAQ,CAAC,iBAAiB,CACtB;IAEZ,OAAO,CAAC,kBAAkB,CAAiC;IAC3D,IAAI,iBAAiB,IAAI,gBAAgB,EAAE,CAE1C;IAED,OAAO,CAAC,oBAAoB,CAAmC;IAC/D,IAAI,mBAAmB,IAAI,yBAAyB,EAAE,CAErD;IAED,qBAAqB,IAAI,MAAM,GAAG,SAAS;IAO3C,wBAAwB,IAAI,IAAI;IAIhC,6BAA6B,CAAC,mBAAmB,EAAE,MAAM,EAAE,EAAE,EAAE,MAAM,GAAG,wBAAwB,GAAG,SAAS;IAKtG,gCAAgC,CACpC,mBAAmB,EAAE,MAAM,EAC3B,EAAE,EAAE,MAAM,EACV,OAAO,EAAE,wCAAwC,GAChD,OAAO,CAAC,IAAI,CAAC;IAcT,+BAA+B,CACpC,mBAAmB,EAAE,MAAM,EAC3B,EAAE,EAAE,MAAM,EACV,eAAe,EAAE,wBAAwB,GACxC,WAAW;YAUA,eAAe;YAIf,0BAA0B;cAyBxB,4BAA4B,IAAI,OAAO,CAAC,IAAI,CAAC;IAWvD,4BAA4B,CAChC,iBAAiB,EAAE,kBAAkB,GACpC,OAAO,CAAC,yBAAyB,GAAG,SAAS,CAAC;IAY3C,sBAAsB,CAAC,IAAI,EAAE,2BAA2B,GAAG,OAAO,CAAC,IAAI,CAAC;IAuB9E,OAAO,CAAC,yBAAyB,CAAgD;IACjF,IAAI,sBAAsB,gCAEzB;IAED,qBAAqB,CAAC,WAAW,EAAE,MAAM,EAAE,aAAa,EAAE,sBAAsB;IAYhF,wBAAwB,CAAC,WAAW,EAAE,MAAM,GAAG,IAAI;CASpD"}

package/lib/browser/terminal.profile.internal.d.ts.map CHANGED Viewed

	@@ -1 +1 @@
1	- {"version":3,"file":"terminal.profile.internal.d.ts","sourceRoot":"","sources":["../../src/browser/terminal.profile.internal.ts"],"names":[],"mappings":"AAAA;;;GAGG;~~AAOH~~,OAAO,EACL,6BAA6B,EAC7B,gBAAgB,EAChB,+BAA+B,EAC/B,uBAAuB,EACvB,gBAAgB,EAChB,sBAAsB,EAEvB,MAAM,WAAW,CAAC;AAMnB,qBACa,8BAA+B,YAAW,+BAA+B;IAEpF,cAAc,EAAE,uBAAuB,CAAC;IAGxC,eAAe,EAAE,gBAAgB,CAAC;IAGlC,OAAO,CAAC,iBAAiB,CAAoB;IAG7C,SAAS,CAAC,QAAQ,CAAC,gBAAgB,EAAE,sBAAsB,CAAC;YAE9C,0BAA0B;IA+BlC,qBAAqB,CAAC,OAAO,CAAC,EAAE,6BAA6B,GAAG,OAAO,CAAC,gBAAgB,GAAG,SAAS,CAAC;IAerG,yBAAyB;YASjB,+BAA+B;CAoB9C"}
1	+ {"version":3,"file":"terminal.profile.internal.d.ts","sourceRoot":"","sources":["../../src/browser/terminal.profile.internal.ts"],"names":[],"mappings":"AAAA;;;GAGG;AAKH,OAAO,EACL,6BAA6B,EAC7B,gBAAgB,EAChB,+BAA+B,EAC/B,uBAAuB,EACvB,gBAAgB,EAChB,sBAAsB,EAEvB,MAAM,WAAW,CAAC;AAMnB,qBACa,8BAA+B,YAAW,+BAA+B;IAEpF,cAAc,EAAE,uBAAuB,CAAC;IAGxC,eAAe,EAAE,gBAAgB,CAAC;IAGlC,OAAO,CAAC,iBAAiB,CAAoB;IAG7C,SAAS,CAAC,QAAQ,CAAC,gBAAgB,EAAE,sBAAsB,CAAC;YAE9C,0BAA0B;IA+BlC,qBAAqB,CAAC,OAAO,CAAC,EAAE,6BAA6B,GAAG,OAAO,CAAC,gBAAgB,GAAG,SAAS,CAAC;IAerG,yBAAyB;YASjB,+BAA+B;CAoB9C"}

package/lib/browser/terminal.profile.internal.js CHANGED Viewed

@@ -8,8 +8,6 @@ exports.TerminalProfileInternalService = void 0;
 const tslib_1 = require("tslib");
 const di_1 = require("@opensumi/di");
 const ide_core_browser_1 = require("@opensumi/ide-core-browser");
-const path = tslib_1.__importStar(require("@opensumi/ide-core-common/lib/path"));
-const platform_1 = require("@opensumi/ide-core-common/lib/platform");
 const common_1 = require("../common");
 const generatedProfileName = 'Generated Profile';
 let TerminalProfileInternalService = class TerminalProfileInternalService {
@@ -23,8 +21,8 @@ let TerminalProfileInternalService = class TerminalProfileInternalService {
         let shellPath = shellType;
         const args = [];
         const platformKey = await this.terminalService.getCodePlatformKey();
-        const terminalOs = await this.terminalService.getOs();
-        if (terminalOs === platform_1.OperatingSystem.Windows) {
+        const terminalOs = await this.terminalService.getOS();
+        if (terminalOs === ide_core_browser_1.OperatingSystem.Windows) {
             shellPath = (_a = (await this.serviceClientRPC.$resolveWindowsShellPath(shellType))) !== null && _a !== void 0 ? _a : shellPath;
         }
         else {
@@ -66,8 +64,8 @@ let TerminalProfileInternalService = class TerminalProfileInternalService {
         const executable = await this.terminalService.getDefaultSystemShell();
         // Finally fallback to a generated profile
         let args;
-        const os = (_a = options === null || options === void 0 ? void 0 : options.os) !== null && _a !== void 0 ? _a : (await this.terminalService.getOs());
-        if (os === platform_1.OperatingSystem.Macintosh && path.parse(executable).name.match(/(zsh|bash)/)) {
+        const os = (_a = options === null || options === void 0 ? void 0 : options.os) !== null && _a !== void 0 ? _a : (await this.terminalService.getOS());
+        if (os === ide_core_browser_1.OperatingSystem.Macintosh && ide_core_browser_1.path.parse(executable).name.match(/(zsh|bash)/)) {
             // macOS should launch a login shell by default
             args = ['--login'];
         }

package/lib/browser/terminal.profile.internal.js.map CHANGED Viewed

	@@ -1 +1 @@
1	- {"version":3,"file":"terminal.profile.internal.js","sourceRoot":"","sources":["../../src/browser/terminal.profile.internal.ts"],"names":[],"mappings":";AAAA;;;GAGG;;;;AAEH,qCAAqD;AACrD,~~iEAA+D~~;~~AAC/D~~,~~iFAA2D;AAC3D,qEAAyE;AAEzE,~~sCAQmB;AAInB,MAAM,oBAAoB,GAAG,mBAAmB,CAAC;AAGjD,IAAa,8BAA8B,GAA3C,MAAa,8BAA8B;IAajC,KAAK,CAAC,0BAA0B;;QACtC,MAAM,SAAS,GAAG,IAAI,CAAC,iBAAiB,CAAC,GAAG,CAAS,eAAe,CAAC,CAAC;QACtE,IAAI,CAAC,SAAS,IAAI,SAAS,KAAK,SAAS,EAAE;YACzC,+BAA+B;YAC/B,OAAO;SACR;QACD,IAAI,SAAS,GAAG,SAAS,CAAC;QAC1B,MAAM,IAAI,GAAa,EAAE,CAAC;QAC1B,MAAM,WAAW,GAAG,MAAM,IAAI,CAAC,eAAe,CAAC,kBAAkB,EAAE,CAAC;QACpE,MAAM,UAAU,GAAG,MAAM,IAAI,CAAC,eAAe,CAAC,KAAK,EAAE,CAAC;QACtD,IAAI,UAAU,KAAK,~~0BAAe~~,CAAC,OAAO,EAAE;YAC1C,SAAS,GAAG,MAAA,CAAC,MAAM,IAAI,CAAC,gBAAgB,CAAC,wBAAwB,CAAC,SAA6B,CAAC,CAAC,mCAAI,SAAS,CAAC;SAChH;aAAM;YACL,SAAS,GAAG,MAAA,CAAC,MAAM,IAAI,CAAC,gBAAgB,CAAC,qBAAqB,CAAC,SAAS,CAAC,CAAC,mCAAI,SAAS,CAAC;SACzF;QAED,MAAM,oBAAoB,GAAG,IAAI,CAAC,iBAAiB,CAAC,GAAG,CACrD,GAAG,gDAAmC,GAAG,WAAW,EAAE,EACtD,EAAE,CACH,CAAC;QACF,IAAI,CAAC,IAAI,CAAC,GAAG,oBAAoB,CAAC,CAAC;QAEnC,OAAO;YACL,WAAW,EAAE,eAAe;YAC5B,IAAI,EAAE,SAAS;YACf,IAAI;YACJ,IAAI,EAAE,SAAS;YACf,SAAS,EAAE,KAAK;SACjB,CAAC;IACJ,CAAC;IAED,KAAK,CAAC,qBAAqB,CAAC,OAAuC;QACjE,sBAAsB;QACtB,MAAM,eAAe,GAAG,MAAM,IAAI,CAAC,0BAA0B,EAAE,CAAC;QAChE,IAAI,eAAe,EAAE;YACnB,OAAO,eAAe,CAAC;SACxB;QAED,MAAM,IAAI,CAAC,cAAc,CAAC,aAAa,CAAC;QACxC,IAAI,OAAO,GAAG,MAAM,IAAI,CAAC,yBAAyB,EAAE,CAAC;QACrD,IAAI,CAAC,OAAO,EAAE;YACZ,OAAO,GAAG,MAAM,IAAI,CAAC,+BAA+B,CAAC,OAAO,CAAC,CAAC;SAC/D;QACD,OAAO,OAAO,CAAC;IACjB,CAAC;IAED,KAAK,CAAC,yBAAyB;QAC7B,MAAM,IAAI,CAAC,cAAc,CAAC,aAAa,CAAC;QACxC,MAAM,kBAAkB,GAAG,IAAI,CAAC,cAAc,CAAC,qBAAqB,EAAE,CAAC;QACvE,IAAI,CAAC,kBAAkB,EAAE;YACvB,OAAO,SAAS,CAAC;SAClB;QACD,OAAO,IAAI,CAAC,cAAc,CAAC,iBAAiB,CAAC,IAAI,CAAC,CAAC,CAAC,EAAE,EAAE,CAAC,CAAC,CAAC,WAAW,KAAK,kBAAkB,CAAC,CAAC;IACjG,CAAC;IAEO,KAAK,CAAC,+BAA+B,CAAC,OAAuC;;QACnF,MAAM,UAAU,GAAG,MAAM,IAAI,CAAC,eAAe,CAAC,qBAAqB,EAAE,CAAC;QACtE,0CAA0C;QAC1C,IAAI,IAAmC,CAAC;QACxC,MAAM,EAAE,GAAG,MAAA,OAAO,aAAP,OAAO,uBAAP,OAAO,CAAE,EAAE,mCAAI,CAAC,MAAM,IAAI,CAAC,eAAe,CAAC,KAAK,EAAE,CAAC,CAAC;QAC/D,IAAI,EAAE,KAAK,~~0BAAe~~,CAAC,SAAS,IAAI,~~IAAI~~,CAAC,KAAK,CAAC,UAAU,CAAC,CAAC,IAAI,CAAC,KAAK,CAAC,YAAY,CAAC,EAAE;YACvF,+CAA+C;YAC/C,IAAI,GAAG,CAAC,SAAS,CAAC,CAAC;SACpB;aAAM;YACL,0BAA0B;YAC1B,IAAI,GAAG,EAAE,CAAC;SACX;QAED,OAAO;YACL,WAAW,EAAE,oBAAoB;YACjC,IAAI,EAAE,UAAU;YAChB,IAAI;YACJ,SAAS,EAAE,KAAK;SACjB,CAAC;IACJ,CAAC;CACF,CAAA;AAtFC;IADC,IAAA,cAAS,EAAC,gCAAuB,CAAC;;sEACK;AAGxC;IADC,IAAA,cAAS,EAAC,yBAAgB,CAAC;;uEACM;AAGlC;IADC,IAAA,cAAS,EAAC,oCAAiB,CAAC;;yEACgB;AAG7C;IADC,IAAA,cAAS,EAAC,6BAAoB,CAAC;;wEAC4B;AAXjD,8BAA8B;IAD1C,IAAA,eAAU,GAAE;GACA,8BAA8B,CAwF1C;AAxFY,wEAA8B"}
1	+ {"version":3,"file":"terminal.profile.internal.js","sourceRoot":"","sources":["../../src/browser/terminal.profile.internal.ts"],"names":[],"mappings":"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"}

package/lib/browser/terminal.profile.js CHANGED Viewed

@@ -5,19 +5,30 @@ const tslib_1 = require("tslib");
 const di_1 = require("@opensumi/di");
 const ide_core_browser_1 = require("@opensumi/ide-core-browser");
 const ide_core_common_1 = require("@opensumi/ide-core-common");
+const ide_core_common_2 = require("@opensumi/ide-core-common");
 const common_1 = require("../common");
+const { equals } = ide_core_common_1.arrays;
 let TerminalProfileService = class TerminalProfileService extends ide_core_common_1.WithEventBus {
     constructor() {
         super();
+        this.onTerminalProfileResolvedEmitter = new ide_core_common_1.Emitter();
         this._onDidChangeAvailableProfiles = new ide_core_common_1.Emitter();
         this._profileProviders = new Map();
         this._contributedProfiles = [];
+        // #region 外部插件贡献的 Terminal Profiles
+        this._rawContributedProfileMap = new Map();
         // Wait up to 5 seconds for profiles to be ready so it's assured that we know the actual
         // default terminal before launching the first terminal. This isn't expected to ever take
         // this long.
         this._profilesReadyBarrier = new ide_core_common_1.AutoOpenBarrier(5000);
         this.refreshAvailableProfiles();
     }
+    /**
+     * 当用户创建了一个 Profile 时发出的事件
+     */
+    get onTerminalProfileResolved() {
+        return this.onTerminalProfileResolvedEmitter.event;
+    }
     get profilesReady() {
         return this._profilesReadyBarrier.wait().then(() => { });
     }
@@ -40,11 +51,25 @@ let TerminalProfileService = class TerminalProfileService extends ide_core_commo
         const extMap = this._profileProviders.get(extensionIdentifier);
         return extMap === null || extMap === void 0 ? void 0 : extMap.get(id);
     }
-    registerTerminalProfileProvider(extensionIdentifierenfifier, id, profileProvider) {
-        let extMap = this._profileProviders.get(extensionIdentifierenfifier);
+    async createContributedTerminalProfile(extensionIdentifier, id, options) {
+        await this.onTerminalProfileResolvedEmitter.fireAndAwait(id);
+        const profileProvider = this.getContributedProfileProvider(extensionIdentifier, id);
+        if (!profileProvider) {
+            this.logger.error(`No terminal profile provider registered for id "${id}"`);
+            return;
+        }
+        try {
+            await profileProvider.createContributedTerminalProfile(options);
+        }
+        catch (e) {
+            this.logger.error('create contributed terminal profile error:', e.message);
+        }
+    }
+    registerTerminalProfileProvider(extensionIdentifier, id, profileProvider) {
+        let extMap = this._profileProviders.get(extensionIdentifier);
         if (!extMap) {
             extMap = new Map();
-            this._profileProviders.set(extensionIdentifierenfifier, extMap);
+            this._profileProviders.set(extensionIdentifier, extMap);
         }
         extMap.set(id, profileProvider);
         return ide_core_common_1.Disposable.create(() => this._profileProviders.delete(id));
@@ -61,14 +86,14 @@ let TerminalProfileService = class TerminalProfileService extends ide_core_commo
                 excludedContributedProfiles.push(profileName);
             }
         }
-        const filteredContributedProfiles = Array.from(this.terminalContributionService.terminalProfiles.filter((p) => !excludedContributedProfiles.includes(p.title)));
-        const contributedProfilesChanged = !(0, ide_core_common_1.equals)(filteredContributedProfiles, this._contributedProfiles, contributedProfilesEqual);
+        const filteredContributedProfiles = Array.from(this.rawContributedProfiles.filter((p) => !excludedContributedProfiles.includes(p.title)));
+        const contributedProfilesChanged = !equals(filteredContributedProfiles, this._contributedProfiles, contributedProfilesEqual);
         this._contributedProfiles = filteredContributedProfiles;
         return contributedProfilesChanged;
     }
     async _refreshAvailableProfilesNow() {
         const profiles = await this._detectProfiles(true);
-        const profilesChanged = !(0, ide_core_common_1.equals)(profiles, this._availableProfiles, profilesEqual);
+        const profilesChanged = !equals(profiles, this._availableProfiles, profilesEqual);
         const contributedProfilesChanged = await this._updateContributedProfiles();
         if (profilesChanged || contributedProfilesChanged) {
             this._availableProfiles = profiles;
@@ -87,7 +112,7 @@ let TerminalProfileService = class TerminalProfileService extends ide_core_commo
         }
         return undefined;
     }
-    async registerContributedProfile(args) {
+    async saveContributedProfile(args) {
         const platformKey = await this.terminalService.getCodePlatformKey();
         const profilesConfig = await this.preferenceService.get(`${"terminal.integrated.profiles." /* Profiles */}${platformKey}`);
         if (typeof profilesConfig === 'object') {
@@ -103,6 +128,25 @@ let TerminalProfileService = class TerminalProfileService extends ide_core_commo
         await this.preferenceService.set(`${"terminal.integrated.profiles." /* Profiles */}${platformKey}`, profilesConfig, ide_core_common_1.PreferenceScope.User);
         return;
     }
+    get rawContributedProfiles() {
+        return Array.from(this._rawContributedProfileMap.values());
+    }
+    addContributedProfile(extensionId, contributions) {
+        var _a;
+        const profiles = ((_a = contributions === null || contributions === void 0 ? void 0 : contributions.profiles) === null || _a === void 0 ? void 0 : _a.filter((p) => hasValidTerminalIcon(p)).map((e) => (Object.assign(Object.assign({}, e), { extensionIdentifier: extensionId })))) || [];
+        for (const profile of profiles) {
+            this._rawContributedProfileMap.set(profile.id, profile);
+        }
+        this.refreshAvailableProfiles();
+    }
+    removeContributedProfile(extensionId) {
+        const profiles = this.rawContributedProfiles;
+        for (const profile of profiles) {
+            if (profile.extensionIdentifier === extensionId) {
+                this._rawContributedProfileMap.delete(profile.id);
+            }
+        }
+    }
 };
 tslib_1.__decorate([
     (0, di_1.Autowired)(common_1.ITerminalService),
@@ -113,9 +157,9 @@ tslib_1.__decorate([
     tslib_1.__metadata("design:type", Object)
 ], TerminalProfileService.prototype, "preferenceService", void 0);
 tslib_1.__decorate([
-    (0, di_1.Autowired)(common_1.ITerminalContributionService),
+    (0, di_1.Autowired)(ide_core_common_1.ILogger),
     tslib_1.__metadata("design:type", Object)
-], TerminalProfileService.prototype, "terminalContributionService", void 0);
+], TerminalProfileService.prototype, "logger", void 0);
 tslib_1.__decorate([
     (0, ide_core_common_1.throttle)(2000),
     tslib_1.__metadata("design:type", Function),
@@ -143,4 +187,10 @@ function contributedProfilesEqual(one, other) {
         one.id === other.id &&
         one.title === other.title);
 }
+function hasValidTerminalIcon(profile) {
+    return (!profile.icon ||
+        typeof profile.icon === 'string' ||
+        ide_core_common_2.URI.isUri(profile.icon) ||
+        ('light' in profile.icon && 'dark' in profile.icon && ide_core_common_2.URI.isUri(profile.icon.light) && ide_core_common_2.URI.isUri(profile.icon.dark)));
+}
 //# sourceMappingURL=terminal.profile.js.map

package/lib/browser/terminal.profile.js.map CHANGED Viewed

	@@ -1 +1 @@
1	- {"version":3,"file":"terminal.profile.js","sourceRoot":"","sources":["../../src/browser/terminal.profile.ts"],"names":[],"mappings":";;;;AAAA,qCAAqD;AACrD,iEAA+D;AAC/D,+~~DAUmC~~;~~AAEnC~~,~~sCAWmB~~;~~AAKnB~~,IAAa,sBAAsB,GAAnC,MAAa,sBAAuB,SAAQ,8BAAY;~~IAsBtD~~;QACE,KAAK,EAAE,CAAC;~~QANO~~,kCAA6B,GAAG,IAAI,yBAAO,EAAsB,CAAC;QAclE,sBAAiB,GAChC,IAAI,GAAG,EAAE,CAAC;~~QAMJ~~,yBAAoB,GAAgC,EAAE,CAAC;~~QAd7D~~,wFAAwF;QACxF,yFAAyF;QACzF,aAAa;QACb,IAAI,CAAC,qBAAqB,GAAG,IAAI,iCAAe,CAAC,IAAI,CAAC,CAAC;QACvD,IAAI,CAAC,wBAAwB,EAAE,CAAC;IAClC,CAAC;~~IAfD~~,IAAI,aAAa;QACf,OAAO,IAAI,CAAC,qBAAqB,CAAC,IAAI,EAAE,CAAC,IAAI,CAAC,GAAG,EAAE,GAAE,CAAC,CAAC,CAAC;IAC1D,CAAC;IAED,IAAI,4BAA4B;QAC9B,OAAO,IAAI,CAAC,6BAA6B,CAAC,KAAK,CAAC;IAClD,CAAC;~~IAcD~~,IAAI,iBAAiB;QACnB,OAAO,IAAI,CAAC,kBAAkB,IAAI,EAAE,CAAC;IACvC,CAAC;IAGD,IAAI,mBAAmB;QACrB,OAAO,IAAI,CAAC,oBAAoB,IAAI,EAAE,CAAC;IACzC,CAAC;IAED,qBAAqB;QACnB,OAAO,IAAI,CAAC,iBAAiB,CAAC,GAAG,CAC/B,GAAG,0DAAwC,GAAG,IAAI,CAAC,eAAe,CAAC,kBAAkB,EAAE,EAAE,CAC1F,CAAC;IACJ,CAAC;IAGD,wBAAwB;QACtB,IAAI,CAAC,4BAA4B,EAAE,CAAC;IACtC,CAAC;IAED,6BAA6B,CAAC,mBAA2B,EAAE,EAAU;QACnE,MAAM,MAAM,GAAG,IAAI,CAAC,iBAAiB,CAAC,GAAG,CAAC,mBAAmB,CAAC,CAAC;QAC/D,OAAO,MAAM,aAAN,MAAM,uBAAN,MAAM,CAAE,GAAG,CAAC,EAAE,CAAC,CAAC;IACzB,CAAC;IAEM,+BAA+B,CACpC,~~2BAAmC~~,~~EACnC~~,EAAU,EACV,eAAyC;QAEzC,IAAI,MAAM,GAAG,IAAI,CAAC,iBAAiB,CAAC,GAAG,CAAC,~~2BAA2B~~,CAAC,CAAC;~~QACrE~~,IAAI,CAAC,MAAM,EAAE;YACX,MAAM,GAAG,IAAI,GAAG,EAAE,CAAC;YACnB,IAAI,CAAC,iBAAiB,CAAC,GAAG,CAAC,~~2BAA2B~~,EAAE,MAAM,CAAC,CAAC;~~SACjE~~;QACD,MAAM,CAAC,GAAG,CAAC,EAAE,EAAE,eAAe,CAAC,CAAC;QAChC,OAAO,4BAAU,CAAC,MAAM,CAAC,GAAG,EAAE,CAAC,IAAI,CAAC,iBAAiB,CAAC,MAAM,CAAC,EAAE,CAAC,CAAC,CAAC;IACpE,CAAC;IAEO,KAAK,CAAC,eAAe,CAAC,UAAU,GAAG,IAAI;QAC7C,OAAO,MAAM,IAAI,CAAC,eAAe,CAAC,WAAW,CAAC,UAAU,CAAC,CAAC;IAC5D,CAAC;IAEO,KAAK,CAAC,0BAA0B;QACtC,MAAM,WAAW,GAAG,MAAM,IAAI,CAAC,eAAe,CAAC,kBAAkB,EAAE,CAAC;QACpE,MAAM,2BAA2B,GAAa,EAAE,CAAC;QACjD,MAAM,cAAc,GAA2B,IAAI,CAAC,iBAAiB,CAAC,GAAG,CACvE,iDAAqC,WAAW,EAChD,EAAE,CACH,CAAC;QACF,KAAK,MAAM,CAAC,WAAW,EAAE,KAAK,CAAC,IAAI,MAAM,CAAC,OAAO,CAAC,cAAc,CAAC,EAAE;YACjE,IAAI,KAAK,KAAK,IAAI,EAAE;gBAClB,2BAA2B,CAAC,IAAI,CAAC,WAAW,CAAC,CAAC;aAC/C;SACF;QACD,MAAM,2BAA2B,GAAG,KAAK,CAAC,IAAI,CAC5C,IAAI,CAAC,~~2BAA2B~~,CAAC,~~gBAAgB,CAAC,~~MAAM,CAAC,CAAC,CAAC,EAAE,EAAE,CAAC,CAAC,2BAA2B,CAAC,QAAQ,CAAC,CAAC,CAAC,KAAK,CAAC,CAAC,~~CAChH~~,CAAC;QAEF,MAAM,0BAA0B,GAAG,CAAC,~~IAAA~~,~~wBAAM~~,~~EACxC,~~2BAA2B,EAC3B,IAAI,CAAC,oBAAoB,EACzB,wBAAwB,CACzB,CAAC;QACF,IAAI,CAAC,oBAAoB,GAAG,2BAA2B,CAAC;QACxD,OAAO,0BAA0B,CAAC;IACpC,CAAC;IAES,KAAK,CAAC,4BAA4B;QAC1C,MAAM,QAAQ,GAAG,MAAM,IAAI,CAAC,eAAe,CAAC,IAAI,CAAC,CAAC;QAClD,MAAM,eAAe,GAAG,CAAC,~~IAAA~~,~~wBAAM~~,~~EAAC,~~QAAQ,EAAE,IAAI,CAAC,kBAAkB,EAAE,aAAa,CAAC,CAAC;QAClF,MAAM,0BAA0B,GAAG,MAAM,IAAI,CAAC,0BAA0B,EAAE,CAAC;~~QAE3E~~,IAAI,eAAe,IAAI,0BAA0B,EAAE;YACjD,IAAI,CAAC,kBAAkB,GAAG,QAAQ,CAAC;YACnC,IAAI,CAAC,qBAAqB,CAAC,IAAI,EAAE,CAAC;YAClC,IAAI,CAAC,6BAA6B,CAAC,IAAI,CAAC,IAAI,CAAC,kBAAkB,CAAC,CAAC;SAClE;IACH,CAAC;IAED,KAAK,CAAC,4BAA4B,CAChC,iBAAqC;QAErC,gFAAgF;QAChF,0EAA0E;QAC1E,IAAI,iBAAiB,IAAI,CAAC,iBAAiB,CAAC,iBAAiB,IAAI,CAAC,CAAC,YAAY,IAAI,iBAAiB,CAAC,EAAE;YACrG,MAAM,GAAG,GAAG,MAAM,IAAI,CAAC,eAAe,CAAC,kBAAkB,EAAE,CAAC;YAC5D,MAAM,kBAAkB,GAAG,IAAI,CAAC,iBAAiB,CAAC,GAAG,CAAC,GAAG,0DAAwC,GAAG,GAAG,EAAE,CAAC,CAAC;YAC3G,MAAM,yBAAyB,GAAG,IAAI,CAAC,mBAAmB,CAAC,IAAI,CAAC,CAAC,CAAC,EAAE,EAAE,CAAC,CAAC,CAAC,KAAK,KAAK,kBAAkB,CAAC,CAAC;YACvG,OAAO,yBAAyB,CAAC;SAClC;QACD,OAAO,SAAS,CAAC;IACnB,CAAC;IAED,KAAK,CAAC,~~0BAA0B~~,CAAC,~~IAAqC~~;~~QACpE~~,MAAM,WAAW,GAAG,MAAM,IAAI,CAAC,eAAe,CAAC,kBAAkB,EAAE,CAAC;QACpE,MAAM,cAAc,GAAG,MAAM,IAAI,CAAC,iBAAiB,CAAC,GAAG,CAAC,GAAG,8CAAkC,GAAG,WAAW,EAAE,CAAC,CAAC;QAC/G,IAAI,OAAO,cAAc,KAAK,QAAQ,EAAE;YACtC,MAAM,UAAU,GAA8B;gBAC5C,mBAAmB,EAAE,IAAI,CAAC,mBAAmB;gBAC7C,IAAI,EAAE,IAAI,CAAC,OAAO,CAAC,IAAI;gBACvB,EAAE,EAAE,IAAI,CAAC,EAAE;gBACX,KAAK,EAAE,IAAI,CAAC,KAAK;gBACjB,KAAK,EAAE,IAAI,CAAC,OAAO,CAAC,KAAK;aAC1B,CAAC;YAED,cAA4D,CAAC,IAAI,CAAC,KAAK,CAAC,GAAG,UAAU,CAAC;SACxF;QACD,MAAM,IAAI,CAAC,iBAAiB,CAAC,GAAG,CAC9B,GAAG,8CAAkC,GAAG,WAAW,EAAE,EACrD,cAAc,EACd,iCAAe,CAAC,IAAI,CACrB,CAAC;QACF,OAAO;IACT,CAAC;~~CACF~~,CAAA;~~AAjJC~~;IADC,IAAA,cAAS,EAAC,yBAAgB,CAAC;;+~~DACc~~;~~AAG1C~~;IADC,IAAA,cAAS,EAAC,oCAAiB,CAAC;;~~iEACQ~~;~~AAGrC~~;IADC,IAAA,cAAS,EAAC,~~qCAA4B~~,CAAC;;~~2EACkB~~;~~AAwC1D~~;IADC,IAAA,0BAAQ,EAAC,IAAI,CAAC;;;;sEAGd;~~AApDU~~,sBAAsB;IADlC,IAAA,eAAU,GAAE;;GACA,sBAAsB,~~CAqJlC~~;~~AArJY~~,wDAAsB;~~AAuJnC~~,SAAS,aAAa,CAAC,GAAqB,EAAE,KAAuB;IACnE,OAAO,CACL,GAAG,CAAC,WAAW,KAAK,KAAK,CAAC,WAAW;QACrC,IAAA,iCAAwB,EAAC,GAAG,CAAC,IAAI,EAAE,KAAK,CAAC,IAAI,CAAC;QAC9C,GAAG,CAAC,KAAK,KAAK,KAAK,CAAC,KAAK;QACzB,GAAG,CAAC,cAAc,KAAK,KAAK,CAAC,cAAc;QAC3C,GAAG,CAAC,SAAS,KAAK,KAAK,CAAC,SAAS;QACjC,GAAG,CAAC,YAAY,KAAK,KAAK,CAAC,YAAY;QACvC,GAAG,CAAC,IAAI,KAAK,KAAK,CAAC,IAAI,CACxB,CAAC;AACJ,CAAC;AAED,SAAS,wBAAwB,CAAC,GAA8B,EAAE,KAAgC;IAChG,OAAO,CACL,GAAG,CAAC,mBAAmB,KAAK,KAAK,CAAC,mBAAmB;QACrD,GAAG,CAAC,KAAK,KAAK,KAAK,CAAC,KAAK;QACzB,GAAG,CAAC,IAAI,KAAK,KAAK,CAAC,IAAI;QACvB,GAAG,CAAC,EAAE,KAAK,KAAK,CAAC,EAAE;QACnB,GAAG,CAAC,KAAK,KAAK,KAAK,CAAC,KAAK,CAC1B,CAAC;AACJ,CAAC"}
1	+ {"version":3,"file":"terminal.profile.js","sourceRoot":"","sources":["../../src/browser/terminal.profile.ts"],"names":[],"mappings":"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"}

package/lib/browser/terminal.restore.d.ts.map CHANGED Viewed

	@@ -1 +1 @@
1	- {"version":3,"file":"terminal.restore.d.ts","sourceRoot":"","sources":["../../src/browser/terminal.restore.ts"],"names":[],"mappings":"AACA,OAAO,EAAE,UAAU,EAAE,MAAM,2BAA2B,CAAC;AAEvD,OAAO,EAAE,gBAAgB,EAAE,mBAAmB,EAAE,wBAAwB,EAAE,MAAM,WAAW,CAAC;AAE5F,qBACa,eAAgB,SAAQ,UAAW,YAAW,gBAAgB;IAEzE,UAAU,EAAE,mBAAmB,CAAC;IAGhC,SAAS,CAAC,QAAQ,CAAC,OAAO,EAAE,wBAAwB,CAAC;IAErD,IAAI,UAAU,~~WAEb~~;IAED,IAAI;IAMJ,OAAO;~~CAYR~~"}
1	+ {"version":3,"file":"terminal.restore.d.ts","sourceRoot":"","sources":["../../src/browser/terminal.restore.ts"],"names":[],"mappings":"AACA,OAAO,EAAE,UAAU,EAAE,MAAM,2BAA2B,CAAC;AAEvD,OAAO,EAAE,gBAAgB,EAAE,mBAAmB,EAAE,wBAAwB,EAAE,MAAM,WAAW,CAAC;AAE5F,qBACa,eAAgB,SAAQ,UAAW,YAAW,gBAAgB;IAEzE,UAAU,EAAE,mBAAmB,CAAC;IAGhC,SAAS,CAAC,QAAQ,CAAC,OAAO,EAAE,wBAAwB,CAAC;IAErD,IAAI,UAAU,WAGb;IAED,IAAI;IAMJ,OAAO;CAaR"}

package/lib/browser/terminal.restore.js CHANGED Viewed

@@ -7,7 +7,8 @@ const ide_core_common_1 = require("@opensumi/ide-core-common");
 const common_1 = require("../common");
 let TerminalRestore = class TerminalRestore extends ide_core_common_1.Disposable {
     get storageKey() {
-        return 'KAITIAN';
+        // 集成方根据自己的场景来自定义storageKey做到终端恢复场景的准确性
+        return 'OPENSUMI_TERMINAL_RESTORE';
     }
     save() {
         const json = this.controller.toJSON();
@@ -17,6 +18,7 @@ let TerminalRestore = class TerminalRestore extends ide_core_common_1.Disposable
     restore() {
         const key = this.storageKey;
         const history = window.localStorage.getItem(key);
+        window.localStorage.removeItem(key); // 触发恢复之后清除掉缓存
         if (history) {
             try {
                 return this.controller.recovery(JSON.parse(history));

package/lib/browser/terminal.restore.js.map CHANGED Viewed

	@@ -1 +1 @@
1	- {"version":3,"file":"terminal.restore.js","sourceRoot":"","sources":["../../src/browser/terminal.restore.ts"],"names":[],"mappings":";;;;AAAA,qCAAqD;AACrD,+DAAuD;AAEvD,sCAA4F;AAG5F,IAAa,eAAe,GAA5B,MAAa,eAAgB,SAAQ,4BAAU;IAO7C,IAAI,UAAU;QACZ,OAAO,~~SAAS~~,CAAC;~~IACnB~~,CAAC;IAED,IAAI;QACF,MAAM,IAAI,GAAG,IAAI,CAAC,UAAU,CAAC,MAAM,EAAE,CAAC;QACtC,MAAM,GAAG,GAAG,IAAI,CAAC,UAAU,CAAC;QAC5B,MAAM,CAAC,YAAY,CAAC,OAAO,CAAC,GAAG,EAAE,IAAI,CAAC,SAAS,CAAC,IAAI,CAAC,CAAC,CAAC;IACzD,CAAC;IAED,OAAO;QACL,MAAM,GAAG,GAAG,IAAI,CAAC,UAAU,CAAC;QAC5B,MAAM,OAAO,GAAG,MAAM,CAAC,YAAY,CAAC,OAAO,CAAC,GAAG,CAAC,CAAC;QACjD,IAAI,OAAO,EAAE;YACX,IAAI;gBACF,OAAO,IAAI,CAAC,UAAU,CAAC,QAAQ,CAAC,IAAI,CAAC,KAAK,CAAC,OAAO,CAAC,CAAC,CAAC;aACtD;YAAC,WAAM;gBACN,cAAc;aACf;SACF;QACD,OAAO,OAAO,CAAC,OAAO,EAAE,CAAC;IAC3B,CAAC;CACF,CAAA;~~AA3BC~~;IADC,IAAA,cAAS,EAAC,4BAAmB,CAAC;;mDACC;AAGhC;IADC,IAAA,cAAS,EAAC,iCAAwB,CAAC;;gDACiB;AAL1C,eAAe;IAD3B,IAAA,eAAU,GAAE;GACA,eAAe,~~CA6B3B~~;~~AA7BY~~,0CAAe"}
1	+ {"version":3,"file":"terminal.restore.js","sourceRoot":"","sources":["../../src/browser/terminal.restore.ts"],"names":[],"mappings":";;;;AAAA,qCAAqD;AACrD,+DAAuD;AAEvD,sCAA4F;AAG5F,IAAa,eAAe,GAA5B,MAAa,eAAgB,SAAQ,4BAAU;IAO7C,IAAI,UAAU;QACZ,uCAAuC;QACvC,OAAO,2BAA2B,CAAC;IACrC,CAAC;IAED,IAAI;QACF,MAAM,IAAI,GAAG,IAAI,CAAC,UAAU,CAAC,MAAM,EAAE,CAAC;QACtC,MAAM,GAAG,GAAG,IAAI,CAAC,UAAU,CAAC;QAC5B,MAAM,CAAC,YAAY,CAAC,OAAO,CAAC,GAAG,EAAE,IAAI,CAAC,SAAS,CAAC,IAAI,CAAC,CAAC,CAAC;IACzD,CAAC;IAED,OAAO;QACL,MAAM,GAAG,GAAG,IAAI,CAAC,UAAU,CAAC;QAC5B,MAAM,OAAO,GAAG,MAAM,CAAC,YAAY,CAAC,OAAO,CAAC,GAAG,CAAC,CAAC;QACjD,MAAM,CAAC,YAAY,CAAC,UAAU,CAAC,GAAG,CAAC,CAAC,CAAC,cAAc;QACnD,IAAI,OAAO,EAAE;YACX,IAAI;gBACF,OAAO,IAAI,CAAC,UAAU,CAAC,QAAQ,CAAC,IAAI,CAAC,KAAK,CAAC,OAAO,CAAC,CAAC,CAAC;aACtD;YAAC,WAAM;gBACN,cAAc;aACf;SACF;QACD,OAAO,OAAO,CAAC,OAAO,EAAE,CAAC;IAC3B,CAAC;CACF,CAAA;AA7BC;IADC,IAAA,cAAS,EAAC,4BAAmB,CAAC;;mDACC;AAGhC;IADC,IAAA,cAAS,EAAC,iCAAwB,CAAC;;gDACiB;AAL1C,eAAe;IAD3B,IAAA,eAAU,GAAE;GACA,eAAe,CA+B3B;AA/BY,0CAAe"}

package/lib/browser/terminal.search.d.ts.map CHANGED Viewed

	@@ -1 +1 @@
1	- {"version":3,"file":"terminal.search.d.ts","sourceRoot":"","sources":["../../src/browser/terminal.search.ts"],"names":[],"mappings":"AAGA,OAAO,~~EAAE~~,OAAO,EAAE,KAAK,EAAE,MAAM,2BAA2B,CAAC;~~AAE3D~~,OAAO,EAAE,sBAAsB,EAAE,yBAAyB,EAAE,mBAAmB,EAAE,eAAe,EAAE,MAAM,WAAW,CAAC;AAEpH,qBACa,qBAAsB,YAAW,sBAAsB;IAElE,IAAI,EAAE,OAAO,CAAC;IAGd,KAAK,EAAE,MAAM,CAAC;IAGd,UAAU,EAAE,mBAAmB,CAAC;IAGhC,YAAY,EAAE,yBAAyB,CAAC;IAExC,SAAS,CAAC,OAAO,gBAAuB;IAExC,MAAM,EAAE,KAAK,CAAC,IAAI,CAAC,CAAsB;IAEzC,IAAI,MAAM,IAAI,eAAe,GAAG,SAAS,CAExC;IAED,IAAI;IAKJ,KAAK;IAKL,KAAK;~~IAKL~~,MAAM;CAGP"}
1	+ {"version":3,"file":"terminal.search.d.ts","sourceRoot":"","sources":["../../src/browser/terminal.search.ts"],"names":[],"mappings":"AAGA,OAAO,EAAY,OAAO,EAAE,KAAK,EAAE,MAAM,2BAA2B,CAAC;AAErE,OAAO,EAAE,sBAAsB,EAAE,yBAAyB,EAAE,mBAAmB,EAAE,eAAe,EAAE,MAAM,WAAW,CAAC;AAEpH,qBACa,qBAAsB,YAAW,sBAAsB;IAElE,IAAI,EAAE,OAAO,CAAC;IAGd,KAAK,EAAE,MAAM,CAAC;IAGd,UAAU,EAAE,mBAAmB,CAAC;IAGhC,YAAY,EAAE,yBAAyB,CAAC;IAExC,SAAS,CAAC,OAAO,gBAAuB;IAExC,MAAM,EAAE,KAAK,CAAC,IAAI,CAAC,CAAsB;IAEzC,IAAI,MAAM,IAAI,eAAe,GAAG,SAAS,CAExC;IAED,IAAI;IAKJ,KAAK;IAKL,KAAK;IAML,MAAM;CAGP"}

package/lib/browser/terminal.search.js CHANGED Viewed

@@ -49,6 +49,12 @@ tslib_1.__decorate([
     (0, di_1.Autowired)(common_1.ITerminalGroupViewService),
     tslib_1.__metadata("design:type", Object)
 ], TerminalSearchService.prototype, "terminalView", void 0);
+tslib_1.__decorate([
+    (0, ide_core_common_1.debounce)(150),
+    tslib_1.__metadata("design:type", Function),
+    tslib_1.__metadata("design:paramtypes", []),
+    tslib_1.__metadata("design:returntype", void 0)
+], TerminalSearchService.prototype, "search", null);
 TerminalSearchService = tslib_1.__decorate([
     (0, di_1.Injectable)()
 ], TerminalSearchService);

package/lib/browser/terminal.search.js.map CHANGED Viewed

	@@ -1 +1 @@
1	- {"version":3,"file":"terminal.search.js","sourceRoot":"","sources":["../../src/browser/terminal.search.ts"],"names":[],"mappings":";;;;AAAA,+BAAkC;AAElC,qCAAqD;AACrD,+~~DAA2D~~;~~AAE3D~~,sCAAoH;AAGpH,IAAa,qBAAqB,GAAlC,MAAa,qBAAqB;IAAlC;QAaY,YAAO,GAAG,IAAI,yBAAO,EAAQ,CAAC;QAExC,WAAM,GAAgB,IAAI,CAAC,OAAO,CAAC,KAAK,CAAC;~~IAwB3C~~,CAAC;~~IAtBC~~,IAAI,MAAM;QACR,OAAO,IAAI,CAAC,UAAU,CAAC,sBAAsB,CAAC,IAAI,CAAC,YAAY,CAAC,aAAa,CAAC,EAAE,CAAC,CAAC;IACpF,CAAC;IAED,IAAI;QACF,IAAI,CAAC,IAAI,GAAG,IAAI,CAAC;QACjB,IAAI,CAAC,OAAO,CAAC,IAAI,EAAE,CAAC;IACtB,CAAC;IAED,KAAK;;QACH,MAAA,IAAI,CAAC,MAAM,0CAAE,WAAW,EAAE,CAAC;QAC3B,IAAI,CAAC,IAAI,GAAG,KAAK,CAAC;IACpB,CAAC;IAED,KAAK;;QACH,MAAA,IAAI,CAAC,MAAM,0CAAE,WAAW,EAAE,CAAC;QAC3B,IAAI,CAAC,KAAK,GAAG,EAAE,CAAC;IAClB,CAAC;~~IAED~~,MAAM;;QACJ,MAAA,IAAI,CAAC,MAAM,0CAAE,QAAQ,CAAC,IAAI,CAAC,KAAK,CAAC,CAAC;IACpC,CAAC;CACF,CAAA;~~AArCC~~;IADC,iBAAU;;mDACG;AAGd;IADC,iBAAU;;oDACG;AAGd;IADC,IAAA,cAAS,EAAC,4BAAmB,CAAC;;yDACC;AAGhC;IADC,IAAA,cAAS,EAAC,kCAAyB,CAAC;;2DACG;~~AAX7B~~,qBAAqB;IADjC,IAAA,eAAU,GAAE;GACA,qBAAqB,~~CAuCjC~~;~~AAvCY~~,sDAAqB"}
1	+ {"version":3,"file":"terminal.search.js","sourceRoot":"","sources":["../../src/browser/terminal.search.ts"],"names":[],"mappings":";;;;AAAA,+BAAkC;AAElC,qCAAqD;AACrD,+DAAqE;AAErE,sCAAoH;AAGpH,IAAa,qBAAqB,GAAlC,MAAa,qBAAqB;IAAlC;QAaY,YAAO,GAAG,IAAI,yBAAO,EAAQ,CAAC;QAExC,WAAM,GAAgB,IAAI,CAAC,OAAO,CAAC,KAAK,CAAC;IAyB3C,CAAC;IAvBC,IAAI,MAAM;QACR,OAAO,IAAI,CAAC,UAAU,CAAC,sBAAsB,CAAC,IAAI,CAAC,YAAY,CAAC,aAAa,CAAC,EAAE,CAAC,CAAC;IACpF,CAAC;IAED,IAAI;QACF,IAAI,CAAC,IAAI,GAAG,IAAI,CAAC;QACjB,IAAI,CAAC,OAAO,CAAC,IAAI,EAAE,CAAC;IACtB,CAAC;IAED,KAAK;;QACH,MAAA,IAAI,CAAC,MAAM,0CAAE,WAAW,EAAE,CAAC;QAC3B,IAAI,CAAC,IAAI,GAAG,KAAK,CAAC;IACpB,CAAC;IAED,KAAK;;QACH,MAAA,IAAI,CAAC,MAAM,0CAAE,WAAW,EAAE,CAAC;QAC3B,IAAI,CAAC,KAAK,GAAG,EAAE,CAAC;IAClB,CAAC;IAGD,MAAM;;QACJ,MAAA,IAAI,CAAC,MAAM,0CAAE,QAAQ,CAAC,IAAI,CAAC,KAAK,CAAC,CAAC;IACpC,CAAC;CACF,CAAA;AAtCC;IADC,iBAAU;;mDACG;AAGd;IADC,iBAAU;;oDACG;AAGd;IADC,IAAA,cAAS,EAAC,4BAAmB,CAAC;;yDACC;AAGhC;IADC,IAAA,cAAS,EAAC,kCAAyB,CAAC;;2DACG;AA0BxC;IADC,IAAA,0BAAQ,EAAC,GAAG,CAAC;;;;mDAGb;AAvCU,qBAAqB;IADjC,IAAA,eAAU,GAAE;GACA,qBAAqB,CAwCjC;AAxCY,sDAAqB"}