@opensumi/ide-terminal-next 2.14.3-next-1645098160.0 → 2.14.3

package/lib/browser/component/terminal.view.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"terminal.view.d.ts","sourceRoot":"","sources":["../../../src/browser/component/terminal.view.tsx"],"names":[],"mappings":"AAAA,OAAO,KAAK,MAAM,OAAO,CAAC;AAe1B,OAAO,qBAAqB,CAAC;;AAG7B,wBAuGG"}
+{"version":3,"file":"terminal.view.d.ts","sourceRoot":"","sources":["../../../src/browser/component/terminal.view.tsx"],"names":[],"mappings":"AAAA,OAAO,KAAK,MAAM,OAAO,CAAC;AAc1B,OAAO,qBAAqB,CAAC;;AAG7B,wBAkGG"}

package/lib/browser/component/terminal.view.js

@@ -29,13 +29,7 @@ exports.default = (0, mobx_react_lite_1.observer)(() => {
     });
     const renderWidget = (widget, index) => {
         const client = controller.findClientFromWidgetId(widget.id);
-        let error;
-        if (client) {
-            error = !network.shouldReconnect(client.id) ? errors.get(client.id) : undefined;
-        }
-        else {
-            error = errors.get(widget.id);
-        }
+        const error = client && !network.shouldReconnect(client.id) ? errors.get(client.id) : undefined;
         return react_1.default.createElement(terminal_widget_1.default, { show: currentGroupIndex === index, error: error, widget: widget });
     };
     const searchInput = (event) => {

package/lib/browser/component/terminal.view.js.map

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

package/lib/browser/component/terminal.widget.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"terminal.widget.d.ts","sourceRoot":"","sources":["../../../src/browser/component/terminal.widget.tsx"],"names":[],"mappings":";AAEA,OAAO,EAEL,OAAO,EACP,cAAc,EAGf,MAAM,cAAc,CAAC;AAItB,MAAM,WAAW,MAAM;IACrB,MAAM,EAAE,OAAO,CAAC;IAChB,IAAI,EAAE,OAAO,CAAC;IACd,KAAK,EAAE,cAAc,GAAG,SAAS,CAAC;CACnC;kDA8CwC,MAAM;AAA/C,wBAmCE"}
+{"version":3,"file":"terminal.widget.d.ts","sourceRoot":"","sources":["../../../src/browser/component/terminal.widget.tsx"],"names":[],"mappings":";AAEA,OAAO,EAA6B,OAAO,EAAE,cAAc,EAAyB,MAAM,cAAc,CAAC;AAIzG,MAAM,WAAW,MAAM;IACrB,MAAM,EAAE,OAAO,CAAC;IAChB,IAAI,EAAE,OAAO,CAAC;IACd,KAAK,EAAE,cAAc,GAAG,SAAS,CAAC;CACnC;kDAiCwC,MAAM;AAA/C,wBAmCE"}

package/lib/browser/component/terminal.widget.js

@@ -12,17 +12,8 @@ function renderError(error, eService, view) {
     const onRetryClick = () => {
         eService.fix(error.id);
     };
-    if ((error === null || error === void 0 ? void 0 : error.type) === common_1.ETerminalErrorType.CREATE_FAIL) {
-        return (react_1.default.createElement("div", { className: terminal_module_less_1.default.terminalCover },
-            react_1.default.createElement("div", null,
-                (0, ide_core_browser_1.localize)('terminal.can.not.create'),
-                ": ",
-                error.message),
-            react_1.default.createElement("div", null,
-                react_1.default.createElement("a", { onClick: onRemoveClick }, (0, ide_core_browser_1.localize)('terminal.stop')),
-                (0, ide_core_browser_1.localize)('terminal.or'),
-                react_1.default.createElement("a", { onClick: onRetryClick }, (0, ide_core_browser_1.localize)('terminal.try.recreate')))));
-    }
+    // TODO: 展示要打开的地址不存在等错误情况 + Terminal 之前的最后几行信息
+    // 比如说 TerminalError 有几个已知的错误 code
     return error.stopped ? (react_1.default.createElement("div", { className: terminal_module_less_1.default.terminalCover },
         react_1.default.createElement("div", null, (0, ide_core_browser_1.localize)('terminal.disconnected')),
         react_1.default.createElement("div", null,
@@ -48,7 +39,7 @@ exports.default = ({ widget, error, show }) => {
     }, [show]);
     react_1.default.useEffect(() => {
         widget.error = !!error;
-    }, [error]);
+    }, [!!error]);
     const onFocus = () => {
         view.selectWidget(widget.id);
     };

package/lib/browser/component/terminal.widget.js.map

@@ -1 +1 @@
-{"version":3,"file":"terminal.widget.js","sourceRoot":"","sources":["../../../src/browser/component/terminal.widget.tsx"],"names":[],"mappings":"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"}
+{"version":3,"file":"terminal.widget.js","sourceRoot":"","sources":["../../../src/browser/component/terminal.widget.tsx"],"names":[],"mappings":";;;AAAA,+DAA0B;AAC1B,iEAAqE;AACrE,yCAAyG;AAEzG,+FAA4C;AAQ5C,SAAS,WAAW,CAAC,KAAqB,EAAE,QAA+B,EAAE,IAA+B;IAC1G,MAAM,aAAa,GAAG,GAAG,EAAE;QACzB,IAAI,CAAC,YAAY,CAAC,KAAK,CAAC,EAAE,CAAC,CAAC;IAC9B,CAAC,CAAC;IAEF,MAAM,YAAY,GAAG,GAAG,EAAE;QACxB,QAAQ,CAAC,GAAG,CAAC,KAAK,CAAC,EAAE,CAAC,CAAC;IACzB,CAAC,CAAC;IAEF,8CAA8C;IAC9C,kCAAkC;IAClC,OAAO,KAAK,CAAC,OAAO,CAAC,CAAC,CAAC,CACrB,uCAAK,SAAS,EAAE,8BAAM,CAAC,aAAa;QAClC,2CAAM,IAAA,2BAAQ,EAAC,uBAAuB,CAAC,CAAO;QAC9C;YACG,IAAA,2BAAQ,EAAC,4BAA4B,CAAC;YACvC,qCAAG,OAAO,EAAE,YAAY,IAAG,IAAA,2BAAQ,EAAC,wBAAwB,CAAC,CAAK,CAC9D,CACF,CACP,CAAC,CAAC,CAAC,CACF,uCAAK,SAAS,EAAE,8BAAM,CAAC,aAAa;QAClC,2CAAM,IAAA,2BAAQ,EAAC,uBAAuB,CAAC,CAAO;QAC9C;YACE,qCAAG,OAAO,EAAE,aAAa,IAAG,IAAA,2BAAQ,EAAC,eAAe,CAAC,CAAK;YACzD,IAAA,2BAAQ,EAAC,aAAa,CAAC;YACxB,qCAAG,OAAO,EAAE,YAAY,IAAG,IAAA,2BAAQ,EAAC,wBAAwB,CAAC,CAAK,CAC9D,CACF,CACP,CAAC;AACJ,CAAC;AAED,kBAAe,CAAC,EAAE,MAAM,EAAE,KAAK,EAAE,IAAI,EAAU,EAAE,EAAE;IACjD,MAAM,OAAO,GAAG,eAAK,CAAC,SAAS,EAAkB,CAAC;IAClD,MAAM,YAAY,GAAG,IAAA,gCAAa,EAAwB,8BAAqB,CAAC,CAAC;IACjF,MAAM,IAAI,GAAG,IAAA,gCAAa,EAA4B,kCAAyB,CAAC,CAAC;IAEjF,eAAK,CAAC,SAAS,CAAC,GAAG,EAAE;QACnB,IAAI,OAAO,CAAC,OAAO,EAAE;YACnB,MAAM,CAAC,OAAO,GAAG,OAAO,CAAC,OAAO,CAAC;SAClC;IACH,CAAC,EAAE,EAAE,CAAC,CAAC;IAEP,eAAK,CAAC,SAAS,CAAC,GAAG,EAAE;QACnB,MAAM,CAAC,IAAI,GAAG,IAAI,CAAC;IACrB,CAAC,EAAE,CAAC,IAAI,CAAC,CAAC,CAAC;IAEX,eAAK,CAAC,SAAS,CAAC,GAAG,EAAE;QACnB,MAAM,CAAC,KAAK,GAAG,CAAC,CAAC,KAAK,CAAC;IACzB,CAAC,EAAE,CAAC,CAAC,CAAC,KAAK,CAAC,CAAC,CAAC;IAEd,MAAM,OAAO,GAAG,GAAG,EAAE;QACnB,IAAI,CAAC,YAAY,CAAC,MAAM,CAAC,EAAE,CAAC,CAAC;IAC/B,CAAC,CAAC;IAEF,OAAO,CACL,uCAAK,SAAS,EAAE,8BAAM,CAAC,iBAAiB;QACrC,KAAK,CAAC,CAAC,CAAC,WAAW,CAAC,KAAK,EAAE,YAAY,EAAE,IAAI,CAAC,CAAC,CAAC,CAAC,IAAI;QACtD,uDACgB,MAAM,CAAC,EAAE,EACvB,KAAK,EAAE,EAAE,OAAO,EAAE,KAAK,CAAC,CAAC,CAAC,MAAM,CAAC,CAAC,CAAC,OAAO,EAAE,EAC5C,SAAS,EAAE,8BAAM,CAAC,eAAe,EACjC,OAAO,EAAE,OAAO,EAChB,GAAG,EAAE,OAAO,GACP,CACH,CACP,CAAC;AACJ,CAAC,CAAC"}

package/lib/browser/contribution/index.d.ts

@@ -4,5 +4,4 @@ export * from './terminal.menu';
 export * from './terminal.view';
 export * from './terminal.keybinding';
 export * from './terminal.network';
-export * from './terminal.preference';
 //# sourceMappingURL=index.d.ts.map

package/lib/browser/contribution/index.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"index.d.ts","sourceRoot":"","sources":["../../../src/browser/contribution/index.ts"],"names":[],"mappings":"AAAA,cAAc,oBAAoB,CAAC;AACnC,cAAc,sBAAsB,CAAC;AACrC,cAAc,iBAAiB,CAAC;AAChC,cAAc,iBAAiB,CAAC;AAChC,cAAc,uBAAuB,CAAC;AACtC,cAAc,oBAAoB,CAAC;AACnC,cAAc,uBAAuB,CAAC"}
+{"version":3,"file":"index.d.ts","sourceRoot":"","sources":["../../../src/browser/contribution/index.ts"],"names":[],"mappings":"AAAA,cAAc,oBAAoB,CAAC;AACnC,cAAc,sBAAsB,CAAC;AACrC,cAAc,iBAAiB,CAAC;AAChC,cAAc,iBAAiB,CAAC;AAChC,cAAc,uBAAuB,CAAC;AACtC,cAAc,oBAAoB,CAAC"}

package/lib/browser/contribution/index.js

@@ -7,5 +7,4 @@ const tslib_1 = require("tslib");
 (0, tslib_1.__exportStar)(require("./terminal.view"), exports);
 (0, tslib_1.__exportStar)(require("./terminal.keybinding"), exports);
 (0, tslib_1.__exportStar)(require("./terminal.network"), exports);
-(0, tslib_1.__exportStar)(require("./terminal.preference"), exports);
 //# sourceMappingURL=index.js.map

package/lib/browser/contribution/index.js.map

@@ -1 +1 @@
-{"version":3,"file":"index.js","sourceRoot":"","sources":["../../../src/browser/contribution/index.ts"],"names":[],"mappings":";;;AAAA,kEAAmC;AACnC,oEAAqC;AACrC,+DAAgC;AAChC,+DAAgC;AAChC,qEAAsC;AACtC,kEAAmC;AACnC,qEAAsC"}
+{"version":3,"file":"index.js","sourceRoot":"","sources":["../../../src/browser/contribution/index.ts"],"names":[],"mappings":";;;AAAA,kEAAmC;AACnC,oEAAqC;AACrC,+DAAgC;AAChC,+DAAgC;AAChC,qEAAsC;AACtC,kEAAmC"}

package/lib/browser/index.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"index.d.ts","sourceRoot":"","sources":["../../src/browser/index.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,QAAQ,EAAc,MAAM,cAAc,CAAC;AACpD,OAAO,EAAE,aAAa,EAAE,MAAM,4BAA4B,CAAC;AAoD3D,qBACa,kBAAmB,SAAQ,aAAa;IACnD,SAAS,EAAE,QAAQ,EAAE,CAoFnB;IAEF,YAAY;;;QASV;CACH"}
+{"version":3,"file":"index.d.ts","sourceRoot":"","sources":["../../src/browser/index.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,QAAQ,EAAc,MAAM,cAAc,CAAC;AACpD,OAAO,EAAE,aAAa,EAAE,MAAM,4BAA4B,CAAC;AA8C3D,qBACa,kBAAmB,SAAQ,aAAa;IACnD,SAAS,EAAE,QAAQ,EAAE,CAoEnB;IAEF,YAAY;;;QASV;CACH"}

package/lib/browser/index.js

@@ -23,9 +23,6 @@ const terminal_render_1 = require("./terminal.render");
 const terminal_network_1 = require("./terminal.network");
 const environmentVariable_1 = require("../common/environmentVariable");
 const terminal_environment_service_1 = require("./terminal.environment.service");
-const terminal_profile_1 = require("./terminal.profile");
-const terminal_contribution_1 = require("./terminal.contribution");
-const terminal_profile_internal_1 = require("./terminal.profile.internal");
 let TerminalNextModule = class TerminalNextModule extends ide_core_browser_1.BrowserModule {
     constructor() {
         super(...arguments);
@@ -36,7 +33,6 @@ let TerminalNextModule = class TerminalNextModule extends ide_core_browser_1.Bro
             contribution_1.TerminalMenuContribution,
             contribution_1.TerminalKeybindinngContribution,
             contribution_1.TerminalNetworkContribution,
-            contribution_1.TerminalPreferenceContribution,
             {
                 token: common_1.ITerminalApiService,
                 useClass: terminal_api_1.TerminalApiService,
@@ -87,11 +83,7 @@ let TerminalNextModule = class TerminalNextModule extends ide_core_browser_1.Bro
             },
             {
                 token: common_1.ITerminalClientFactory,
-                useFactory: terminal_client_1.createTerminalClientFactory,
-            },
-            {
-                token: common_1.ITerminalClientFactory2,
-                useFactory: terminal_client_1.createTerminalClientFactory2,
+                useFactory: (injector) => (widget, options) => terminal_client_1.TerminalClientFactory.createClient(injector, widget, options),
             },
             {
                 token: common_1.ITerminalNetwork,
@@ -101,18 +93,6 @@ let TerminalNextModule = class TerminalNextModule extends ide_core_browser_1.Bro
                 token: environmentVariable_1.EnvironmentVariableServiceToken,
                 useClass: terminal_environment_service_1.TerminalEnvironmentService,
             },
-            {
-                token: common_1.ITerminalProfileService,
-                useClass: terminal_profile_1.TerminalProfileService,
-            },
-            {
-                token: common_1.ITerminalProfileInternalService,
-                useClass: terminal_profile_internal_1.TerminalProfileInternalService,
-            },
-            {
-                token: common_1.ITerminalContributionService,
-                useClass: terminal_contribution_1.TerminalContributionService,
-            },
         ];
         this.backServices = [
             {

package/lib/browser/index.js.map

@@ -1 +1 @@
-{"version":3,"file":"index.js","sourceRoot":"","sources":["../../src/browser/index.ts"],"names":[],"mappings":";;;;AAAA,qCAAoD;AACpD,iEAA2D;AAC3D,sCAoBmB;AACnB,qDAA2D;AAC3D,iDAQwB;AACxB,+DAA2D;AAC3D,qDAAiD;AACjD,yDAA4D;AAC5D,2EAAsE;AACtE,yDAAqD;AACrD,uDAA8F;AAC9F,iDAAoD;AACpD,uDAA0D;AAC1D,qEAAuE;AACvE,mDAA2D;AAC3D,qDAAwD;AACxD,+DAA2D;AAC3D,uDAA2D;AAC3D,yDAA4D;AAC5D,uEAAgF;AAChF,iFAA4E;AAC5E,yDAA4D;AAC5D,mEAAsE;AACtE,2EAA6E;AAG7E,IAAa,kBAAkB,GAA/B,MAAa,kBAAmB,SAAQ,gCAAa;IAArD;;QACE,cAAS,GAAe;YACtB,4CAA6B;YAC7B,yCAA0B;YAC1B,0CAA2B;YAC3B,uCAAwB;YACxB,8CAA+B;YAC/B,0CAA2B;YAC3B,6CAA8B;YAC9B;gBACE,KAAK,EAAE,4BAAmB;gBAC1B,QAAQ,EAAE,iCAAkB;aAC7B;YACD;gBACE,KAAK,EAAE,4BAAmB;gBAC1B,QAAQ,EAAE,wCAAkB;aAC7B;YACD;gBACE,KAAK,EAAE,uBAAc;gBACrB,QAAQ,EAAE,8BAAa;aACxB;YACD;gBACE,KAAK,EAAE,+BAAsB;gBAC7B,QAAQ,EAAE,uCAAqB;aAChC;YACD;gBACE,KAAK,EAAE,qCAA4B;gBACnC,QAAQ,EAAE,oDAA2B;aACtC;YACD;gBACE,KAAK,EAAE,kCAAyB;gBAChC,QAAQ,EAAE,wCAAwB;aACnC;YACD;gBACE,KAAK,EAAE,8BAAqB;gBAC5B,QAAQ,EAAE,qCAAoB;aAC/B;YACD;gBACE,KAAK,EAAE,yBAAgB;gBACvB,QAAQ,EAAE,yCAAsB;aACjC;YACD;gBACE,KAAK,EAAE,iCAAwB;gBAC/B,QAAQ,EAAE,mDAAuB;aAClC;YACD;gBACE,KAAK,EAAE,yBAAgB;gBACvB,QAAQ,EAAE,kCAAe;aAC1B;YACD;gBACE,KAAK,EAAE,gCAAmB;gBAC1B,QAAQ,EAAE,wCAAkB;aAC7B;YACD;gBACE,KAAK,EAAE,gCAAuB;gBAC9B,QAAQ,EAAE,wCAAsB;aACjC;YACD;gBACE,KAAK,EAAE,+BAAsB;gBAC7B,UAAU,EAAE,6CAA2B;aACxC;YACD;gBACE,KAAK,EAAE,gCAAuB;gBAC9B,UAAU,EAAE,8CAA4B;aACzC;YACD;gBACE,KAAK,EAAE,yBAAgB;gBACvB,QAAQ,EAAE,yCAAsB;aACjC;YACD;gBACE,KAAK,EAAE,qDAA+B;gBACtC,QAAQ,EAAE,yDAA0B;aACrC;YACD;gBACE,KAAK,EAAE,gCAAuB;gBAC9B,QAAQ,EAAE,yCAAsB;aACjC;YACD;gBACE,KAAK,EAAE,wCAA+B;gBACtC,QAAQ,EAAE,0DAA8B;aACzC;YACD;gBACE,KAAK,EAAE,qCAA4B;gBACnC,QAAQ,EAAE,mDAA2B;aACtC;SACF,CAAC;QAEF,iBAAY,GAAG;YACb;gBACE,WAAW,EAAE,6BAAoB;gBACjC,WAAW,EAAE,yBAAgB;aAC9B;YACD;gBACE,WAAW,EAAE,6BAAoB;gBACjC,WAAW,EAAE,qDAA+B;aAC7C;SACF,CAAC;IACJ,CAAC;CAAA,CAAA;AAjGY,kBAAkB;IAD9B,IAAA,eAAU,GAAE;GACA,kBAAkB,CAiG9B;AAjGY,gDAAkB"}
+{"version":3,"file":"index.js","sourceRoot":"","sources":["../../src/browser/index.ts"],"names":[],"mappings":";;;;AAAA,qCAAoD;AACpD,iEAA2D;AAC3D,sCAkBmB;AACnB,qDAA2D;AAC3D,iDAOwB;AACxB,+DAA2D;AAC3D,qDAAiD;AACjD,yDAA4D;AAC5D,2EAAsE;AACtE,yDAAqD;AACrD,uDAA0D;AAC1D,iDAAoD;AACpD,uDAA0D;AAC1D,qEAAuE;AACvE,mDAA2D;AAC3D,qDAAwD;AACxD,+DAA2D;AAC3D,uDAA2D;AAC3D,yDAA4D;AAC5D,uEAAgF;AAChF,iFAA4E;AAG5E,IAAa,kBAAkB,GAA/B,MAAa,kBAAmB,SAAQ,gCAAa;IAArD;;QACE,cAAS,GAAe;YACtB,4CAA6B;YAC7B,yCAA0B;YAC1B,0CAA2B;YAC3B,uCAAwB;YACxB,8CAA+B;YAC/B,0CAA2B;YAC3B;gBACE,KAAK,EAAE,4BAAmB;gBAC1B,QAAQ,EAAE,iCAAkB;aAC7B;YACD;gBACE,KAAK,EAAE,4BAAmB;gBAC1B,QAAQ,EAAE,wCAAkB;aAC7B;YACD;gBACE,KAAK,EAAE,uBAAc;gBACrB,QAAQ,EAAE,8BAAa;aACxB;YACD;gBACE,KAAK,EAAE,+BAAsB;gBAC7B,QAAQ,EAAE,uCAAqB;aAChC;YACD;gBACE,KAAK,EAAE,qCAA4B;gBACnC,QAAQ,EAAE,oDAA2B;aACtC;YACD;gBACE,KAAK,EAAE,kCAAyB;gBAChC,QAAQ,EAAE,wCAAwB;aACnC;YACD;gBACE,KAAK,EAAE,8BAAqB;gBAC5B,QAAQ,EAAE,qCAAoB;aAC/B;YACD;gBACE,KAAK,EAAE,yBAAgB;gBACvB,QAAQ,EAAE,yCAAsB;aACjC;YACD;gBACE,KAAK,EAAE,iCAAwB;gBAC/B,QAAQ,EAAE,mDAAuB;aAClC;YACD;gBACE,KAAK,EAAE,yBAAgB;gBACvB,QAAQ,EAAE,kCAAe;aAC1B;YACD;gBACE,KAAK,EAAE,gCAAmB;gBAC1B,QAAQ,EAAE,wCAAkB;aAC7B;YACD;gBACE,KAAK,EAAE,gCAAuB;gBAC9B,QAAQ,EAAE,wCAAsB;aACjC;YACD;gBACE,KAAK,EAAE,+BAAsB;gBAC7B,UAAU,EAAE,CAAC,QAAQ,EAAE,EAAE,CAAC,CAAC,MAAe,EAAE,OAAyB,EAAE,EAAE,CACvE,uCAAqB,CAAC,YAAY,CAAC,QAAQ,EAAE,MAAM,EAAE,OAAO,CAAC;aAChE;YACD;gBACE,KAAK,EAAE,yBAAgB;gBACvB,QAAQ,EAAE,yCAAsB;aACjC;YACD;gBACE,KAAK,EAAE,qDAA+B;gBACtC,QAAQ,EAAE,yDAA0B;aACrC;SACF,CAAC;QAEF,iBAAY,GAAG;YACb;gBACE,WAAW,EAAE,6BAAoB;gBACjC,WAAW,EAAE,yBAAgB;aAC9B;YACD;gBACE,WAAW,EAAE,6BAAoB;gBACjC,WAAW,EAAE,qDAA+B;aAC7C;SACF,CAAC;IACJ,CAAC;CAAA,CAAA;AAjFY,kBAAkB;IAD9B,IAAA,eAAU,GAAE;GACA,kBAAkB,CAiF9B;AAjFY,gDAAkB"}

package/lib/browser/terminal.api.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"terminal.api.d.ts","sourceRoot":"","sources":["../../src/browser/terminal.api.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,MAAM,MAAM,QAAQ,CAAC;AAEjC,OAAO,EAAE,KAAK,EAAW,MAAM,2BAA2B,CAAC;AAE3D,OAAO,EACL,mBAAmB,EACnB,yBAAyB,EACzB,mBAAmB,EACnB,aAAa,EACb,uBAAuB,EACvB,wBAAwB,EACxB,gBAAgB,EAChB,kBAAkB,EACnB,MAAM,WAAW,CAAC;AAEnB,qBACa,kBAAmB,YAAW,mBAAmB;IAC5D,OAAO,CAAC,kBAAkB,CAAgC;IAC1D,OAAO,CAAC,mBAAmB,CAAqC;IAChE,OAAO,CAAC,0BAA0B,CAAyB;IAE3D,QAAQ,CAAC,iBAAiB,EAAE,KAAK,CAAC,aAAa,CAAC,CAAiC;IACjF,QAAQ,CAAC,kBAAkB,EAAE,KAAK,CAAC,kBAAkB,CAAC,CAAkC;IACxF,QAAQ,CAAC,yBAAyB,EAAE,KAAK,CAAC,MAAM,CAAC,CAAyC;IAG1F,SAAS,CAAC,QAAQ,CAAC,UAAU,EAAE,mBAAmB,CAAC;IAGnD,SAAS,CAAC,QAAQ,CAAC,IAAI,EAAE,yBAAyB,CAAC;IAGnD,SAAS,CAAC,QAAQ,CAAC,OAAO,EAAE,wBAAwB,CAAC;IAGrD,SAAS,CAAC,QAAQ,CAAC,OAAO,EAAE,gBAAgB,CAAC;IAE7C,SAAS,CAAC,QAAQ,uCAA8C;;IAgBhE,IAAI,SAAS;;;;QAMZ;IAEK,cAAc,CAAC,OAAO,EAAE,MAAM,CAAC,eAAe,GAAG,OAAO,CAAC,uBAAuB,CAAC;IA0CvF,YAAY,CAAC,SAAS,EAAE,MAAM;IAI9B,QAAQ,CAAC,EAAE,EAAE,MAAM,EAAE,IAAI,EAAE,MAAM,EAAE,UAAU,UAAO;IAIpD,QAAQ,CAAC,QAAQ,EAAE,MAAM,EAAE,aAAa,UAAO;IAU/C,QAAQ,CAAC,QAAQ,EAAE,MAAM;IAUzB,UAAU,CAAC,QAAQ,EAAE,MAAM;IAU3B,YAAY,CAAC,QAAQ,EAAE,MAAM,EAAE,gBAAgB,EAAE,CAAC,OAAO,EAAE,cAAc,KAAK,IAAI;IAelF;;OAEG;IACH,oBAAoB;CAGrB"}
+{"version":3,"file":"terminal.api.d.ts","sourceRoot":"","sources":["../../src/browser/terminal.api.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,MAAM,MAAM,QAAQ,CAAC;AAEjC,OAAO,EAAE,KAAK,EAAW,MAAM,2BAA2B,CAAC;AAE3D,OAAO,EACL,mBAAmB,EACnB,yBAAyB,EACzB,mBAAmB,EACnB,aAAa,EACb,uBAAuB,EACvB,wBAAwB,EACxB,gBAAgB,EAChB,kBAAkB,EACnB,MAAM,WAAW,CAAC;AAEnB,qBACa,kBAAmB,YAAW,mBAAmB;IAC5D,OAAO,CAAC,kBAAkB,CAAgC;IAC1D,OAAO,CAAC,mBAAmB,CAAqC;IAChE,OAAO,CAAC,0BAA0B,CAAyB;IAE3D,QAAQ,CAAC,iBAAiB,EAAE,KAAK,CAAC,aAAa,CAAC,CAAiC;IACjF,QAAQ,CAAC,kBAAkB,EAAE,KAAK,CAAC,kBAAkB,CAAC,CAAkC;IACxF,QAAQ,CAAC,yBAAyB,EAAE,KAAK,CAAC,MAAM,CAAC,CAAyC;IAG1F,SAAS,CAAC,QAAQ,CAAC,UAAU,EAAE,mBAAmB,CAAC;IAGnD,SAAS,CAAC,QAAQ,CAAC,IAAI,EAAE,yBAAyB,CAAC;IAGnD,SAAS,CAAC,QAAQ,CAAC,OAAO,EAAE,wBAAwB,CAAC;IAGrD,SAAS,CAAC,QAAQ,CAAC,OAAO,EAAE,gBAAgB,CAAC;IAE7C,SAAS,CAAC,QAAQ,uCAA8C;;IAgBhE,IAAI,SAAS;;;;QAMZ;IAEK,cAAc,CAAC,OAAO,EAAE,MAAM,CAAC,eAAe,GAAG,OAAO,CAAC,uBAAuB,CAAC;IAyCvF,YAAY,CAAC,SAAS,EAAE,MAAM;IAI9B,QAAQ,CAAC,EAAE,EAAE,MAAM,EAAE,IAAI,EAAE,MAAM,EAAE,UAAU,UAAO;IAIpD,QAAQ,CAAC,QAAQ,EAAE,MAAM,EAAE,aAAa,UAAO;IAU/C,QAAQ,CAAC,QAAQ,EAAE,MAAM;IAUzB,UAAU,CAAC,QAAQ,EAAE,MAAM;IAU3B,YAAY,CAAC,QAAQ,EAAE,MAAM,EAAE,gBAAgB,EAAE,CAAC,OAAO,EAAE,cAAc,KAAK,IAAI;IAelF;;OAEG;IACH,oBAAoB;CAGrB"}

package/lib/browser/terminal.api.js

@@ -33,9 +33,8 @@ let TerminalApiService = class TerminalApiService {
         }));
     }
     async createTerminal(options) {
-        const client = await this.controller.createClientWithWidget2({
-            terminalOptions: options,
-        });
+        const self = this;
+        const client = this.controller.createClientWithWidget(options);
         const external = {
             get id() {
                 return client.id;
@@ -46,20 +45,20 @@ let TerminalApiService = class TerminalApiService {
             get processId() {
                 return client.pid;
             },
-            show: (preserveFocus = true) => {
+            show(preserveFocus = true) {
                 const widget = client.widget;
-                this.view.selectWidget(widget.id);
-                this.controller.showTerminalPanel();
+                self.view.selectWidget(widget.id);
+                self.controller.showTerminalPanel();
                 if (!preserveFocus) {
                     setTimeout(() => client.focus());
                 }
             },
-            hide: () => {
-                this.controller.hideTerminalPanel();
+            hide() {
+                self.controller.hideTerminalPanel();
             },
-            dispose: () => {
-                this.view.removeWidget(client.widget.id);
-                this._entries.delete(client.id);
+            dispose() {
+                self.view.removeWidget(client.widget.id);
+                self._entries.delete(client.id);
             },
         };
         this._entries.set(client.id, external);

package/lib/browser/terminal.api.js.map

@@ -1 +1 @@
-{"version":3,"file":"terminal.api.js","sourceRoot":"","sources":["../../src/browser/terminal.api.ts"],"names":[],"mappings":";;;;AACA,qCAAqD;AACrD,+DAA2D;AAC3D,mCAAoC;AACpC,sCASmB;AAGnB,IAAa,kBAAkB,GAA/B,MAAa,kBAAkB;IAuB7B;QAtBQ,uBAAkB,GAAG,IAAI,yBAAO,EAAiB,CAAC;QAClD,wBAAmB,GAAG,IAAI,yBAAO,EAAsB,CAAC;QACxD,+BAA0B,GAAG,IAAI,yBAAO,EAAU,CAAC;QAElD,sBAAiB,GAAyB,IAAI,CAAC,kBAAkB,CAAC,KAAK,CAAC;QACxE,uBAAkB,GAA8B,IAAI,CAAC,mBAAmB,CAAC,KAAK,CAAC;QAC/E,8BAAyB,GAAkB,IAAI,CAAC,0BAA0B,CAAC,KAAK,CAAC;QAchF,aAAQ,GAAG,IAAI,GAAG,EAAmC,CAAC;QAG9D,IAAI,CAAC,UAAU,CAAC,iBAAiB,CAAC,CAAC,IAAI,EAAE,EAAE;YACzC,IAAI,CAAC,kBAAkB,CAAC,IAAI,CAAC,IAAI,CAAC,CAAC;QACrC,CAAC,CAAC,CAAC;QAEH,IAAI,CAAC,UAAU,CAAC,kBAAkB,CAAC,CAAC,CAAC,EAAE,EAAE;YACvC,IAAI,CAAC,mBAAmB,CAAC,IAAI,CAAC,CAAC,CAAC,CAAC;QACnC,CAAC,CAAC,CAAC;QAEH,IAAI,CAAC,UAAU,CAAC,yBAAyB,CAAC,CAAC,EAAE,EAAE,EAAE;YAC/C,IAAI,CAAC,0BAA0B,CAAC,IAAI,CAAC,EAAE,CAAC,CAAC;QAC3C,CAAC,CAAC,CAAC;IACL,CAAC;IAED,IAAI,SAAS;QACX,OAAO,KAAK,CAAC,IAAI,CAAC,IAAI,CAAC,UAAU,CAAC,OAAO,CAAC,MAAM,EAAE,CAAC,CAAC,GAAG,CAAC,CAAC,CAAC,EAAE,EAAE,CAAC,CAAC;YAC9D,EAAE,EAAE,CAAC,CAAC,EAAE;YACR,IAAI,EAAE,CAAC,CAAC,IAAI;YACZ,QAAQ,EAAE,IAAI,CAAC,IAAI,CAAC,eAAe,KAAK,CAAC,CAAC,EAAE;SAC7C,CAAC,CAAC,CAAC;IACN,CAAC;IAED,KAAK,CAAC,cAAc,CAAC,OAA+B;QAClD,MAAM,MAAM,GAAG,MAAM,IAAI,CAAC,UAAU,CAAC,uBAAuB,CAAC;YAC3D,eAAe,EAAE,OAAO;SACzB,CAAC,CAAC;QAEH,MAAM,QAAQ,GAAG;YACf,IAAI,EAAE;gBACJ,OAAO,MAAM,CAAC,EAAE,CAAC;YACnB,CAAC;YACD,IAAI,IAAI;gBACN,OAAO,MAAM,CAAC,IAAI,CAAC;YACrB,CAAC;YACD,IAAI,SAAS;gBACX,OAAO,MAAM,CAAC,GAAG,CAAC;YACpB,CAAC;YACD,IAAI,EAAE,CAAC,aAAa,GAAG,IAAI,EAAE,EAAE;gBAC7B,MAAM,MAAM,GAAG,MAAM,CAAC,MAAM,CAAC;gBAC7B,IAAI,CAAC,IAAI,CAAC,YAAY,CAAC,MAAM,CAAC,EAAE,CAAC,CAAC;gBAClC,IAAI,CAAC,UAAU,CAAC,iBAAiB,EAAE,CAAC;gBAEpC,IAAI,CAAC,aAAa,EAAE;oBAClB,UAAU,CAAC,GAAG,EAAE,CAAC,MAAM,CAAC,KAAK,EAAE,CAAC,CAAC;iBAClC;YACH,CAAC;YACD,IAAI,EAAE,GAAG,EAAE;gBACT,IAAI,CAAC,UAAU,CAAC,iBAAiB,EAAE,CAAC;YACtC,CAAC;YACD,OAAO,EAAE,GAAG,EAAE;gBACZ,IAAI,CAAC,IAAI,CAAC,YAAY,CAAC,MAAM,CAAC,MAAM,CAAC,EAAE,CAAC,CAAC;gBACzC,IAAI,CAAC,QAAQ,CAAC,MAAM,CAAC,MAAM,CAAC,EAAE,CAAC,CAAC;YAClC,CAAC;SACF,CAAC;QAEF,IAAI,CAAC,QAAQ,CAAC,GAAG,CAAC,MAAM,CAAC,EAAE,EAAE,QAAQ,CAAC,CAAC;QAEvC,MAAM,MAAM,CAAC,QAAQ,CAAC,OAAO,CAAC;QAE9B,QAAQ,CAAC,IAAI,EAAE,CAAC;QAEhB,OAAO,QAAQ,CAAC;IAClB,CAAC;IAED,YAAY,CAAC,SAAiB;QAC5B,OAAO,IAAI,CAAC,OAAO,CAAC,YAAY,CAAC,SAAS,CAAC,CAAC;IAC9C,CAAC;IAED,QAAQ,CAAC,EAAU,EAAE,IAAY,EAAE,UAAU,GAAG,IAAI;QAClD,IAAI,CAAC,OAAO,CAAC,QAAQ,CAAC,EAAE,EAAE,GAAG,IAAI,GAAG,UAAU,CAAC,CAAC,CAAC,IAAI,CAAC,CAAC,CAAC,EAAE,EAAE,CAAC,CAAC;IAChE,CAAC;IAED,QAAQ,CAAC,QAAgB,EAAE,aAAa,GAAG,IAAI;QAC7C,MAAM,MAAM,GAAG,IAAI,CAAC,QAAQ,CAAC,GAAG,CAAC,QAAQ,CAAC,CAAC;QAE3C,IAAI,CAAC,MAAM,EAAE;YACX,OAAO;SACR;QAED,MAAM,CAAC,IAAI,CAAC,aAAa,CAAC,CAAC;IAC7B,CAAC;IAED,QAAQ,CAAC,QAAgB;QACvB,MAAM,MAAM,GAAG,IAAI,CAAC,QAAQ,CAAC,GAAG,CAAC,QAAQ,CAAC,CAAC;QAE3C,IAAI,CAAC,MAAM,EAAE;YACX,OAAO;SACR;QAED,MAAM,CAAC,IAAI,EAAE,CAAC;IAChB,CAAC;IAED,UAAU,CAAC,QAAgB;QACzB,MAAM,MAAM,GAAG,IAAI,CAAC,QAAQ,CAAC,GAAG,CAAC,QAAQ,CAAC,CAAC;QAE3C,IAAI,CAAC,MAAM,EAAE;YACX,OAAO;SACR;QAED,MAAM,CAAC,OAAO,EAAE,CAAC;IACnB,CAAC;IAED,YAAY,CAAC,QAAgB,EAAE,gBAAmD;QAChF,MAAM,QAAQ,GAAG,QAAQ,CAAC;QAC1B,MAAM,UAAU,GAAG,IAAI,CAAC,IAAI,CAAC,WAAW,EAAE,CAAC;QAC3C,MAAM,KAAK,GAAG,IAAI,CAAC,IAAI,CAAC,QAAQ,CAAC,UAAU,CAAC,CAAC;QAC7C,MAAM,MAAM,GAAG,IAAI,CAAC,IAAI,CAAC,YAAY,CAAC,KAAK,EAAE,QAAQ,EAAE,KAAK,EAAE,IAAI,CAAC,CAAC;QACpE,MAAM,CAAC,IAAI,GAAG,IAAA,mBAAU,EAAC,QAAQ,CAAC,CAAC;QACnC,IAAI,CAAC,IAAI,CAAC,YAAY,CAAC,QAAQ,CAAC,CAAC;QAEjC,MAAM,CAAC,QAAQ,CAAC,GAAG,EAAE;YACnB,gBAAgB,CAAC,MAAM,CAAC,OAAO,CAAC,CAAC;QACnC,CAAC,CAAC,CAAC;QAEH,OAAO,MAAM,CAAC;IAChB,CAAC;IAED;;OAEG;IACH,oBAAoB;QAClB,OAAO,IAAI,CAAC,OAAO,CAAC,oBAAoB,EAAE,CAAC;IAC7C,CAAC;CACF,CAAA;AAxIC;IADC,IAAA,cAAS,EAAC,4BAAmB,CAAC;;sDACoB;AAGnD;IADC,IAAA,cAAS,EAAC,kCAAyB,CAAC;;gDACc;AAGnD;IADC,IAAA,cAAS,EAAC,iCAAwB,CAAC;;mDACiB;AAGrD;IADC,IAAA,cAAS,EAAC,yBAAgB,CAAC;;mDACiB;AAnBlC,kBAAkB;IAD9B,IAAA,eAAU,GAAE;;GACA,kBAAkB,CAkJ9B;AAlJY,gDAAkB"}
+{"version":3,"file":"terminal.api.js","sourceRoot":"","sources":["../../src/browser/terminal.api.ts"],"names":[],"mappings":"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"}

package/lib/browser/terminal.client.d.ts

@@ -1,27 +1,33 @@
-/// <reference types="xterm" />
+import { Terminal } from 'xterm';
 import { Injector } from '@opensumi/di';
-import { Disposable, Deferred, Event, ILogger, IDisposable, IApplicationService, IReporter, Uri } from '@opensumi/ide-core-common';
+import { Disposable, Deferred, Event, ILogger, IDisposable, IApplicationService, IReporter } from '@opensumi/ide-core-common';
 import { OperatingSystem } from '@opensumi/ide-core-common/lib/platform';
 import { WorkbenchEditorService } from '@opensumi/ide-editor/lib/common';
 import { IFileServiceClient } from '@opensumi/ide-file-service/lib/common';
 import { IVariableResolverService } from '@opensumi/ide-variable/lib/common';
 import { IWorkspaceService } from '@opensumi/ide-workspace/lib/common';
 import { TerminalKeyBoardInputService } from './terminal.input';
-import { TerminalOptions, ITerminalController, ITerminalClient, ITerminalTheme, ITerminalGroupViewService, ITerminalInternalService, IWidget, ITerminalDataEvent, ITerminalExitEvent, ITerminalConnection, ITerminalExternalLinkProvider, ICreateTerminalOptions, ITerminalProfileService, ITerminalProfile, IShellLaunchConfig, ITerminalProfileInternalService } from '../common';
+import { TerminalOptions, ITerminalController, ITerminalClient, ITerminalTheme, ITerminalGroupViewService, ITerminalInternalService, IWidget, ITerminalDataEvent, ITerminalExitEvent, ITerminalExternalLinkProvider } from '../common';
 import { ITerminalPreference } from '../common/preference';
 import { CorePreferences, QuickPickService } from '@opensumi/ide-core-browser';
 import { IEnvironmentVariableService } from '../common/environmentVariable';
 import { IMessageService } from '@opensumi/ide-overlay';
-import { XTerm } from './xterm';
 export declare class TerminalClient extends Disposable implements ITerminalClient {
     static WORKSPACE_PATH_CACHED: Map<string, string>;
     /** properties */
+    private _container;
+    private _term;
     private _uid;
-    private _terminalOptions;
+    private _options;
     private _widget;
     private _workspacePath;
     private _linkManager;
     /** end */
+    /** addons */
+    private _fitAddon;
+    private _attachAddon;
+    private _searchAddon;
+    /** end */
     /** status */
     private _ready;
     private _attached;
@@ -49,8 +55,6 @@ export declare class TerminalClient extends Disposable implements ITerminalClien
     reporter: IReporter;
     protected readonly environmentService: IEnvironmentVariableService;
     protected readonly applicationService: IApplicationService;
-    terminalProfileService: ITerminalProfileService;
-    terminalProfileInternalService: ITerminalProfileInternalService;
     variableResolver: IVariableResolverService;
     private _onInput;
     onInput: Event<ITerminalDataEvent>;
@@ -62,23 +66,11 @@ export declare class TerminalClient extends Disposable implements ITerminalClien
     onLinksReady: Event<ITerminalClient>;
     private readonly _onResponseTime;
     onResponseTime: Event<number>;
-    private _attachAddon;
-    xterm: XTerm;
-    private _launchConfig;
-    constructor();
-    setupWidget(widget: IWidget): Promise<void>;
-    convertTerminalOptionsToLaunchConfig(options?: TerminalOptions): IShellLaunchConfig;
-    /**
-     * @deprecated Please use `init2` instead.
-     */
     init(widget: IWidget, options?: TerminalOptions): Promise<void>;
-    convertProfileToLaunchConfig(shellLaunchConfigOrProfile: IShellLaunchConfig | ITerminalProfile | undefined, cwd?: Uri | string): IShellLaunchConfig;
-    init2(widget: IWidget, options?: ICreateTerminalOptions): Promise<void>;
     name: string;
-    get term(): import("xterm").Terminal;
+    get term(): Terminal;
     get pid(): Promise<number | undefined>;
     get options(): TerminalOptions;
-    get createOptions(): void;
     get container(): HTMLDivElement;
     get id(): string;
     get widget(): IWidget;
@@ -89,8 +81,10 @@ export declare class TerminalClient extends Disposable implements ITerminalClien
     get areLinksReady(): boolean;
     get os(): OperatingSystem;
     private _prepareAddons;
+    private _loadAddons;
     private _xtermEvents;
     private _attachXterm;
+    private _doAttach;
     _doResize(): void;
     _prepare(): void;
     _attachAfterRender(): void;
@@ -98,13 +92,12 @@ export declare class TerminalClient extends Disposable implements ITerminalClien
     private _checkWorkspace;
     reset(): void;
     private attach;
-    private _doAttach2;
-    resolveConnection(connection: ITerminalConnection | undefined): void;
     private _setOption;
     private _checkReady;
     private _layout;
     private _renderOnDemand;
     private _debounceResize;
+    private _apply;
     focus(): void;
     clear(): void;
     selectAll(): void;
@@ -118,15 +111,6 @@ export declare class TerminalClient extends Disposable implements ITerminalClien
     dispose(clear?: boolean): void;
 }
 export declare class TerminalClientFactory {
-    /**
-     * 创建 terminal 实例最终都会调用该方法
-     */
-    static createClient(injector: Injector, widget: IWidget, options?: TerminalOptions): Promise<TerminalClient>;
-    /**
-     * 创建 terminal 实例最终都会调用该方法
-     */
-    static createClient2(injector: Injector, widget: IWidget, options?: ICreateTerminalOptions): Promise<TerminalClient>;
+    static createClient(injector: Injector, widget: IWidget, options?: TerminalOptions): TerminalClient;
 }
-export declare const createTerminalClientFactory: (injector: Injector) => (widget: IWidget, options?: TerminalOptions | undefined) => Promise<TerminalClient>;
-export declare const createTerminalClientFactory2: (injector: Injector) => (widget: IWidget, options?: ICreateTerminalOptions | undefined) => Promise<TerminalClient>;
 //# sourceMappingURL=terminal.client.d.ts.map

package/lib/browser/terminal.client.d.ts.map

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