npm - @opensumi/ide-terminal-next - Versions diffs - 2.15.4-next-1646729005.0 → 2.15.4 - Mend

@opensumi/ide-terminal-next 2.15.4-next-1646729005.0 → 2.15.4

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 (21) hide show

package/lib/browser/links/link.d.ts +0 -3
package/lib/browser/links/link.d.ts.map +1 -1
package/lib/browser/links/link.js +1 -4
package/lib/browser/links/link.js.map +1 -1
package/lib/browser/links/validated-local-link-provider.d.ts +0 -7
package/lib/browser/links/validated-local-link-provider.d.ts.map +1 -1
package/lib/browser/links/validated-local-link-provider.js +10 -60
package/lib/browser/links/validated-local-link-provider.js.map +1 -1
package/lib/browser/terminal.client.d.ts +0 -7
package/lib/browser/terminal.client.d.ts.map +1 -1
package/lib/browser/terminal.client.js +29 -31
package/lib/browser/terminal.client.js.map +1 -1
package/lib/browser/terminal.service.js +3 -3
package/lib/browser/terminal.service.js.map +1 -1
package/lib/node/pty.d.ts +1 -0
package/lib/node/pty.d.ts.map +1 -1
package/lib/node/pty.js +8 -14
package/lib/node/pty.js.map +1 -1
package/lib/node/terminal.service.client.js +1 -1
package/lib/node/terminal.service.client.js.map +1 -1
package/package.json +15 -15

package/lib/browser/links/link.d.ts CHANGED Viewed

@@ -1,8 +1,5 @@
 import type { IBufferRange, ILink, ILinkDecorations, IViewportRange, Terminal } from 'xterm';
 import { Disposable, IDisposable, Event } from '@opensumi/ide-core-common';
-export declare const OPEN_FILE_LABEL: string;
-export declare const FOLDER_IN_WORKSPACE_LABEL: string;
-export declare const FOLDER_NOT_IN_WORKSPACE_LABEL: string;
 export declare class TerminalLink extends Disposable implements ILink {
     private readonly _xterm;
     readonly range: IBufferRange;

package/lib/browser/links/link.d.ts.map CHANGED Viewed

	@@ -1 +1 @@
1	- {"version":3,"file":"link.d.ts","sourceRoot":"","sources":["../../../src/browser/links/link.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,YAAY,EAAE,KAAK,EAAE,gBAAgB,EAAE,cAAc,EAAE,QAAQ,EAAE,MAAM,OAAO,CAAC;AAE7F,OAAO,EACL,UAAU,EACV,WAAW,EAGX,KAAK,~~EAIN~~,MAAM,2BAA2B,CAAC;AAOnC,~~eAAO,MAAM,eAAe,QAAuD,CAAC;AACpF,eAAO,MAAM,yBAAyB,QAA+D,CAAC;AACtG,eAAO,MAAM,6BAA6B,QAA+D,CAAC;AAE1G,~~qBACa,YAAa,SAAQ,UAAW,YAAW,KAAK;IAgBzD,OAAO,CAAC,QAAQ,CAAC,MAAM;aACP,KAAK,EAAE,YAAY;aACnB,IAAI,EAAE,MAAM;IAC5B,OAAO,CAAC,QAAQ,CAAC,UAAU;IAC3B,OAAO,CAAC,QAAQ,CAAC,iBAAiB;IAClC,OAAO,CAAC,QAAQ,CAAC,gBAAgB;IAMjC,OAAO,CAAC,QAAQ,CAAC,qBAAqB;IACtC,QAAQ,CAAC,KAAK,EAAE,MAAM,GAAG,SAAS;IA3BpC,WAAW,EAAE,gBAAgB,CAAC;IAG9B,OAAO,CAAC,QAAQ,CAAC,iBAAiB,CAAoB;IAEtD,OAAO,CAAC,iBAAiB,CAA+B;IACxD,OAAO,CAAC,eAAe,CAAmC;IAC1D,OAAO,CAAC,kBAAkB,CAA0B;IAEpD,OAAO,CAAC,QAAQ,CAAC,cAAc,CAAuB;IACtD,IAAW,aAAa,IAAI,KAAK,CAAC,IAAI,CAAC,CAEtC;gBAGkB,MAAM,EAAE,QAAQ,EACjB,KAAK,EAAE,YAAY,EACnB,IAAI,EAAE,MAAM,EACX,UAAU,EAAE,MAAM,EAClB,iBAAiB,EAAE,CAAC,KAAK,EAAE,UAAU,GAAG,SAAS,EAAE,GAAG,EAAE,MAAM,KAAK,IAAI,EACvE,gBAAgB,EAAE,CACjC,IAAI,EAAE,YAAY,EAClB,aAAa,EAAE,cAAc,EAC7B,oBAAoB,CAAC,EAAE,MAAM,IAAI,EACjC,kBAAkB,CAAC,EAAE,MAAM,IAAI,KAC5B,WAAW,EACC,qBAAqB,EAAE,OAAO,EACtC,KAAK,EAAE,MAAM,GAAG,SAAS;IASpC,OAAO,IAAI,IAAI;IAUf,QAAQ,CAAC,KAAK,EAAE,UAAU,GAAG,SAAS,EAAE,IAAI,EAAE,MAAM,GAAG,IAAI;IAI3D,OAAO,CAAC,sBAAsB;IAO9B,KAAK,CAAC,KAAK,EAAE,UAAU,EAAE,IAAI,EAAE,MAAM,GAAG,IAAI;IAoE5C,KAAK,IAAI,IAAI;IASb,OAAO,CAAC,kBAAkB;IAS1B,OAAO,CAAC,mBAAmB;IAS3B,OAAO,CAAC,eAAe;CAGxB"}
1	+ {"version":3,"file":"link.d.ts","sourceRoot":"","sources":["../../../src/browser/links/link.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,YAAY,EAAE,KAAK,EAAE,gBAAgB,EAAE,cAAc,EAAE,QAAQ,EAAE,MAAM,OAAO,CAAC;AAE7F,OAAO,EACL,UAAU,EACV,WAAW,EAGX,KAAK,EAGN,MAAM,2BAA2B,CAAC;AAOnC,qBACa,YAAa,SAAQ,UAAW,YAAW,KAAK;IAgBzD,OAAO,CAAC,QAAQ,CAAC,MAAM;aACP,KAAK,EAAE,YAAY;aACnB,IAAI,EAAE,MAAM;IAC5B,OAAO,CAAC,QAAQ,CAAC,UAAU;IAC3B,OAAO,CAAC,QAAQ,CAAC,iBAAiB;IAClC,OAAO,CAAC,QAAQ,CAAC,gBAAgB;IAMjC,OAAO,CAAC,QAAQ,CAAC,qBAAqB;IACtC,QAAQ,CAAC,KAAK,EAAE,MAAM,GAAG,SAAS;IA3BpC,WAAW,EAAE,gBAAgB,CAAC;IAG9B,OAAO,CAAC,QAAQ,CAAC,iBAAiB,CAAoB;IAEtD,OAAO,CAAC,iBAAiB,CAA+B;IACxD,OAAO,CAAC,eAAe,CAAmC;IAC1D,OAAO,CAAC,kBAAkB,CAA0B;IAEpD,OAAO,CAAC,QAAQ,CAAC,cAAc,CAAuB;IACtD,IAAW,aAAa,IAAI,KAAK,CAAC,IAAI,CAAC,CAEtC;gBAGkB,MAAM,EAAE,QAAQ,EACjB,KAAK,EAAE,YAAY,EACnB,IAAI,EAAE,MAAM,EACX,UAAU,EAAE,MAAM,EAClB,iBAAiB,EAAE,CAAC,KAAK,EAAE,UAAU,GAAG,SAAS,EAAE,GAAG,EAAE,MAAM,KAAK,IAAI,EACvE,gBAAgB,EAAE,CACjC,IAAI,EAAE,YAAY,EAClB,aAAa,EAAE,cAAc,EAC7B,oBAAoB,CAAC,EAAE,MAAM,IAAI,EACjC,kBAAkB,CAAC,EAAE,MAAM,IAAI,KAC5B,WAAW,EACC,qBAAqB,EAAE,OAAO,EACtC,KAAK,EAAE,MAAM,GAAG,SAAS;IASpC,OAAO,IAAI,IAAI;IAUf,QAAQ,CAAC,KAAK,EAAE,UAAU,GAAG,SAAS,EAAE,IAAI,EAAE,MAAM,GAAG,IAAI;IAI3D,OAAO,CAAC,sBAAsB;IAO9B,KAAK,CAAC,KAAK,EAAE,UAAU,EAAE,IAAI,EAAE,MAAM,GAAG,IAAI;IAoE5C,KAAK,IAAI,IAAI;IASb,OAAO,CAAC,kBAAkB;IAS1B,OAAO,CAAC,mBAAmB;IAS3B,OAAO,CAAC,eAAe;CAGxB"}

package/lib/browser/links/link.js CHANGED Viewed

@@ -1,6 +1,6 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.TerminalLink = exports.FOLDER_NOT_IN_WORKSPACE_LABEL = exports.FOLDER_IN_WORKSPACE_LABEL = exports.OPEN_FILE_LABEL = void 0;
+exports.TerminalLink = void 0;
 const tslib_1 = require("tslib");
 const di_1 = require("@opensumi/di");
 const ide_core_common_1 = require("@opensumi/ide-core-common");
@@ -8,9 +8,6 @@ const ide_core_browser_1 = require("@opensumi/ide-core-browser");
 const helpers_1 = require("./helpers");
 // default delay time (ms) for showing tooltip when mouse is over a link
 const DEFAULT_HOVER_DELAY = 500;
-exports.OPEN_FILE_LABEL = (0, ide_core_common_1.localize)('terminal.openFile', 'Open file in editor');
-exports.FOLDER_IN_WORKSPACE_LABEL = (0, ide_core_common_1.localize)('terminal.focusFolder', 'Focus folder in explorer');
-exports.FOLDER_NOT_IN_WORKSPACE_LABEL = (0, ide_core_common_1.localize)('terminal.openFolder', 'Open folder in new window');
 let TerminalLink = class TerminalLink extends ide_core_common_1.Disposable {
     constructor(_xterm, range, text, _viewportY, _activateCallback, _tooltipCallback, _isHighConfidenceLink, label) {
         super();

package/lib/browser/links/link.js.map CHANGED Viewed

	@@ -1 +1 @@
1	- {"version":3,"file":"link.js","sourceRoot":"","sources":["../../../src/browser/links/link.ts"],"names":[],"mappings":";;;;AACA,qCAAqD;AACrD,+~~DASmC~~;AACnC,iEAA+D;AAC/D,uCAAyD;AAEzD,wEAAwE;AACxE,MAAM,mBAAmB,GAAG,GAAG,CAAC;~~AAEnB~~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"}
1	+ {"version":3,"file":"link.js","sourceRoot":"","sources":["../../../src/browser/links/link.ts"],"names":[],"mappings":"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"}

package/lib/browser/links/validated-local-link-provider.d.ts CHANGED Viewed

@@ -1,6 +1,5 @@
 import type { Terminal, IViewportRange } from 'xterm';
 import { IDisposable, URI } from '@opensumi/ide-core-common';
-import { IWindowService } from '@opensumi/ide-core-browser/lib/window';
 import type { TerminalClient } from '../terminal.client';
 import { TerminalLink } from './link';
 import { XtermLinkMatcherHandler } from './link-manager';
@@ -24,17 +23,11 @@ export declare class TerminalValidatedLocalLinkProvider extends TerminalBaseLink
     private readonly _tooltipCallback;
     private readonly _validationCallback;
     private readonly injector;
-    protected readonly windowService: IWindowService;
-    private readonly commandService;
-    private readonly workspaceService;
-    private readonly appConfig;
     constructor(_xterm: Terminal, _client: TerminalClient, _activateFileCallback: (event: MouseEvent | undefined, link: string) => void, _wrapLinkHandler: (handler: (event: MouseEvent | undefined, link: string) => void) => XtermLinkMatcherHandler, _tooltipCallback: (link: TerminalLink, viewportRange: IViewportRange, modifierDownCallback?: () => void, modifierUpCallback?: () => void) => IDisposable, _validationCallback: (link: string, callback: (result: {
         uri: URI;
         isDirectory: boolean;
     } | undefined) => void) => void);
     protected _provideLinks(y: number): Promise<TerminalLink[]>;
     protected get _localLinkRegex(): RegExp;
-    private _handleLocalFolderLink;
-    private _isDirectoryInsideWorkspace;
 }
 //# sourceMappingURL=validated-local-link-provider.d.ts.map

package/lib/browser/links/validated-local-link-provider.d.ts.map CHANGED Viewed

	@@ -1 +1 @@
1	- {"version":3,"file":"validated-local-link-provider.d.ts","sourceRoot":"","sources":["../../../src/browser/links/validated-local-link-provider.ts"],"names":[],"mappings":"AAMA,OAAO,KAAK,EAAE,QAAQ,EAAe,cAAc,EAAE,MAAM,OAAO,CAAC;AAEnE,OAAO,~~EAAkB~~,WAAW,EAAE,GAAG,EAAE,MAAM,2BAA2B,CAAC;~~AAE7E~~,OAAO,~~EAAE,cAAc,EAAE,MAAM,uCAAuC,CAAC;AAGvE,OAAO,~~KAAK,EAAE,cAAc,EAAE,MAAM,oBAAoB,CAAC;AACzD,OAAO,~~EAA6E~~,YAAY,EAAE,MAAM,QAAQ,CAAC;~~AACjH~~,OAAO,EAAE,uBAAuB,EAAE,MAAM,gBAAgB,CAAC;AACzD,OAAO,EAAE,wBAAwB,EAAE,MAAM,QAAQ,CAAC;AAQlD,iFAAiF;AACjF,eAAO,MAAM,mBAAmB,QASvB,CAAC;AAEV,eAAO,MAAM,cAAc,kCAAkC,CAAC;AAI9D,8FAA8F;AAC9F,eAAO,MAAM,kBAAkB,QAStB,CAAC;AAEV;mEACmE;AACnE,eAAO,MAAM,mBAAmB,QASE,CAAC;AAGnC,eAAO,MAAM,0BAA0B,KAAK,CAAC;AAC7C,eAAO,MAAM,2BAA2B,KAAK,CAAC;AAG9C,eAAO,MAAM,6BAA6B,IAAI,CAAC;AAI/C,qBACa,kCAAmC,SAAQ,wBAAwB;~~IAiB5E~~,OAAO,CAAC,QAAQ,CAAC,MAAM;IACvB,OAAO,CAAC,QAAQ,CAAC,OAAO;IACxB,OAAO,CAAC,QAAQ,CAAC,qBAAqB;IACtC,OAAO,CAAC,QAAQ,CAAC,gBAAgB;IAGjC,OAAO,CAAC,QAAQ,CAAC,gBAAgB;IAMjC,OAAO,CAAC,QAAQ,CAAC,mBAAmB;~~IA3BtC~~,OAAO,CAAC,QAAQ,CAAC,QAAQ,CAAW;~~IAGpC~~,~~SAAS,CAAC,QAAQ,CAAC,aAAa,EAAE,cAAc,CAAC;IAGjD,OAAO,CAAC,QAAQ,CAAC,cAAc,CAAiB;IAGhD,OAAO,CAAC,QAAQ,CAAC,gBAAgB,CAAoB;IAGrD,OAAO,CAAC,QAAQ,CAAC,SAAS,CAAY;gBAGnB,~~MAAM,EAAE,QAAQ,EAChB,OAAO,EAAE,cAAc,EACvB,qBAAqB,EAAE,CAAC,KAAK,EAAE,UAAU,GAAG,SAAS,EAAE,IAAI,EAAE,MAAM,KAAK,IAAI,EAC5E,gBAAgB,EAAE,CACjC,OAAO,EAAE,CAAC,KAAK,EAAE,UAAU,GAAG,SAAS,EAAE,IAAI,EAAE,MAAM,KAAK,IAAI,KAC3D,uBAAuB,EACX,gBAAgB,EAAE,CACjC,IAAI,EAAE,YAAY,EAClB,aAAa,EAAE,cAAc,EAC7B,oBAAoB,CAAC,EAAE,MAAM,IAAI,EACjC,kBAAkB,CAAC,EAAE,MAAM,IAAI,KAC5B,WAAW,EACC,mBAAmB,EAAE,CACpC,IAAI,EAAE,MAAM,EACZ,QAAQ,EAAE,CAAC,MAAM,EAAE;QAAE,GAAG,EAAE,GAAG,CAAC;QAAC,WAAW,EAAE,OAAO,CAAA;KAAE,GAAG,SAAS,KAAK,IAAI,KACvE,IAAI;cAKK,aAAa,CAAC,CAAC,EAAE,MAAM,GAAG,OAAO,CAAC,YAAY,EAAE,CAAC;~~IAgHjE~~,SAAS,KAAK,eAAe,IAAI,MAAM,CAItC;~~YAEa,sBAAsB;YAatB,2BAA2B;CAS1C~~"}
1	+ {"version":3,"file":"validated-local-link-provider.d.ts","sourceRoot":"","sources":["../../../src/browser/links/validated-local-link-provider.ts"],"names":[],"mappings":"AAMA,OAAO,KAAK,EAAE,QAAQ,EAAe,cAAc,EAAE,MAAM,OAAO,CAAC;AAEnE,OAAO,EAAE,WAAW,EAAE,GAAG,EAAE,MAAM,2BAA2B,CAAC;AAE7D,OAAO,KAAK,EAAE,cAAc,EAAE,MAAM,oBAAoB,CAAC;AACzD,OAAO,EAAE,YAAY,EAAE,MAAM,QAAQ,CAAC;AACtC,OAAO,EAAE,uBAAuB,EAAE,MAAM,gBAAgB,CAAC;AACzD,OAAO,EAAE,wBAAwB,EAAE,MAAM,QAAQ,CAAC;AAQlD,iFAAiF;AACjF,eAAO,MAAM,mBAAmB,QASvB,CAAC;AAEV,eAAO,MAAM,cAAc,kCAAkC,CAAC;AAI9D,8FAA8F;AAC9F,eAAO,MAAM,kBAAkB,QAStB,CAAC;AAEV;mEACmE;AACnE,eAAO,MAAM,mBAAmB,QASE,CAAC;AAGnC,eAAO,MAAM,0BAA0B,KAAK,CAAC;AAC7C,eAAO,MAAM,2BAA2B,KAAK,CAAC;AAG9C,eAAO,MAAM,6BAA6B,IAAI,CAAC;AAI/C,qBACa,kCAAmC,SAAQ,wBAAwB;IAK5E,OAAO,CAAC,QAAQ,CAAC,MAAM;IACvB,OAAO,CAAC,QAAQ,CAAC,OAAO;IACxB,OAAO,CAAC,QAAQ,CAAC,qBAAqB;IACtC,OAAO,CAAC,QAAQ,CAAC,gBAAgB;IAGjC,OAAO,CAAC,QAAQ,CAAC,gBAAgB;IAMjC,OAAO,CAAC,QAAQ,CAAC,mBAAmB;IAftC,OAAO,CAAC,QAAQ,CAAC,QAAQ,CAAW;gBAGjB,MAAM,EAAE,QAAQ,EAChB,OAAO,EAAE,cAAc,EACvB,qBAAqB,EAAE,CAAC,KAAK,EAAE,UAAU,GAAG,SAAS,EAAE,IAAI,EAAE,MAAM,KAAK,IAAI,EAC5E,gBAAgB,EAAE,CACjC,OAAO,EAAE,CAAC,KAAK,EAAE,UAAU,GAAG,SAAS,EAAE,IAAI,EAAE,MAAM,KAAK,IAAI,KAC3D,uBAAuB,EACX,gBAAgB,EAAE,CACjC,IAAI,EAAE,YAAY,EAClB,aAAa,EAAE,cAAc,EAC7B,oBAAoB,CAAC,EAAE,MAAM,IAAI,EACjC,kBAAkB,CAAC,EAAE,MAAM,IAAI,KAC5B,WAAW,EACC,mBAAmB,EAAE,CACpC,IAAI,EAAE,MAAM,EACZ,QAAQ,EAAE,CAAC,MAAM,EAAE;QAAE,GAAG,EAAE,GAAG,CAAC;QAAC,WAAW,EAAE,OAAO,CAAA;KAAE,GAAG,SAAS,KAAK,IAAI,KACvE,IAAI;cAKK,aAAa,CAAC,CAAC,EAAE,MAAM,GAAG,OAAO,CAAC,YAAY,EAAE,CAAC;IAuGjE,SAAS,KAAK,eAAe,IAAI,MAAM,CAItC;CACF"}

package/lib/browser/links/validated-local-link-provider.js CHANGED Viewed

@@ -3,24 +3,20 @@
  *  Copyright (c) Microsoft Corporation. All rights reserved.
  *  Licensed under the MIT License. See License.txt in the project root for license information.
  *--------------------------------------------------------------------------------------------*/
-// Some code copied and modified from https://github.com/microsoft/vscode/blob/1.63.2/src/vs/workbench/contrib/terminal/browser/links/terminalValidatedLocalLinkProvider.ts
+// Some code copied and modified from https://github.com/microsoft/vscode/blob/1.44.0/src/vs/workbench/contrib/terminal/browser/links/terminalValidatedLocalLinkProvider.ts
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.TerminalValidatedLocalLinkProvider = exports.lineAndColumnClauseGroupCount = exports.unixLineAndColumnMatchIndex = exports.winLineAndColumnMatchIndex = exports.lineAndColumnClause = exports.winLocalLinkClause = exports.winDrivePrefix = exports.unixLocalLinkClause = void 0;
 const tslib_1 = require("tslib");
 const di_1 = require("@opensumi/di");
-const ide_core_common_1 = require("@opensumi/ide-core-common");
 const platform_1 = require("@opensumi/ide-core-common/lib/platform");
-const window_1 = require("@opensumi/ide-core-browser/lib/window");
-const workspace_defination_1 = require("@opensumi/ide-workspace/lib/common/workspace-defination");
-const config_provider_1 = require("@opensumi/ide-core-browser/lib/react-providers/config-provider");
 const link_1 = require("./link");
 const base_1 = require("./base");
 const helpers_1 = require("./helpers");
 const pathPrefix = '(\\.\\.?|\\~)';
 const pathSeparatorClause = '\\/';
 // '":; are allowed in paths but they are often separators so ignore them
-// Also disallow \\ to prevent a catastropic backtracking case #24795
-const excludedPathCharactersClause = '[^\\0\\s!`&*()\\[\\]\'":;\\\\]';
+// Also disallow \\ to prevent a catastropic backtracking case #24798
+const excludedPathCharactersClause = '[^\\0\\s!$`&*()\\[\\]\'":;\\\\]';
 /** A regex that matches paths in the form /foo, ~/foo, ./foo, ../foo, foo/bar */
 exports.unixLocalLinkClause = '((' +
     pathPrefix +
@@ -34,7 +30,7 @@ exports.unixLocalLinkClause = '((' +
 exports.winDrivePrefix = '(?:\\\\\\\\\\?\\\\)?[a-zA-Z]:';
 const winPathPrefix = '(' + exports.winDrivePrefix + '|\\.\\.?|\\~)';
 const winPathSeparatorClause = '(\\\\|\\/)';
-const winExcludedPathCharactersClause = '[^\\0<>\\?\\|\\/\\s!`&*()\\[\\]\'":;]';
+const winExcludedPathCharactersClause = '[^\\0<>\\?\\|\\/\\s!$`&*()\\[\\]\'":;]';
 /** A regex that matches paths in the form \\?\c:\foo c:\foo, ~\foo, .\foo, ..\foo, foo\bar */
 exports.winLocalLinkClause = '((' +
     winPathPrefix +
@@ -48,8 +44,8 @@ exports.winLocalLinkClause = '((' +
 /** As xterm reads from DOM, space in that case is nonbreaking char ASCII code - 160,
 replacing space with nonBreakningSpace or space ASCII code - 32. */
 exports.lineAndColumnClause = [
-    '((\\S*)[\'"], line ((\\d+)( column (\\d+))?))',
-    '((\\S*)[\'"],((\\d+)(:(\\d+))?))',
+    '((\\S*)", line ((\\d+)( column (\\d+))?))',
+    '((\\S*)",((\\d+)(:(\\d+))?))',
     '((\\S*) on line ((\\d+)(, column (\\d+))?))',
     '((\\S*):line ((\\d+)(, column (\\d+))?))',
     '(([^\\s\\(\\)]*)(\\s?[\\(\\[](\\d+)(,\\s?(\\d+))?)[\\)\\]])',
@@ -132,20 +128,10 @@ let TerminalValidatedLocalLinkProvider = class TerminalValidatedLocalLinkProvide
                 endLineNumber: 1,
             }, startLine);
             const validatedLink = await new Promise((r) => {
-                this._validationCallback(link, async (result) => {
-                    if (result) {
-                        const label = result.isDirectory
-                            ? (await this._isDirectoryInsideWorkspace(result.uri))
-                                ? link_1.FOLDER_IN_WORKSPACE_LABEL
-                                : link_1.FOLDER_NOT_IN_WORKSPACE_LABEL
-                            : link_1.OPEN_FILE_LABEL;
+                this._validationCallback(link, (result) => {
+                    if (result && !result.isDirectory) {
                         const activateCallback = this._wrapLinkHandler((event, text) => {
-                            if (result.isDirectory) {
-                                this._handleLocalFolderLink(result.uri);
-                            }
-                            else {
-                                this._activateFileCallback(event, text);
-                            }
+                            this._activateFileCallback(event, text);
                         });
                         r(this.injector.get(link_1.TerminalLink, [
                             this._xterm,
@@ -155,7 +141,7 @@ let TerminalValidatedLocalLinkProvider = class TerminalValidatedLocalLinkProvide
                             activateCallback,
                             this._tooltipCallback,
                             true,
-                            label,
+                            undefined,
                         ]));
                     }
                     else {
@@ -174,47 +160,11 @@ let TerminalValidatedLocalLinkProvider = class TerminalValidatedLocalLinkProvide
         // Append line and column number regex
         return new RegExp(`${baseLocalLinkClause}(${exports.lineAndColumnClause})`);
     }
-    async _handleLocalFolderLink(uri) {
-        // If the folder is within one of the window's workspaces, focus it in the explorer
-        if (await this._isDirectoryInsideWorkspace(uri)) {
-            await this.commandService.executeCommand('revealInExplorer', uri);
-            return;
-        }
-        // Open a new window for the folder
-        if (this.appConfig.isElectronRenderer) {
-            this.windowService.openWorkspace(uri, { newWindow: true });
-        }
-    }
-    async _isDirectoryInsideWorkspace(uri) {
-        const folders = await this.workspaceService.roots;
-        for (const folder of folders) {
-            if (ide_core_common_1.URI.parse(folder.uri).isEqualOrParent(uri)) {
-                return true;
-            }
-        }
-        return false;
-    }
 };
 tslib_1.__decorate([
     (0, di_1.Autowired)(di_1.INJECTOR_TOKEN),
     tslib_1.__metadata("design:type", di_1.Injector)
 ], TerminalValidatedLocalLinkProvider.prototype, "injector", void 0);
-tslib_1.__decorate([
-    (0, di_1.Autowired)(window_1.IWindowService),
-    tslib_1.__metadata("design:type", Object)
-], TerminalValidatedLocalLinkProvider.prototype, "windowService", void 0);
-tslib_1.__decorate([
-    (0, di_1.Autowired)(ide_core_common_1.CommandService),
-    tslib_1.__metadata("design:type", Object)
-], TerminalValidatedLocalLinkProvider.prototype, "commandService", void 0);
-tslib_1.__decorate([
-    (0, di_1.Autowired)(workspace_defination_1.IWorkspaceService),
-    tslib_1.__metadata("design:type", Object)
-], TerminalValidatedLocalLinkProvider.prototype, "workspaceService", void 0);
-tslib_1.__decorate([
-    (0, di_1.Autowired)(config_provider_1.AppConfig),
-    tslib_1.__metadata("design:type", Object)
-], TerminalValidatedLocalLinkProvider.prototype, "appConfig", void 0);
 TerminalValidatedLocalLinkProvider = tslib_1.__decorate([
     (0, di_1.Injectable)({ multiple: true }),
     tslib_1.__metadata("design:paramtypes", [Function, Function, Function, Function, Function, Function])

package/lib/browser/links/validated-local-link-provider.js.map CHANGED Viewed

	@@ -1 +1 @@
1	- {"version":3,"file":"validated-local-link-provider.js","sourceRoot":"","sources":["../../../src/browser/links/validated-local-link-provider.ts"],"names":[],"mappings":";AAAA;;;gGAGgG;AAChG,2KAA2K;;;;AAG3K,qCAA+E;~~AAC~~/E~~,+DAA6E;AAC7E~~,qEAAyE;~~AACzE~~,~~kEAAuE~~;~~AACvE~~,~~kGAA4F;AAC5F,oGAA2F;AAE3F,iCAAiH;AAEjH,~~iCAAkD;AAClD,uCAA0E;AAE1E,MAAM,UAAU,GAAG,eAAe,CAAC;AACnC,MAAM,mBAAmB,GAAG,KAAK,CAAC;AAClC,yEAAyE;AACzE,qEAAqE;AACrE,MAAM,4BAA4B,GAAG,~~gCAAgC~~,CAAC;~~AACtE~~,iFAAiF;AACpE,QAAA,mBAAmB,GAC9B,IAAI;IACJ,UAAU;IACV,IAAI;IACJ,4BAA4B;IAC5B,OAAO;IACP,mBAAmB;IACnB,GAAG;IACH,4BAA4B;IAC5B,OAAO,CAAC;AAEG,QAAA,cAAc,GAAG,+BAA+B,CAAC;AAC9D,MAAM,aAAa,GAAG,GAAG,GAAG,sBAAc,GAAG,eAAe,CAAC;AAC7D,MAAM,sBAAsB,GAAG,YAAY,CAAC;AAC5C,MAAM,+BAA+B,GAAG,~~uCAAuC~~,CAAC;~~AAChF~~,8FAA8F;AACjF,QAAA,kBAAkB,GAC7B,IAAI;IACJ,aAAa;IACb,IAAI;IACJ,+BAA+B;IAC/B,OAAO;IACP,sBAAsB;IACtB,GAAG;IACH,+BAA+B;IAC/B,OAAO,CAAC;AAEV;mEACmE;AACtD,QAAA,mBAAmB,GAAG;IACjC~~,+CAA+C~~;~~IAC/C~~,~~kCAAkC~~;~~IAClC~~,6CAA6C;IAC7C,0CAA0C;IAC1C,6DAA6D;IAC7D,mDAAmD,EAAE,qCAAqC;CAC3F;KACE,IAAI,CAAC,GAAG,CAAC;KACT,OAAO,CAAC,IAAI,EAAE,IAAI,QAAQ,IAAI,CAAC,CAAC;AAEnC,oFAAoF;AACvE,QAAA,0BAA0B,GAAG,EAAE,CAAC;AAChC,QAAA,2BAA2B,GAAG,EAAE,CAAC;AAE9C,sFAAsF;AACzE,QAAA,6BAA6B,GAAG,CAAC,CAAC;AAE/C,MAAM,UAAU,GAAG,IAAI,CAAC;AAGxB,IAAa,kCAAkC,GAA/C,MAAa,kCAAmC,SAAQ,+BAAwB;~~IAgB9E~~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~~KAAK~~,~~EAAE,~~MAAM,EAAE,EAAE;~~oBAC9C~~,IAAI,MAAM,~~EAAE;wBACV,MAAM,KAAK,GAAG,MAAM,CAAC,WAAW;4BAC9B,CAAC,CAAC,CAAC,MAAM,~~IAAI,CAAC,~~2BAA2B,CAAC,~~MAAM,CAAC,~~GAAG~~,~~CAAC,CAAC~~;~~gCACpD~~,~~CAAC,CAAC,gCAAyB;gCAC3B,CAAC,CAAC,oCAA6B;4BACjC,CAAC,CAAC,sBAAe,CAAC;wBACpB,~~MAAM,gBAAgB,GAAG,IAAI,CAAC,gBAAgB,CAAC,CAAC,KAA6B,EAAE,IAAY,EAAE,EAAE;4BAC7F,IAAI,~~MAAM,~~CAAC,~~WAAW,EAAE;gCACtB,IAAI,CAAC,sBAAsB,CAAC,MAAM,CAAC,GAAG,CAAC,CAAC;6BACzC;iCAAM;gCACL,IAAI,CAAC,~~qBAAqB,CAAC,KAAK,EAAE,IAAI,CAAC,CAAC;~~6BACzC;wBACH~~,CAAC,CAAC,CAAC;wBACH,CAAC,CACC,IAAI,CAAC,QAAQ,CAAC,GAAG,CAAC,mBAAY,EAAE;4BAC9B,IAAI,CAAC,MAAM;4BACX,WAAW;4BACX,IAAI;4BACJ,IAAI,CAAC,MAAM,CAAC,MAAM,CAAC,MAAM,CAAC,SAAS;4BACnC,gBAAgB;4BAChB,IAAI,CAAC,gBAAgB;4BACrB,IAAI;4BACJ,~~KAAK~~;~~yBACN~~,CAAC,CACH,CAAC;qBACH;yBAAM;wBACL,CAAC,CAAC,SAAS,CAAC,CAAC;qBACd;gBACH,CAAC,CAAC,CAAC;YACL,CAAC,CAAC,CAAC;YACH,IAAI,aAAa,EAAE;gBACjB,MAAM,CAAC,IAAI,CAAC,aAAa,CAAC,CAAC;aAC5B;SACF;QAED,OAAO,MAAM,CAAC;IAChB,CAAC;IAED,IAAc,eAAe;QAC3B,MAAM,mBAAmB,GAAG,IAAI,CAAC,OAAO,CAAC,EAAE,KAAK,0BAAe,CAAC,OAAO,CAAC,CAAC,CAAC,0BAAkB,CAAC,CAAC,CAAC,2BAAmB,CAAC;QACnH,sCAAsC;QACtC,OAAO,IAAI,MAAM,CAAC,GAAG,mBAAmB,IAAI,2BAAmB,GAAG,CAAC,CAAC;IACtE,CAAC;IAEO,KAAK,CAAC,sBAAsB,CAAC,GAAQ;QAC3C,mFAAmF;QACnF,IAAI,MAAM,IAAI,CAAC,2BAA2B,CAAC,GAAG,CAAC,EAAE;YAC/C,MAAM,IAAI,CAAC,cAAc,CAAC,cAAc,CAAC,kBAAkB,EAAE,GAAG,CAAC,CAAC;YAClE,OAAO;SACR;QAED,mCAAmC;QACnC,IAAI,IAAI,CAAC,SAAS,CAAC,kBAAkB,EAAE;YACrC,IAAI,CAAC,aAAa,CAAC,aAAa,CAAC,GAAG,EAAE,EAAE,SAAS,EAAE,IAAI,EAAE,CAAC,CAAC;SAC5D;IACH,CAAC;IAEO,KAAK,CAAC,2BAA2B,CAAC,GAAQ;QAChD,MAAM,OAAO,GAAG,MAAM,IAAI,CAAC,gBAAgB,CAAC,KAAK,CAAC;QAClD,KAAK,MAAM,MAAM,IAAI,OAAO,EAAE;YAC5B,IAAI,qBAAG,CAAC,KAAK,CAAC,MAAM,CAAC,GAAG,CAAC,CAAC,eAAe,CAAC,GAAG,CAAC,EAAE;gBAC9C,OAAO,IAAI,CAAC;aACb;SACF;QACD,OAAO,KAAK,CAAC;IACf,CAAC;CACF,CAAA;~~AA/KC~~;IADC,IAAA,cAAS,EAAC,mBAAc,CAAC;sCACC,aAAQ;oEAAC;~~AAGpC;IADC~~,~~IAAA,cAAS,EAAC,uBAAc,CAAC;;yEACuB;AAGjD;IADC,IAAA,cAAS,EAAC,gCAAc,CAAC;;0EACsB;AAGhD;IADC,IAAA,cAAS,EAAC,wCAAiB,CAAC;;4EACwB;AAGrD;IADC,IAAA,cAAS,EAAC,2BAAS,CAAC;;qEACiB;AAd3B,~~kCAAkC;IAD9C,IAAA,eAAU,EAAC,EAAE,QAAQ,EAAE,IAAI,EAAE,CAAC;;GAClB,kCAAkC,~~CAiL9C~~;~~AAjLY~~,gFAAkC"}
1	+ {"version":3,"file":"validated-local-link-provider.js","sourceRoot":"","sources":["../../../src/browser/links/validated-local-link-provider.ts"],"names":[],"mappings":"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"}

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

@@ -96,13 +96,6 @@ export declare class TerminalClient extends Disposable implements ITerminalClien
     _prepare(): void;
     _attachAfterRender(): void;
     private _pickWorkspace;
-    /**
-     * if we want open a terminal, we need a parameter: `cwd`
-     * we don't care whether it valid. our backend service will check it.
-     *
-     * 如果当前工作区不存在，这里就会获得空，后端的逻辑中终端会打开用户的家目录。
-     * 多工作区模式下用户没有选中任何一个工作区，也是会打开用户的家目录。
-     */
     private _checkWorkspace;
     reset(): void;
     private attach;

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

	@@ -1 +1 @@
1	- {"version":3,"file":"terminal.client.d.ts","sourceRoot":"","sources":["../../src/browser/terminal.client.ts"],"names":[],"mappings":"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~~IA6C7D~~,IAAI,SAAM;IAEV,IAAI,IAAI,6BAEP;IAED,IAAI,GAAG,gCAEN;IAED,IAAI,OAAO,oBAEV;IAED,IAAI,aAAa,SAEhB;IAED,IAAI,SAAS,mBAEZ;IAED,IAAI,EAAE,WAEL;IAED,IAAI,MAAM,YAET;IAED,IAAI,KAAK,YAER;IAED,IAAI,QAAQ,mBAEX;IAED,IAAI,WAAW,mBAEd;IAED,IAAI,IAAI,0BAEP;IAED,IAAI,aAAa,IAAI,OAAO,CAE3B;IAED,IAAI,EAAE,oBAEL;IAED,OAAO,CAAC,cAAc;IA4BtB,OAAO,CAAC,YAAY;IAUpB,OAAO,CAAC,YAAY;IAUpB,SAAS;IAIT,QAAQ;IAsBR,kBAAkB;YAcJ,cAAc;~~IAa5B;;;;;;OAMG;YACW~~,eAAe;~~IAa7B~~,KAAK;YAKS,MAAM;YAMN,UAAU;IAuBxB,iBAAiB,CAAC,UAAU,EAAE,mBAAmB,GAAG,SAAS;IAiB7D,OAAO,CAAC,UAAU;IAalB,OAAO,CAAC,WAAW;IAMnB,OAAO,CAAC,OAAO;IAYf,OAAO,CAAC,eAAe;~~IAsBvB~~,OAAO,CAAC,eAAe;IAIvB,KAAK;IAIL,KAAK;IAKL,SAAS;IAKT,KAAK,CAAC,IAAI,EAAE,MAAM;IAKlB,QAAQ,CAAC,IAAI,EAAE,MAAM;IAKrB,YAAY;IAUZ,WAAW;IAIX,aAAa,CAAC,OAAO,EAAE,eAAe;IAOhC,QAAQ,CAAC,OAAO,EAAE,MAAM;IAK9B,oBAAoB,CAAC,QAAQ,EAAE,6BAA6B,GAAG,WAAW;IAO1E,OAAO,CAAC,KAAK,UAAO;CAOrB;AAED,qBACa,qBAAqB;IAChC;;OAEG;WACU,YAAY,CAAC,QAAQ,EAAE,QAAQ,EAAE,MAAM,EAAE,OAAO,EAAE,OAAO,CAAC,EAAE,eAAe;IAgBxF;;OAEG;WACU,aAAa,CAAC,QAAQ,EAAE,QAAQ,EAAE,MAAM,EAAE,OAAO,EAAE,OAAO,CAAC,EAAE,sBAAsB;CAYjG;AAED,eAAO,MAAM,2BAA2B,aAAc,QAAQ,cAAc,OAAO,mEACpB,CAAC;AAEhE,eAAO,MAAM,4BAA4B,aAC5B,QAAQ,cAAc,OAAO,0EACwB,CAAC"}
1	+ {"version":3,"file":"terminal.client.d.ts","sourceRoot":"","sources":["../../src/browser/terminal.client.ts"],"names":[],"mappings":"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"}

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

@@ -188,24 +188,25 @@ let TerminalClient = TerminalClient_1 = class TerminalClient extends ide_core_co
                 config: defaultProfile,
             };
         }
-        await this._checkWorkspace();
-        const cwd = (_c = (_a = options.cwd) !== null && _a !== void 0 ? _a : (_b = options === null || options === void 0 ? void 0 : options.config) === null || _b === void 0 ? void 0 : _b.cwd) !== null && _c !== void 0 ? _c : this._workspacePath;
-        const launchConfig = this.convertProfileToLaunchConfig(options.config, cwd);
-        this._launchConfig = launchConfig;
-        this.name = launchConfig.name || '';
-        if (launchConfig.initialText) {
-            this.xterm.raw.writeln(launchConfig.initialText);
-        }
-        if (!launchConfig.env) {
-            launchConfig.env = {};
+        if (await this._checkWorkspace()) {
+            const cwd = (_c = (_a = options.cwd) !== null && _a !== void 0 ? _a : (_b = options === null || options === void 0 ? void 0 : options.config) === null || _b === void 0 ? void 0 : _b.cwd) !== null && _c !== void 0 ? _c : this._workspacePath;
+            const launchConfig = this.convertProfileToLaunchConfig(options.config, cwd);
+            this._launchConfig = launchConfig;
+            this.name = launchConfig.name || '';
+            if (launchConfig.initialText) {
+                this.xterm.raw.writeln(launchConfig.initialText);
+            }
+            if (!launchConfig.env) {
+                launchConfig.env = {};
+            }
+            (_d = this.environmentService.mergedCollection) === null || _d === void 0 ? void 0 : _d.applyToProcessEnvironment(launchConfig.env, this.applicationService.backendOS, this.variableResolver.resolve.bind(this.variableResolver));
+            this.addDispose(this.environmentService.onDidChangeCollections((collection) => {
+                // 环境变量更新只会在新建的终端中生效，已有的终端需要重启才可以生效
+                collection.applyToProcessEnvironment(launchConfig.env, this.applicationService.backendOS, this.variableResolver.resolve.bind(this.variableResolver));
+            }));
+            this._attachXterm();
+            this._attachAfterRender();
         }
-        (_d = this.environmentService.mergedCollection) === null || _d === void 0 ? void 0 : _d.applyToProcessEnvironment(launchConfig.env, this.applicationService.backendOS, this.variableResolver.resolve.bind(this.variableResolver));
-        this.addDispose(this.environmentService.onDidChangeCollections((collection) => {
-            // 环境变量更新只会在新建的终端中生效，已有的终端需要重启才可以生效
-            collection.applyToProcessEnvironment(launchConfig.env, this.applicationService.backendOS, this.variableResolver.resolve.bind(this.variableResolver));
-        }));
-        this._attachXterm();
-        this._attachAfterRender();
     }
     get term() {
         return this.xterm.raw;
@@ -334,20 +335,10 @@ let TerminalClient = TerminalClient_1 = class TerminalClient extends ide_core_co
             const choose = await this.quickPick.show(roots.map((file) => new ide_core_common_1.URI(file.uri).codeUri.fsPath));
             return choose;
         }
-        else if (this.workspace.workspace) {
-            return new ide_core_common_1.URI((_a = this.workspace.workspace) === null || _a === void 0 ? void 0 : _a.uri).codeUri.fsPath;
-        }
         else {
-            return undefined;
+            return new ide_core_common_1.URI((_a = this.workspace.workspace) === null || _a === void 0 ? void 0 : _a.uri).codeUri.fsPath;
         }
     }
-    /**
-     * if we want open a terminal, we need a parameter: `cwd`
-     * we don't care whether it valid. our backend service will check it.
-     *
-     * 如果当前工作区不存在，这里就会获得空，后端的逻辑中终端会打开用户的家目录。
-     * 多工作区模式下用户没有选中任何一个工作区，也是会打开用户的家目录。
-     */
     async _checkWorkspace() {
         const widget = this._widget;
         if (TerminalClient_1.WORKSPACE_PATH_CACHED.has(widget.group.id)) {
@@ -355,11 +346,14 @@ let TerminalClient = TerminalClient_1 = class TerminalClient extends ide_core_co
         }
         else {
             const choose = await this._pickWorkspace();
-            if (choose) {
-                this._workspacePath = choose;
-                TerminalClient_1.WORKSPACE_PATH_CACHED.set(widget.group.id, this._workspacePath);
+            if (!choose) {
+                this.view.removeWidget(widget.id);
+                return false;
             }
+            this._workspacePath = choose;
+            TerminalClient_1.WORKSPACE_PATH_CACHED.set(widget.group.id, this._workspacePath);
         }
+        return true;
     }
     reset() {
         this._prepare();
@@ -440,6 +434,10 @@ let TerminalClient = TerminalClient_1 = class TerminalClient extends ide_core_co
         if (!((_a = this._widget.element) === null || _a === void 0 ? void 0 : _a.clientHeight)) {
             return;
         }
+        // 多 workspace 模式下，等待 workspace 选择后再渲染
+        if (!this._workspacePath) {
+            return;
+        }
         this._widget.element.appendChild(this.xterm.container);
         this.xterm.open();
         // 首次渲染且为当前选中的 client 时，聚焦

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

	@@ -1 +1 @@
1	- {"version":3,"file":"terminal.client.js","sourceRoot":"","sources":["../../src/browser/terminal.client.ts"],"names":[],"mappings":";;;;;AAAA,+BAAkC;AAGlC,qCAA+E;AAC/E,+DAemC;AACnC,qEAA6E;AAC7E,4DAAyE;AACzE,kEAA2E;AAC3E,8DAA6E;AAC7E,+DAAuE;AACvE,qDAAyE;AACzE,qDAAgE;AAChE,sCAkBmB;AACnB,qDAA2D;AAC3D,iEAA+E;AAC/E,uDAA2D;AAC3D,uEAA6G;AAC7G,uDAAwD;AACxD,mCAAgC;AAChC,uEAAwE;AAGxE,IAAa,cAAc,sBAA3B,MAAa,cAAe,SAAQ,4BAAU;IAqG5C;QACE,KAAK,EAAE,CAAC;QA7FV,UAAU;QAEV,aAAa;QACL,WAAM,GAAG,KAAK,CAAC;QAKf,eAAU,GAAG,KAAK,CAAC;QACnB,mBAAc,GAAG,KAAK,CAAC;QACvB,QAAG,GAAoB,aAAE,CAAC;QA+D1B,aAAQ,GAAG,IAAI,yBAAO,EAAsB,CAAC;QACrD,YAAO,GAA8B,IAAI,CAAC,QAAQ,CAAC,KAAK,CAAC;QAEjD,cAAS,GAAG,IAAI,yBAAO,EAAsB,CAAC;QACtD,aAAQ,GAA8B,IAAI,CAAC,SAAS,CAAC,KAAK,CAAC;QAEnD,YAAO,GAAG,IAAI,yBAAO,EAAsB,CAAC;QACpD,WAAM,GAA8B,IAAI,CAAC,OAAO,CAAC,KAAK,CAAC;QAEtC,kBAAa,GAAG,IAAI,yBAAO,EAAmB,CAAC;QAChE,iBAAY,GAA2B,IAAI,CAAC,aAAa,CAAC,KAAK,CAAC;QAE/C,oBAAe,GAAG,IAAI,yBAAO,EAAU,CAAC;QACzD,mBAAc,GAAkB,IAAI,CAAC,eAAe,CAAC,KAAK,CAAC;QA+N3D,SAAI,GAAG,EAAE,CAAC;QAtNR,IAAI,CAAC,KAAK,GAAG,IAAI,CAAC,QAAQ,CAAC,GAAG,CAAC,aAAK,EAAE;YACpC;gBACE,YAAY,gCACV,KAAK,EAAE,IAAI,CAAC,KAAK,CAAC,aAAa,IAC5B,IAAI,CAAC,UAAU,CAAC,MAAM,EAAE,GACxB,IAAI,CAAC,eAAe,CAAC,UAAU,EAAE,CACrC;aACF;SACF,CAAC,CAAC;QAEH,IAAI,CAAC,UAAU,CAAC,IAAI,CAAC,KAAK,CAAC,CAAC;QAE5B,IAAI,CAAC,UAAU,CACb,IAAI,CAAC,KAAK,CAAC,GAAG,CAAC,aAAa,CAAC,CAAC,CAAC,EAAE,EAAE;YACjC,IAAI,CAAC,aAAa,CAAC,EAAE,IAAI,EAAE,CAAC,EAAE,CAAC,CAAC;QAClC,CAAC,CAAC,CACH,CAAC;QAEF,IAAI,CAAC,UAAU,CACb,IAAI,CAAC,eAAe,CAAC,OAAO,CAAC,CAAC,KAAK,EAAE,EAAE;;YACrC,IAAI,CAAC,cAAc,CAAC,KAAK,CAAC,KAAK,CAAC,OAAO,CAAC,CAAC;YACzC,IAAI,MAAA,KAAK,CAAC,YAAY,0CAAE,UAAU,EAAE;gBAClC,IAAI,CAAC,aAAa,CAAC;oBACjB,IAAI,EAAE,SAAS,GAAG,KAAK,CAAC,YAAY,CAAC,UAAU;iBAChD,CAAC,CAAC;aACJ;iBAAM;gBACL,IAAI,CAAC,aAAa,CAAC;oBACjB,IAAI,EAAE,OAAO;iBACd,CAAC,CAAC;aACJ;QACH,CAAC,CAAC,CACH,CAAC;IACJ,CAAC;IAEO,YAAY;QAClB,IAAI,IAAI,CAAC,KAAK,EAAE;YACd,IAAI,CAAC,KAAK,CAAC,OAAO,EAAE,CAAC;YACrB,IAAI,CAAC,KAAK,GAAG,IAAI,CAAC;SACnB;QACD,IAAI,CAAC,OAAO,EAAE,CAAC;IACjB,CAAC;IAED,KAAK,CAAC,WAAW,CAAC,MAAe;QAC/B,IAAI,CAAC,OAAO,GAAG,MAAM,CAAC;QACtB,IAAI,CAAC,QAAQ,EAAE,CAAC;QAEhB,IAAI,CAAC,UAAU,CACb,4BAAU,CAAC,MAAM,CAAC,GAAG,EAAE;YACrB,gBAAc,CAAC,qBAAqB,CAAC,MAAM,CAAC,MAAM,CAAC,KAAK,CAAC,EAAE,CAAC,CAAC;QAC/D,CAAC,CAAC,CACH,CAAC;QAEF,IAAI,CAAC,UAAU,CACb,IAAI,CAAC,UAAU,CAAC,QAAQ,CAAC,KAAK,EAAE,EAAE,IAAI,EAAE,KAAK,EAAE,EAAE,EAAE;YACjD,IAAI,CAAC,MAAM,CAAC,IAAI,IAAI,CAAC,IAAI,CAAC,KAAK,EAAE;gBAC/B,IAAI,CAAC,KAAK,GAAG,IAAI,0BAAQ,EAAE,CAAC;aAC7B;YACD,IAAI,IAAI,CAAC,KAAK,EAAE;gBACd,MAAM,IAAI,CAAC,KAAK,CAAC,OAAO,CAAC;aAC1B;YACD,IAAI,CAAC,UAAU,CAAC,IAAI,EAAE,KAAK,CAAC,CAAC;QAC/B,CAAC,CAAC,CACH,CAAC;QAEF,0BAA0B;QAC1B,6BAA6B;QAC7B,8BAA8B;QAC9B,SAAS;QACT,IAAI,MAAM,CAAC,IAAI,EAAE;YACf,IAAI,CAAC,YAAY,EAAE,CAAC;SACrB;aAAM;YACL,IAAI,CAAC,UAAU,CACb,MAAM,CAAC,MAAM,CAAC,CAAC,MAAM,EAAE,EAAE;gBACvB,IAAI,MAAM,EAAE;oBACV,IAAI,CAAC,YAAY,EAAE,CAAC;iBACrB;YACH,CAAC,CAAC,CACH,CAAC;SACH;QAED,IAAI,CAAC,UAAU,CACb,MAAM,CAAC,OAAO,CAAC,CAAC,MAAM,EAAE,EAAE;;YACxB,IAAI,MAAM,EAAE;gBACV,+BAA+B;gBAC/B,0CAA0C;gBAC1C,2BAA2B;aAC5B;iBAAM;gBACL,MAAA,IAAI,CAAC,MAAM,0CAAE,OAAO,EAAE,CAAC;gBACvB,IAAI,CAAC,OAAO,EAAE,CAAC;aAChB;QACH,CAAC,CAAC,CACH,CAAC;QAEF,IAAI,CAAC,UAAU,CACb,MAAM,CAAC,QAAQ,CAAC,KAAK,IAAI,EAAE;YACzB,IAAI,CAAC,eAAe,EAAE,CAAC;QACzB,CAAC,CAAC,CACH,CAAC;IACJ,CAAC;IAED,oCAAoC;QAClC,MAAM,OAAO,GAAG,IAAI,CAAC,gBAAgB,CAAC;QACtC,MAAM,iBAAiB,GAAuB;YAC5C,IAAI,EAAE,OAAO,CAAC,IAAI;YAClB,UAAU,EAAE,IAAA,qCAAmB,EAAC,OAAO,CAAC,SAAS,CAAC;YAClD,IAAI,EAAE,IAAA,qCAAmB,EAAC,OAAO,CAAC,SAAS,CAAC;YAC5C,GAAG,EAAE,IAAA,qCAAmB,EAAC,OAAO,CAAC,GAAG,CAAC;YACrC,GAAG,EAAE,IAAA,qCAAmB,EAAC,OAAO,CAAC,GAAG,CAAC;YACrC,IAAI,EAAE,IAAA,qCAAmB,EAAC,cAAc,CAAC,OAAO,CAAC,QAAQ,CAAC,CAAC;YAC3D,gFAAgF;YAChF,WAAW,EAAE,IAAA,qCAAmB,EAAC,OAAO,CAAC,OAAO,CAAC;YACjD,SAAS,EAAE,IAAA,qCAAmB,EAAC,OAAO,CAAC,SAAS,CAAC;YACjD,YAAY,EAAE,IAAA,qCAAmB,EAAC,OAAO,CAAC,YAAY,CAAC;YACvD,sEAAsE;YACtE,wBAAwB,EAAE,IAAI;YAC9B,kFAAkF;YAClF,YAAY;YACZ,+BAA+B;YAC/B,+FAA+F;YAC/F,uEAAuE;SACxE,CAAC;QAEF,IAAI,OAAO,CAAC,mBAAmB,EAAE;YAC/B,iBAAiB,CAAC,uBAAuB,GAAG,CAAC,SAAS,EAAE,IAAI,EAAE,IAAI,EAAE,EAAE,CACpE,IAAI,qDAA2B,CAAC,SAAS,EAAE,IAAI,EAAE,IAAI,EAAE,IAAI,CAAC,UAAU,CAAC,CAAC;SAC3E;QACD,OAAO,iBAAiB,CAAC;IAC3B,CAAC;IAED;;OAEG;IACH,KAAK,CAAC,IAAI,CAAC,MAAe,EAAE,UAA2B,EAAE;QACvD,IAAI,CAAC,gBAAgB,GAAG,OAAO,CAAC;QAChC,MAAM,IAAI,CAAC,KAAK,CAAC,MAAM,EAAE;YACvB,MAAM,EAAE,IAAI,CAAC,oCAAoC,EAAE;SACpD,CAAC,CAAC;IACL,CAAC;IAED,4BAA4B,CAC1B,0BAA6E,EAC7E,GAAkB;QAElB,IAAI,CAAC,0BAA0B,EAAE;YAC/B,OAAO,EAAE,CAAC;SACX;QACD,uBAAuB;QACvB,IAAI,0BAA0B,IAAI,aAAa,IAAI,0BAA0B,EAAE;YAC7E,MAAM,OAAO,GAAG,0BAA0B,CAAC;YAC3C,IAAI,CAAC,OAAO,CAAC,IAAI,EAAE;gBACjB,OAAO,0BAA0B,CAAC;aACnC;YACD,OAAO;gBACL,UAAU,EAAE,OAAO,CAAC,IAAI;gBACxB,IAAI,EAAE,OAAO,CAAC,IAAI;gBAClB,GAAG,EAAE,OAAO,CAAC,GAAG;gBAChB,sBAAsB;gBACtB,KAAK,EAAE,OAAO,CAAC,KAAK;gBACpB,IAAI,EAAE,OAAO,CAAC,YAAY,CAAC,CAAC,CAAC,OAAO,CAAC,WAAW,CAAC,CAAC,CAAC,SAAS;gBAC5D,GAAG;aACJ,CAAC;SACH;QAED,IAAI,GAAG,EAAE;YACP,0BAA0B,CAAC,GAAG,GAAG,GAAG,CAAC;SACtC;QACD,OAAO,0BAA0B,CAAC;IACpC,CAAC;IAED,KAAK,CAAC,KAAK,CAAC,MAAe,EAAE,OAAgC;;QAC3D,IAAI,CAAC,IAAI,GAAG,MAAM,CAAC,EAAE,CAAC;QACtB,IAAI,CAAC,WAAW,CAAC,MAAM,CAAC,CAAC;QAEzB,IAAI,CAAC,OAAO,IAAI,MAAM,CAAC,IAAI,CAAC,OAAO,CAAC,CAAC,MAAM,KAAK,CAAC,EAAE;YACjD,6BAA6B;YAC7B,MAAM,cAAc,GAAG,MAAM,IAAI,CAAC,8BAA8B,CAAC,qBAAqB,EAAE,CAAC;YACzF,OAAO,GAAG;gBACR,MAAM,EAAE,cAAc;aACvB,CAAC;SACH;QACD,MAAM,IAAI,CAAC,eAAe,EAAE,CAAC;QAE7B,MAAM,GAAG,GAAG,MAAA,MAAA,OAAO,CAAC,GAAG,mCAAI,MAAC,OAAO,aAAP,OAAO,uBAAP,OAAO,CAAE,MAA6B,0CAAE,GAAG,mCAAI,IAAI,CAAC,cAAc,CAAC;QAC/F,MAAM,YAAY,GAAG,IAAI,CAAC,4BAA4B,CAAC,OAAO,CAAC,MAAM,EAAE,GAAG,CAAC,CAAC;QAC5E,IAAI,CAAC,aAAa,GAAG,YAAY,CAAC;QAClC,IAAI,CAAC,IAAI,GAAG,YAAY,CAAC,IAAI,IAAI,EAAE,CAAC;QAEpC,IAAI,YAAY,CAAC,WAAW,EAAE;YAC5B,IAAI,CAAC,KAAK,CAAC,GAAG,CAAC,OAAO,CAAC,YAAY,CAAC,WAAW,CAAC,CAAC;SAClD;QACD,IAAI,CAAC,YAAY,CAAC,GAAG,EAAE;YACrB,YAAY,CAAC,GAAG,GAAG,EAAE,CAAC;SACvB;QACD,MAAA,IAAI,CAAC,kBAAkB,CAAC,gBAAgB,0CAAE,yBAAyB,CACjE,YAAY,CAAC,GAAG,EAChB,IAAI,CAAC,kBAAkB,CAAC,SAAS,EACjC,IAAI,CAAC,gBAAgB,CAAC,OAAO,CAAC,IAAI,CAAC,IAAI,CAAC,gBAAgB,CAAC,CAC1D,CAAC;QAEF,IAAI,CAAC,UAAU,CACb,IAAI,CAAC,kBAAkB,CAAC,sBAAsB,CAAC,CAAC,UAAU,EAAE,EAAE;YAC5D,mCAAmC;YACnC,UAAU,CAAC,yBAAyB,CAClC,YAAY,CAAC,GAAI,EACjB,IAAI,CAAC,kBAAkB,CAAC,SAAS,EACjC,IAAI,CAAC,gBAAgB,CAAC,OAAO,CAAC,IAAI,CAAC,IAAI,CAAC,gBAAgB,CAAC,CAC1D,CAAC;QACJ,CAAC,CAAC,CACH,CAAC;QACF,IAAI,CAAC,YAAY,EAAE,CAAC;QACpB,IAAI,CAAC,kBAAkB,EAAE,CAAC;IAC5B,CAAC;IAKD,IAAI,IAAI;QACN,OAAO,IAAI,CAAC,KAAK,CAAC,GAAG,CAAC;IACxB,CAAC;IAED,IAAI,GAAG;QACL,OAAO,IAAI,CAAC,eAAe,CAAC,YAAY,CAAC,IAAI,CAAC,EAAE,CAAC,CAAC;IACpD,CAAC;IAED,IAAI,OAAO;QACT,OAAO,IAAI,CAAC,gBAAgB,CAAC;IAC/B,CAAC;IAED,IAAI,aAAa;QACf,OAAO;IACT,CAAC;IAED,IAAI,SAAS;QACX,OAAO,IAAI,CAAC,KAAK,CAAC,SAAS,CAAC;IAC9B,CAAC;IAED,IAAI,EAAE;QACJ,OAAO,IAAI,CAAC,IAAI,CAAC;IACnB,CAAC;IAED,IAAI,MAAM;QACR,OAAO,IAAI,CAAC,OAAO,CAAC;IACtB,CAAC;IAED,IAAI,KAAK;QACP,OAAO,IAAI,CAAC,MAAM,CAAC;IACrB,CAAC;IAED,IAAI,QAAQ;QACV,OAAO,IAAI,CAAC,SAAS,CAAC;IACxB,CAAC;IAED,IAAI,WAAW;QACb,OAAO,IAAI,CAAC,YAAY,CAAC;IAC3B,CAAC;IAED,IAAI,IAAI;QACN,OAAO,IAAI,CAAC,KAAK,CAAC;IACpB,CAAC;IAED,IAAI,aAAa;QACf,OAAO,IAAI,CAAC,cAAc,CAAC;IAC7B,CAAC;IAED,IAAI,EAAE;QACJ,OAAO,IAAI,CAAC,GAAG,CAAC;IAClB,CAAC;IAEO,cAAc;QACpB,IAAI,CAAC,YAAY,GAAG,IAAI,4BAAW,EAAE,CAAC;QACtC,IAAI,CAAC,UAAU,CAAC;YACd,IAAI,CAAC,YAAY;YACjB,IAAI,CAAC,YAAY,CAAC,MAAM,CAAC,CAAC,IAAI,EAAE,EAAE;gBAChC,IAAI,CAAC,SAAS,CAAC,IAAI,CAAC,EAAE,EAAE,EAAE,IAAI,CAAC,EAAE,EAAE,IAAI,EAAE,CAAC,CAAC;YAC7C,CAAC,CAAC;YACF,IAAI,CAAC,YAAY,CAAC,MAAM,CAAC,CAAC,IAAI,EAAE,EAAE;;gBAChC,IAAI,CAAC,MAAM,CAAC,IAAI,CAAC,GAAG,IAAI,CAAC,EAAE,IAAI,IAAI,CAAC,IAAI,cAAc,IAAI,EAAE,CAAC,CAAC;gBAC9D,IAAI,IAAI,KAAK,CAAC,EAAE;oBACd,IAAI,CAAC,cAAc,CAAC,KAAK,CACvB,YAAY,IAAI,CAAC,IAAI,IAAI,MAAA,MAAA,IAAI,CAAC,YAAY,CAAC,UAAU,0CAAE,WAAW,0CAAE,SAAS,+BAA+B,IAAI,EAAE,CACnH,CAAC;iBACH;gBACD,IAAI,CAAC,OAAO,CAAC,IAAI,CAAC,EAAE,EAAE,EAAE,IAAI,CAAC,EAAE,EAAE,IAAI,EAAE,CAAC,CAAC;YAC3C,CAAC,CAAC;YAEF,IAAI,CAAC,YAAY,CAAC,MAAM,CAAC,CAAC,KAAK,EAAE,EAAE;gBACjC,IAAI,CAAC,eAAe,CAAC,IAAI,CAAC,KAAK,CAAC,CAAC;gBACjC,IAAI,CAAC,QAAQ,CAAC,WAAW,CAAC,6BAAW,CAAC,gBAAgB,EAAE;oBACtD,QAAQ,EAAE,KAAK;oBACf,GAAG,EAAE,mBAAmB;iBACzB,CAAC,CAAC;YACL,CAAC,CAAC;SACH,CAAC,CAAC;QACH,IAAI,CAAC,KAAK,CAAC,GAAG,CAAC,SAAS,CAAC,IAAI,CAAC,YAAY,CAAC,CAAC;IAC9C,CAAC;IAEO,YAAY;QAClB,IAAI,CAAC,UAAU,CACb,IAAI,CAAC,KAAK,CAAC,GAAG,CAAC,QAAQ,CAAC,CAAC,MAAM,EAAE,EAAE;YACjC,IAAI,IAAI,CAAC,UAAU,EAAE;gBACnB,IAAI,CAAC,SAAS,EAAE,CAAC;aAClB;QACH,CAAC,CAAC,CACH,CAAC;IACJ,CAAC;IAEO,YAAY;QAClB,IAAI,CAAC,cAAc,EAAE,CAAC;QACtB,IAAI,CAAC,YAAY,EAAE,CAAC;QACpB,IAAI,CAAC,YAAY,GAAG,IAAI,CAAC,QAAQ,CAAC,GAAG,CAAC,kCAAmB,EAAE,CAAC,IAAI,CAAC,KAAK,CAAC,GAAG,EAAE,IAAI,CAAC,CAAC,CAAC;QACnF,IAAI,CAAC,YAAY,CAAC,UAAU,GAAG,IAAI,CAAC,cAAc,CAAC;QACnD,IAAI,CAAC,UAAU,CAAC,IAAI,CAAC,YAAY,CAAC,CAAC;QACnC,IAAI,CAAC,cAAc,GAAG,IAAI,CAAC;QAC3B,IAAI,CAAC,aAAa,CAAC,IAAI,CAAC,IAAI,CAAC,CAAC;IAChC,CAAC;IAED,SAAS;QACP,IAAI,CAAC,eAAe,CAAC,MAAM,CAAC,IAAI,CAAC,EAAE,EAAE,IAAI,CAAC,KAAK,CAAC,GAAG,CAAC,IAAI,EAAE,IAAI,CAAC,KAAK,CAAC,GAAG,CAAC,IAAI,CAAC,CAAC;IACjF,CAAC;IAED,QAAQ;;QACN,MAAA,IAAI,CAAC,SAAS,0CAAE,MAAM,EAAE,CAAC;QACzB,MAAA,IAAI,CAAC,YAAY,0CAAE,MAAM,EAAE,CAAC;QAC5B,MAAA,IAAI,CAAC,MAAM,0CAAE,MAAM,EAAE,CAAC;QACtB,MAAA,IAAI,CAAC,KAAK,0CAAE,MAAM,EAAE,CAAC;QACrB,IAAI,CAAC,MAAM,GAAG,KAAK,CAAC;QACpB,IAAI,CAAC,UAAU,GAAG,KAAK,CAAC;QACxB,IAAI,CAAC,SAAS,GAAG,IAAI,0BAAQ,EAAQ,CAAC;QACtC,IAAI,CAAC,KAAK,GAAG,IAAI,0BAAQ,EAAQ,CAAC;QAClC,IAAI,CAAC,MAAM,GAAG,IAAI,0BAAQ,EAAQ,CAAC;QACnC,IAAI,CAAC,YAAY,GAAG,IAAI,0BAAQ,EAAQ,CAAC;QACzC,MAAA,IAAI,CAAC,YAAY,0CAAE,aAAa,CAAC,SAAS,CAAC,CAAC;QAC5C,IAAI,CAAC,eAAe,CAAC,KAAK,EAAE,CAAC,IAAI,CAAC,CAAC,EAAE,EAAE,EAAE;YACvC,IAAI,CAAC,GAAG,GAAG,EAAE,CAAC;QAChB,CAAC,CAAC,CAAC;QACH,MAAM,EAAE,OAAO,EAAE,GAAG,IAAI,CAAC,QAAQ,CAAC,GAAG,EAAE;YACrC,OAAO,EAAE,CAAC;YACV,IAAI,CAAC,UAAU,GAAG,IAAI,CAAC;YACvB,IAAI,CAAC,YAAY,CAAC,OAAO,EAAE,CAAC;QAC9B,CAAC,CAAC,CAAC;IACL,CAAC;IAED,kBAAkB;QAChB,wCAAwC;QACxC,yDAAyD;QACzD,cAAc,CAAC,GAAG,EAAE;;YAClB,IAAI,CAAC,OAAO,EAAE,CAAC;YACf,IAAI,CAAC,MAAM,EAAE,CAAC;YACd,IAAI,CAAC,IAAI,CAAC,MAAM,CAAC,IAAI,EAAE;gBACrB,MAAA,IAAI,CAAC,KAAK,0CAAE,OAAO,CAAC,IAAI,CAAC,KAAK,IAAI,EAAE;oBAClC,IAAI,CAAC,KAAK,GAAG,IAAI,0BAAQ,EAAQ,CAAC;gBACpC,CAAC,CAAC,CAAC;aACJ;QACH,CAAC,CAAC,CAAC;IACL,CAAC;IAEO,KAAK,CAAC,cAAc;;QAC1B,IAAI,IAAI,CAAC,SAAS,CAAC,0BAA0B,EAAE;YAC7C,8BAA8B;YAC9B,MAAM,KAAK,GAAG,IAAI,CAAC,SAAS,CAAC,WAAW,EAAE,CAAC;YAC3C,MAAM,MAAM,GAAG,MAAM,IAAI,CAAC,SAAS,CAAC,IAAI,CAAC,KAAK,CAAC,GAAG,CAAC,CAAC,IAAI,EAAE,EAAE,CAAC,IAAI,qBAAG,CAAC,IAAI,CAAC,GAAG,CAAC,CAAC,OAAO,CAAC,MAAM,CAAC,CAAC,CAAC;YAChG,OAAO,MAAM,CAAC;SACf;aAAM,IAAI,IAAI,CAAC,SAAS,CAAC,SAAS,EAAE;YACnC,OAAO,IAAI,qBAAG,CAAC,MAAA,IAAI,CAAC,SAAS,CAAC,SAAS,0CAAE,GAAG,CAAC,CAAC,OAAO,CAAC,MAAM,CAAC;SAC9D;aAAM;YACL,OAAO,SAAS,CAAC;SAClB;IACH,CAAC;IAED;;;;;;OAMG;IACK,KAAK,CAAC,eAAe;QAC3B,MAAM,MAAM,GAAG,IAAI,CAAC,OAAO,CAAC;QAC5B,IAAI,gBAAc,CAAC,qBAAqB,CAAC,GAAG,CAAC,MAAM,CAAC,KAAK,CAAC,EAAE,CAAC,EAAE;YAC7D,IAAI,CAAC,cAAc,GAAG,gBAAc,CAAC,qBAAqB,CAAC,GAAG,CAAC,MAAM,CAAC,KAAK,CAAC,EAAE,CAAE,CAAC;SAClF;aAAM;YACL,MAAM,MAAM,GAAG,MAAM,IAAI,CAAC,cAAc,EAAE,CAAC;YAC3C,IAAI,MAAM,EAAE;gBACV,IAAI,CAAC,cAAc,GAAG,MAAM,CAAC;gBAC7B,gBAAc,CAAC,qBAAqB,CAAC,GAAG,CAAC,MAAM,CAAC,KAAK,CAAC,EAAE,EAAE,IAAI,CAAC,cAAc,CAAC,CAAC;aAChF;SACF;IACH,CAAC;IAED,KAAK;QACH,IAAI,CAAC,QAAQ,EAAE,CAAC;QAChB,IAAI,CAAC,kBAAkB,EAAE,CAAC;IAC5B,CAAC;IAEO,KAAK,CAAC,MAAM;QAClB,IAAI,CAAC,IAAI,CAAC,MAAM,EAAE;YAChB,OAAO,IAAI,CAAC,UAAU,EAAE,CAAC;SAC1B;IACH,CAAC;IAEO,KAAK,CAAC,UAAU;;QACtB,MAAM,SAAS,GAAG,IAAI,CAAC,EAAE,CAAC;QAC1B,MAAM,EAAE,IAAI,GAAG,4BAAW,EAAE,IAAI,GAAG,4BAAW,EAAE,GAAG,IAAI,CAAC,KAAK,CAAC,GAAG,CAAC;QAElE,IAAI,UAA2C,CAAC;QAEhD,MAAM,iBAAiB,mCAClB,IAAI,CAAC,aAAa,KACrB,GAAG,EAAE,CAAA,MAAA,IAAI,CAAC,aAAa,0CAAE,GAAG,KAAI,IAAI,CAAC,cAAc,GACpD,CAAC;QAEF,IAAI,CAAC,aAAa,GAAG,iBAAiB,CAAC;QACvC,IAAI,CAAC,MAAM,CAAC,GAAG,CAAC,mCAAmC,EAAE,IAAI,CAAC,aAAa,CAAC,CAAC;QAEzE,IAAI;YACF,UAAU,GAAG,MAAM,IAAI,CAAC,eAAe,CAAC,oBAAoB,CAAC,SAAS,EAAE,IAAI,EAAE,IAAI,EAAE,IAAI,CAAC,aAAa,CAAC,CAAC;SACzG;QAAC,OAAO,CAAC,EAAE;YACV,IAAI,CAAC,MAAM,CAAC,KAAK,CAAC,UAAU,SAAS,iCAAiC,EAAE,IAAI,CAAC,SAAS,CAAC,IAAI,CAAC,aAAa,CAAC,EAAE,CAAC,CAAC,CAAC;SAChH;QAED,IAAI,CAAC,iBAAiB,CAAC,UAAU,CAAC,CAAC;IACrC,CAAC;IAED,iBAAiB,CAAC,UAA2C;QAC3D,IAAI,CAAC,UAAU,EAAE;YACf,IAAI,CAAC,SAAS,CAAC,OAAO,EAAE,CAAC;YACzB,OAAO;SACR;QAED,IAAI,CAAC,YAAY,CAAC,aAAa,CAAC,UAAU,CAAC,CAAC;QAC5C,IAAI,CAAC,IAAI,GAAG,IAAI,CAAC,IAAI,IAAI,UAAU,CAAC,IAAI,IAAI,OAAO,CAAC;QACpD,IAAI,CAAC,MAAM,GAAG,IAAI,CAAC;QACnB,IAAI,CAAC,SAAS,CAAC,OAAO,EAAE,CAAC;QACzB,IAAI,CAAC,OAAO,CAAC,IAAI,GAAG,IAAI,CAAC,IAAI,CAAC;QAE9B,IAAI,CAAC,YAAY,CAAC,OAAO,CAAC,IAAI,CAAC,GAAG,EAAE;YAClC,IAAI,CAAC,SAAS,EAAE,CAAC;QACnB,CAAC,CAAC,CAAC;IACL,CAAC;IAEO,UAAU,CAAC,IAAY,EAAE,KAAgC;QAC/D;;;WAGG;QACH,IAAI;YACF,IAAI,CAAC,KAAK,CAAC,GAAG,CAAC,SAAS,CAAC,IAAI,EAAE,KAAK,CAAC,CAAC;YACtC,IAAI,CAAC,OAAO,EAAE,CAAC;SAChB;QAAC,WAAM;YACN,cAAc;SACf;IACH,CAAC;IAEO,WAAW;QACjB,IAAI,CAAC,IAAI,CAAC,MAAM,EAAE;YAChB,MAAM,IAAI,KAAK,CAAC,2BAA2B,CAAC,CAAC;SAC9C;IACH,CAAC;IAEO,OAAO;QACb,2BAA2B;QAC3B,IAAI,CAAC,eAAe,EAAE,CAAC;QACvB,IAAI,IAAI,CAAC,KAAK,CAAC,GAAG,CAAC,OAAO,EAAE;YAC1B,IAAI;gBACF,IAAI,CAAC,KAAK,CAAC,GAAG,EAAE,CAAC;aAClB;YAAC,WAAM;gBACN,OAAO;aACR;SACF;IACH,CAAC;IAEO,eAAe;;QACrB,wCAAwC;QACxC,IAAI,IAAI,CAAC,KAAK,CAAC,GAAG,CAAC,OAAO,EAAE;YAC1B,OAAO;SACR;QACD,+BAA+B;QAC/B,IAAI,CAAC,CAAA,MAAA,IAAI,CAAC,OAAO,CAAC,OAAO,0CAAE,YAAY,CAAA,EAAE;YACvC,OAAO;SACR;QAED,IAAI,CAAC,OAAO,CAAC,OAAO,CAAC,WAAW,CAAC,IAAI,CAAC,KAAK,CAAC,SAAS,CAAC,CAAC;QACvD,IAAI,CAAC,KAAK,CAAC,IAAI,EAAE,CAAC;QAClB,0BAA0B;QAC1B,2CAA2C;QAC3C,UAAU,CAAC,GAAG,EAAE;;YACd,IAAI,CAAA,MAAA,IAAI,CAAC,UAAU,CAAC,YAAY,0CAAE,EAAE,MAAK,IAAI,CAAC,EAAE,EAAE;gBAChD,IAAI,CAAC,KAAK,EAAE,CAAC;aACd;QACH,CAAC,CAAC,CAAC;IACL,CAAC;IAGO,eAAe;QACrB,IAAI,CAAC,OAAO,EAAE,CAAC;IACjB,CAAC;IAED,KAAK;QACH,OAAO,IAAI,CAAC,KAAK,CAAC,GAAG,CAAC,KAAK,EAAE,CAAC;IAChC,CAAC;IAED,KAAK;QACH,IAAI,CAAC,WAAW,EAAE,CAAC;QACnB,OAAO,IAAI,CAAC,KAAK,CAAC,GAAG,CAAC,KAAK,EAAE,CAAC;IAChC,CAAC;IAED,SAAS;QACP,IAAI,CAAC,WAAW,EAAE,CAAC;QACnB,OAAO,IAAI,CAAC,KAAK,CAAC,GAAG,CAAC,SAAS,EAAE,CAAC;IACpC,CAAC;IAED,KAAK,CAAC,IAAY;QAChB,IAAI,CAAC,WAAW,EAAE,CAAC;QACnB,OAAO,IAAI,CAAC,KAAK,CAAC,GAAG,CAAC,KAAK,CAAC,IAAI,CAAC,CAAC;IACpC,CAAC;IAED,QAAQ,CAAC,IAAY;QACnB,IAAI,CAAC,WAAW,EAAE,CAAC;QACnB,OAAO,IAAI,CAAC,KAAK,CAAC,QAAQ,CAAC,IAAI,CAAC,CAAC;IACnC,CAAC;IAED,YAAY;QACV,IAAI,CAAC,WAAW,EAAE,CAAC;QACnB,IAAI,IAAI,CAAC,KAAK,CAAC,GAAG,CAAC,YAAY,EAAE,EAAE;YACjC,OAAO,IAAI,CAAC,KAAK,CAAC,GAAG,CAAC,YAAY,EAAE,CAAC;SACtC;aAAM;YACL,IAAI,CAAC,MAAM,CAAC,IAAI,CAAC,uCAAuC,CAAC,CAAC;YAC1D,OAAO,EAAE,CAAC;SACX;IACH,CAAC;IAED,WAAW;QACT,OAAO,IAAI,CAAC,KAAK,CAAC,WAAW,CAAC,IAAI,CAAC,KAAK,CAAC,aAAa,CAAC,CAAC;IAC1D,CAAC;IAED,aAAa,CAAC,OAAwB;QACpC,IAAI,CAAC,gBAAgB,mCAAQ,IAAI,CAAC,gBAAgB,GAAK,OAAO,CAAE,CAAC;QACjE,IAAI,CAAC,aAAa,GAAG,IAAI,CAAC,oCAAoC,EAAE,CAAC;QAEjE,IAAI,CAAC,OAAO,CAAC,IAAI,GAAG,OAAO,CAAC,IAAI,IAAI,IAAI,CAAC,IAAI,CAAC;IAChD,CAAC;IAED,KAAK,CAAC,QAAQ,CAAC,OAAe;QAC5B,MAAM,IAAI,CAAC,eAAe,CAAC,QAAQ,CAAC,IAAI,CAAC,EAAE,EAAE,OAAO,CAAC,CAAC;QACtD,IAAI,CAAC,QAAQ,CAAC,IAAI,CAAC,EAAE,EAAE,EAAE,IAAI,CAAC,EAAE,EAAE,IAAI,EAAE,OAAO,EAAE,CAAC,CAAC;IACrD,CAAC;IAED,oBAAoB,CAAC,QAAuC;QAC1D,IAAI,CAAC,IAAI,CAAC,YAAY,EAAE;YACtB,MAAM,IAAI,KAAK,CAAC,qEAAqE,CAAC,CAAC;SACxF;QACD,OAAO,IAAI,CAAC,YAAY,CAAC,4BAA4B,CAAC,IAAI,EAAE,QAAQ,CAAC,CAAC;IACxE,CAAC;IAED,OAAO,CAAC,KAAK,GAAG,IAAI;QAClB,KAAK,CAAC,OAAO,EAAE,CAAC;QAEhB,IAAI,KAAK,EAAE;YACT,IAAI,CAAC,eAAe,CAAC,WAAW,CAAC,IAAI,CAAC,EAAE,CAAC,CAAC;SAC3C;IACH,CAAC;CACF,CAAA;AAxpBQ,oCAAqB,GAAwB,IAAI,GAAG,EAAG,CAAA;AAsB9D;IADC,IAAA,cAAS,EAAC,mBAAc,CAAC;sCACG,aAAQ;gDAAC;AAGtC;IADC,IAAA,cAAS,EAAC,iCAAwB,CAAC;;uDACyB;AAG7D;IADC,IAAA,cAAS,EAAC,0BAAiB,CAAC;;iDACmB;AAGhD;IADC,IAAA,cAAS,EAAC,+BAAsB,CAAC;sCACA,+BAAsB;qDAAC;AAGzD;IADC,IAAA,cAAS,EAAC,2BAAkB,CAAC;;mDACqB;AAGnD;IADC,IAAA,cAAS,EAAC,6BAAe,CAAC;;sDACwB;AAGnD;IADC,IAAA,cAAS,EAAC,uBAAc,CAAC;;6CACe;AAGzC;IADC,IAAA,cAAS,EAAC,kCAAe,CAAC;;uDACyB;AAGpD;IADC,IAAA,cAAS,EAAC,4BAAmB,CAAC;;kDACoB;AAGnD;IADC,IAAA,cAAS,EAAC,kCAAyB,CAAC;;4CACc;AAGnD;IADC,IAAA,cAAS,EAAC,gCAAmB,CAAC;;kDACoB;AAGnD;IADC,IAAA,cAAS,EAAC,6CAA4B,CAAC;sCACX,6CAA4B;gDAAC;AAG1D;IADC,IAAA,cAAS,EAAC,mCAAgB,CAAC;;iDACmB;AAG/C;IADC,IAAA,cAAS,EAAC,yBAAO,CAAC;;8CACgB;AAGnC;IADC,IAAA,cAAS,EAAC,2BAAS,CAAC;;gDACD;AAGpB;IADC,IAAA,cAAS,EAAC,qDAA+B,CAAC;;0DACwB;AAGnE;IADC,IAAA,cAAS,EAAC,qCAAmB,CAAC;;0DAC4B;AAG3D;IADC,IAAA,cAAS,EAAC,gCAAuB,CAAC;;8DACa;AAGhD;IADC,IAAA,cAAS,EAAC,wCAA+B,CAAC;;sEACqB;AAGhE;IADC,IAAA,cAAS,EAAC,iCAAwB,CAAC;;wDACO;AA8O3C;IADC,iBAAU;;4CACD;AAuRV;IADC,IAAA,0BAAQ,EAAC,GAAG,CAAC;;;;qDAGb;AAvlBU,cAAc;IAD1B,IAAA,eAAU,GAAE;;GACA,cAAc,CAypB1B;AAzpBY,wCAAc;AA4pB3B,IAAa,qBAAqB,GAAlC,MAAa,qBAAqB;IAChC;;OAEG;IACH,MAAM,CAAC,KAAK,CAAC,YAAY,CAAC,QAAkB,EAAE,MAAe,EAAE,OAAyB;QACtF,oCAAoC;QACpC,6DAA6D;QAC7D,kCAAkC;QAElC,MAAM,KAAK,GAAG,QAAQ,CAAC,WAAW,CAAC;YACjC;gBACE,KAAK,EAAE,cAAc;gBACrB,QAAQ,EAAE,cAAc;aACzB;SACF,CAAC,CAAC;QAEH,MAAM,MAAM,GAAG,KAAK,CAAC,GAAG,CAAC,cAAc,CAAC,CAAC;QACzC,MAAM,MAAM,CAAC,IAAI,CAAC,MAAM,EAAE,OAAO,CAAC,CAAC;QACnC,OAAO,MAAM,CAAC;IAChB,CAAC;IACD;;OAEG;IACH,MAAM,CAAC,KAAK,CAAC,aAAa,CAAC,QAAkB,EAAE,MAAe,EAAE,OAAgC;QAC9F,MAAM,KAAK,GAAG,QAAQ,CAAC,WAAW,CAAC;YACjC;gBACE,KAAK,EAAE,cAAc;gBACrB,QAAQ,EAAE,cAAc;aACzB;SACF,CAAC,CAAC;QAEH,MAAM,MAAM,GAAG,KAAK,CAAC,GAAG,CAAC,cAAc,CAAC,CAAC;QACzC,MAAM,MAAM,CAAC,KAAK,CAAC,MAAM,EAAE,OAAO,CAAC,CAAC;QACpC,OAAO,MAAM,CAAC;IAChB,CAAC;CACF,CAAA;AAnCY,qBAAqB;IADjC,IAAA,eAAU,GAAE;GACA,qBAAqB,CAmCjC;AAnCY,sDAAqB;AAqC3B,MAAM,2BAA2B,GAAG,CAAC,QAAkB,EAAE,EAAE,CAAC,CAAC,MAAe,EAAE,OAAyB,EAAE,EAAE,CAChH,qBAAqB,CAAC,YAAY,CAAC,QAAQ,EAAE,MAAM,EAAE,OAAO,CAAC,CAAC;AADnD,QAAA,2BAA2B,+BACwB;AAEzD,MAAM,4BAA4B,GACvC,CAAC,QAAkB,EAAE,EAAE,CAAC,CAAC,MAAe,EAAE,OAAgC,EAAE,EAAE,CAC5E,qBAAqB,CAAC,aAAa,CAAC,QAAQ,EAAE,MAAM,EAAE,OAAO,CAAC,CAAC;AAFtD,QAAA,4BAA4B,gCAE0B;AAEnE,SAAS,cAAc,CAAC,QAA6D;IACnF,IAAI,CAAC,QAAQ,IAAI,OAAO,QAAQ,KAAK,QAAQ,EAAE;QAC7C,OAAO,SAAS,CAAC;KAClB;IAED,IAAI,CAAC,CAAC,IAAI,IAAI,QAAQ,CAAC,EAAE;QACvB,OAAO,QAAQ,CAAC;KACjB;IAED,OAAO;QACL,EAAE,EAAE,QAAQ,CAAC,EAAE;QACf,KAAK,EAAE,QAAQ,CAAC,KAAoB;KACrC,CAAC;AACJ,CAAC"}
1	+ {"version":3,"file":"terminal.client.js","sourceRoot":"","sources":["../../src/browser/terminal.client.ts"],"names":[],"mappings":"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"}

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

@@ -8,7 +8,7 @@ const ide_core_common_1 = require("@opensumi/ide-core-common");
 const platform_1 = require("@opensumi/ide-core-common/lib/platform");
 const event_kit_1 = require("event-kit");
 const ide_core_browser_1 = require("@opensumi/ide-core-browser");
-const ide_connection_1 = require("@opensumi/ide-connection");
+const ws_channel_handler_1 = require("@opensumi/ide-connection/lib/browser/ws-channel-handler");
 const common_1 = require("../common");
 const shell_1 = require("../common/shell");
 let NodePtyTerminalService = NodePtyTerminalService_1 = class NodePtyTerminalService {
@@ -39,8 +39,8 @@ let NodePtyTerminalService = NodePtyTerminalService_1 = class NodePtyTerminalSer
             return ide_core_browser_1.electronEnv.metadata.windowClientId + '|' + (0, common_1.generateSessionId)();
         }
         else {
-            const WSChanneHandler = this.injector.get(ide_connection_1.WSChannelHandler);
-            return WSChanneHandler.clientId + '|' + (0, common_1.generateSessionId)();
+            const WSChannelHandler = this.injector.get(ws_channel_handler_1.WSChannelHandler);
+            return WSChannelHandler.clientId + '|' + (0, common_1.generateSessionId)();
         }
     }
     async check(ids) {

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

	@@ -1 +1 @@
1	- {"version":3,"file":"terminal.service.js","sourceRoot":"","sources":["../../src/browser/terminal.service.ts"],"names":[],"mappings":";;;;;AACA,qCAA+E;AAC/E,+DAAoE;AACpE,qEAA6E;AAC7E,yCAAkD;AAClD,iEAAuF;AACvF,~~6DAAgF~~;~~AAChF~~,sCAcmB;AACnB,2CAA8D;AAO9D,IAAa,sBAAsB,8BAAnC,MAAa,sBAAsB;IAAnC;QAoBU,aAAQ,GAAG,IAAI,yBAAO,EAAkB,CAAC;QAC1C,YAAO,GAA0B,IAAI,CAAC,QAAQ,CAAC,KAAK,CAAC;QAEpD,YAAO,GAAG,IAAI,yBAAO,EAAiB,CAAC;QACxC,WAAM,GAAyB,IAAI,CAAC,OAAO,CAAC,KAAK,CAAC;QAEjD,sBAAiB,GAAG,IAAI,mBAAU,EAAmC,CAAC;QACtE,sBAAiB,GAAG,IAAI,mBAAU,EAQvC,CAAC;QAkBI,2BAAsB,GAAG,CAAC,SAAiB,EAAE,GAAqB,EAAuB,EAAE,CAAC,CAAC;YACnG,IAAI,EAAE,GAAG,CAAC,IAAI;YACd,QAAQ,EAAE,KAAK;YACf,MAAM,EAAE,CAAC,OAA8C,EAAE,EAAE,CAAC,IAAI,CAAC,iBAAiB,CAAC,EAAE,CAAC,SAAS,EAAE,OAAO,CAAC;YACzG,MAAM,EAAE,CAAC,OAA+C,EAAE,EAAE,CAC1D,IAAI,CAAC,iBAAiB,CAAC,EAAE,CAAC,SAAS,EAAE,CAAC,CAAC,EAAE,EAAE;gBACzC,OAAO,CAAC,CAAC,CAAC,IAAI,CAAC,CAAC;YAClB,CAAC,CAAC;YACJ,QAAQ,EAAE,CAAC,OAAe,EAAE,EAAE;gBAC5B,IAAI,CAAC,QAAQ,CAAC,SAAS,EAAE,OAAO,CAAC,CAAC;YACpC,CAAC;YACD,WAAW,EAAE,GAAG;SACjB,CAAC,CAAC;IA6ML,CAAC;IAzOC,iBAAiB;QACf,sCAAsC;QACtC,oBAAoB;QACpB,IAAI,IAAI,CAAC,SAAS,CAAC,kBAAkB,IAAI,CAAC,IAAI,CAAC,SAAS,CAAC,QAAQ,EAAE;YACjE,OAAO,8BAAW,CAAC,QAAQ,CAAC,cAAc,GAAG,GAAG,GAAG,IAAA,0BAAiB,GAAE,CAAC;SACxE;aAAM;YACL,MAAM,~~eAAe~~,GAAG,IAAI,CAAC,QAAQ,CAAC,GAAG,CAAC,~~iCAAgB~~,CAAC,CAAC;~~YAC5D~~,OAAO,~~eAAe~~,CAAC,QAAQ,GAAG,GAAG,GAAG,IAAA,0BAAiB,GAAE,CAAC;~~SAC7D~~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"}
1	+ {"version":3,"file":"terminal.service.js","sourceRoot":"","sources":["../../src/browser/terminal.service.ts"],"names":[],"mappings":"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"}

package/lib/node/pty.d.ts CHANGED Viewed

@@ -15,6 +15,7 @@ export declare class PtyService extends Disposable {
     readonly onReady: import("@opensumi/ide-core-node").Event<IProcessReadyEvent>;
     private readonly _onExit;
     readonly onExit: import("@opensumi/ide-core-node").Event<IProcessExitEvent>;
+    private readonly _initialCwd;
     get pty(): IPtyProcess | undefined;
     constructor(id: string, shellLaunchConfig: IShellLaunchConfig, cols: number, rows: number);
     kill(): Promise<void>;

package/lib/node/pty.d.ts.map CHANGED Viewed

	@@ -1 +1 @@
1	- {"version":3,"file":"pty.d.ts","sourceRoot":"","sources":["../../src/node/pty.ts"],"names":[],"mappings":"AAWA,OAAO,EAAE,kBAAkB,EAAE,oBAAoB,EAAE,MAAM,WAAW,CAAC;AACrE,OAAO,EAAE,WAAW,EAAE,MAAM,eAAe,CAAC;AAG5C,OAAO,EAAE,UAAU,EAAwB,MAAM,yBAAyB,CAAC;AAK3E,OAAO,EAAE,kBAAkB,EAAE,iBAAiB,EAAE,MAAM,mBAAmB,CAAC;AAE1E,eAAO,MAAM,WAAW,eAAwB,CAAC;AAEjD,qBACa,UAAW,SAAQ,UAAU;~~IAkBrB~~,EAAE,EAAE,MAAM;IAAE,OAAO,CAAC,QAAQ,CAAC,iBAAiB;~~IAhBjE~~,OAAO,CAAC,QAAQ,CAAC,MAAM,CAAc;IAErC,OAAO,CAAC,QAAQ,CAAC,WAAW,CAAmD;IAC/E,OAAO,CAAC,WAAW,CAA0B;IAE7C,OAAO,CAAC,QAAQ,CAAC,OAAO,CAAyB;IACjD,QAAQ,CAAC,MAAM,kDAAsB;IACrC,OAAO,CAAC,QAAQ,CAAC,QAAQ,CAAqC;IAC9D,QAAQ,CAAC,OAAO,8DAAuB;IACvC,OAAO,CAAC,QAAQ,CAAC,OAAO,CAAoC;IAC5D,QAAQ,CAAC,MAAM,6DAAsB;IAErC,IAAI,GAAG,4BAEN;gBAEkB,EAAE,EAAE,MAAM,EAAmB,iBAAiB,EAAE,kBAAkB,EAAE,IAAI,EAAE,MAAM,EAAE,IAAI,EAAE,MAAM;~~IAqB3G~~,IAAI,IAAI,OAAO,CAAC,IAAI,CAAC;IAYrB,YAAY,IAAI,OAAO,CAAC,oBAAoB,GAAG,SAAS,CAAC;~~IAuBzD~~,mBAAmB,IAAI,OAAO,CAAC,oBAAoB,GAAG,SAAS,CAAC;~~IAiChE~~,KAAK,IAAI,OAAO,CAAC,oBAAoB,GAAG,SAAS,CAAC;YAoD1C,eAAe;IA2B7B,OAAO,CAAC,cAAc;IAMtB,QAAQ;IASR,YAAY;IAIZ,MAAM;IAIN,MAAM,CAAC,IAAI,EAAE,MAAM,EAAE,IAAI,EAAE,MAAM;IAQjC,SAAS,CAAC,IAAI,EAAE,MAAM;CAGvB"}
1	+ {"version":3,"file":"pty.d.ts","sourceRoot":"","sources":["../../src/node/pty.ts"],"names":[],"mappings":"AAWA,OAAO,EAAE,kBAAkB,EAAE,oBAAoB,EAAE,MAAM,WAAW,CAAC;AACrE,OAAO,EAAE,WAAW,EAAE,MAAM,eAAe,CAAC;AAG5C,OAAO,EAAE,UAAU,EAAwB,MAAM,yBAAyB,CAAC;AAK3E,OAAO,EAAE,kBAAkB,EAAE,iBAAiB,EAAE,MAAM,mBAAmB,CAAC;AAE1E,eAAO,MAAM,WAAW,eAAwB,CAAC;AAEjD,qBACa,UAAW,SAAQ,UAAU;IAoBrB,EAAE,EAAE,MAAM;IAAE,OAAO,CAAC,QAAQ,CAAC,iBAAiB;IAlBjE,OAAO,CAAC,QAAQ,CAAC,MAAM,CAAc;IAErC,OAAO,CAAC,QAAQ,CAAC,WAAW,CAAmD;IAC/E,OAAO,CAAC,WAAW,CAA0B;IAE7C,OAAO,CAAC,QAAQ,CAAC,OAAO,CAAyB;IACjD,QAAQ,CAAC,MAAM,kDAAsB;IACrC,OAAO,CAAC,QAAQ,CAAC,QAAQ,CAAqC;IAC9D,QAAQ,CAAC,OAAO,8DAAuB;IACvC,OAAO,CAAC,QAAQ,CAAC,OAAO,CAAoC;IAC5D,QAAQ,CAAC,MAAM,6DAAsB;IAErC,OAAO,CAAC,QAAQ,CAAC,WAAW,CAAS;IAErC,IAAI,GAAG,4BAEN;gBAEkB,EAAE,EAAE,MAAM,EAAmB,iBAAiB,EAAE,kBAAkB,EAAE,IAAI,EAAE,MAAM,EAAE,IAAI,EAAE,MAAM;IAoB3G,IAAI,IAAI,OAAO,CAAC,IAAI,CAAC;IAYrB,YAAY,IAAI,OAAO,CAAC,oBAAoB,GAAG,SAAS,CAAC;IAoBzD,mBAAmB,IAAI,OAAO,CAAC,oBAAoB,GAAG,SAAS,CAAC;IAgChE,KAAK,IAAI,OAAO,CAAC,oBAAoB,GAAG,SAAS,CAAC;YAoD1C,eAAe;IA2B7B,OAAO,CAAC,cAAc;IAMtB,QAAQ;IASR,YAAY;IAIZ,MAAM;IAIN,MAAM,CAAC,IAAI,EAAE,MAAM,EAAE,IAAI,EAAE,MAAM;IAQjC,SAAS,CAAC,IAAI,EAAE,MAAM;CAGvB"}

package/lib/node/pty.js CHANGED Viewed

@@ -39,10 +39,10 @@ let PtyService = class PtyService extends ide_core_node_1.Disposable {
             // color prompt as defined in the default ~/.bashrc file.
             name = 'xterm-256color';
         }
-        const cwd = this.parseCwd();
+        this._initialCwd = this.parseCwd();
         this._ptyOptions = {
             name,
-            cwd,
+            cwd: this._initialCwd,
             env: shellLaunchConfig.env,
             cols,
             rows,
@@ -63,33 +63,27 @@ let PtyService = class PtyService extends ide_core_node_1.Disposable {
         catch (ex) { }
     }
     async _validateCwd() {
-        const { cwd } = this._ptyOptions;
-        if (cwd) {
+        if (this._initialCwd) {
             try {
-                const result = await fs_1.promises.stat(cwd);
+                const result = await fs_1.promises.stat(this._initialCwd);
                 if (!result.isDirectory()) {
                     return {
-                        message: `Starting directory (cwd) "${cwd}" is not a directory`,
+                        message: `Starting directory (cwd) "${this._initialCwd}" is not a directory`,
                     };
                 }
             }
             catch (err) {
                 if ((err === null || err === void 0 ? void 0 : err.code) === 'ENOENT') {
                     return {
-                        message: `Starting directory (cwd) "${cwd}" does not exist`,
+                        message: `Starting directory (cwd) "${this._initialCwd}" does not exist`,
                     };
                 }
             }
         }
-        else {
-            return {
-                message: 'IPtyForkOptions.cwd not set',
-            };
-        }
+        return undefined;
     }
     async _validateExecutable() {
         const options = this.shellLaunchConfig;
-        const { cwd } = this._ptyOptions;
         if (!options.executable) {
             return {
                 message: 'IShellLaunchConfig.executable not set',
@@ -107,7 +101,7 @@ let PtyService = class PtyService extends ide_core_node_1.Disposable {
             if ((err === null || err === void 0 ? void 0 : err.code) === 'ENOENT') {
                 // The executable isn't an absolute path, try find it on the PATH or CWD
                 const envPaths = options.env && options.env.PATH ? options.env.PATH.split(path.delimiter) : undefined;
-                const executable = await (0, shell_1.findExecutable)(options.executable, cwd, envPaths);
+                const executable = await (0, shell_1.findExecutable)(options.executable, this._initialCwd, envPaths);
                 if (!executable) {
                     return {
                         message: `Path to shell executable "${options.executable}" does not exist`,

package/lib/node/pty.js.map CHANGED Viewed

	@@ -1 +1 @@
1	- {"version":3,"file":"pty.js","sourceRoot":"","sources":["../../src/node/pty.ts"],"names":[],"mappings":";AAAA;;;gGAGgG;;;;AAEhG,sIAAsI;AAEtI,sDAAgC;AAChC,4DAAsC;AACtC,oDAAoB;AACpB,sEAA+B;AAG/B,mCAAyC;AACzC,iFAAgF;AAChF,2DAA2E;AAC3E,qCAAqD;AACrD,2BAA8B;AAC9B,iFAA2D;AAC3D,qEAAmE;AAGtD,QAAA,WAAW,GAAG,MAAM,CAAC,aAAa,CAAC,CAAC;AAGjD,IAAa,UAAU,GAAvB,MAAa,UAAW,SAAQ,0BAAU;~~IAkBxC~~,YAAmB,EAAU,EAAmB,iBAAqC,EAAE,IAAY,EAAE,IAAY;QAC/G,KAAK,EAAE,CAAC;QADS,OAAE,GAAF,EAAE,CAAQ;QAAmB,sBAAiB,GAAjB,iBAAiB,CAAoB;~~QAXpE~~,YAAO,GAAG,IAAI,uBAAO,EAAU,CAAC;QACxC,WAAM,GAAG,IAAI,CAAC,OAAO,CAAC,KAAK,CAAC;QACpB,aAAQ,GAAG,IAAI,uBAAO,EAAsB,CAAC;QACrD,YAAO,GAAG,IAAI,CAAC,QAAQ,CAAC,KAAK,CAAC;QACtB,YAAO,GAAG,IAAI,uBAAO,EAAqB,CAAC;QACnD,WAAM,GAAG,IAAI,CAAC,OAAO,CAAC,KAAK,CAAC;~~QAQnC~~,IAAI,IAAY,CAAC;QACjB,IAAI,oBAAS,EAAE;YACb,IAAI,GAAG,IAAI,CAAC,QAAQ,CAAC,IAAI,CAAC,iBAAiB,CAAC,UAAU,IAAI,EAAE,CAAC,CAAC;SAC/D;aAAM;YACL,+FAA+F;YAC/F,yDAAyD;YACzD,IAAI,GAAG,gBAAgB,CAAC;SACzB;~~QAED~~,~~MAAM~~,~~GAAG~~,GAAG,IAAI,CAAC,QAAQ,EAAE,CAAC;~~QAC5B~~,IAAI,CAAC,WAAW,GAAG;YACjB,IAAI;YACJ,GAAG;~~YACH~~,GAAG,EAAE,iBAAiB,CAAC,GAAgC;YACvD,IAAI;YACJ,IAAI;SACL,CAAC;IACJ,CAAC;~~IAvBD~~,IAAI,GAAG;QACL,OAAO,IAAI,CAAC,WAAW,CAAC;IAC1B,CAAC;~~IAuBD~~,KAAK,CAAC,IAAI;QACR,IAAI,IAAI,CAAC,QAAQ,EAAE;YACjB,OAAO;SACR;QAED,IAAI;YACF,IAAI,IAAI,CAAC,WAAW,EAAE;gBACpB,IAAI,CAAC,WAAW,CAAC,IAAI,EAAE,CAAC;aACzB;SACF;QAAC,OAAO,EAAE,EAAE,GAAE;IACjB,CAAC;IAED,KAAK,CAAC,YAAY;QAChB,~~MAAM~~,~~EAAE,GAAG,EAAE,GAAG,~~IAAI,CAAC,WAAW,~~CAAC;QACjC,IAAI,GAAG,~~EAAE;~~YACP~~,IAAI;gBACF,MAAM,MAAM,GAAG,MAAM,aAAQ,CAAC,IAAI,CAAC,~~GAAG~~,CAAC,CAAC;~~gBACxC~~,IAAI,CAAC,MAAM,CAAC,WAAW,EAAE,EAAE;oBACzB,OAAO;wBACL,OAAO,EAAE,6BAA6B,~~GAAG~~,sBAAsB;~~qBAChE~~,CAAC;iBACH;aACF;YAAC,OAAO,GAAG,EAAE;gBACZ,IAAI,CAAA,GAAG,aAAH,GAAG,uBAAH,GAAG,CAAE,IAAI,MAAK,QAAQ,EAAE;oBAC1B,OAAO;wBACL,OAAO,EAAE,6BAA6B,~~GAAG~~,kBAAkB;~~qBAC5D~~,CAAC;iBACH;aACF;SACF;~~aAAM;YACL~~,OAAO~~;gBACL~~,~~OAAO~~,~~EAAE,6BAA6B;aACvC,~~CAAC;~~SACH;IACH~~,CAAC;IACD,KAAK,CAAC,mBAAmB;QACvB,MAAM,OAAO,GAAG,IAAI,CAAC,iBAAiB,CAAC;QACvC,~~MAAM,EAAE,GAAG,EAAE,GAAG,~~IAAI,CAAC,~~WAAW,CAAC;QACjC,IAAI,CAAC,~~OAAO,CAAC,UAAU,EAAE;YACvB,OAAO;gBACL,OAAO,EAAE,uCAAuC;aACjD,CAAC;SACH;QACD,IAAI;YACF,MAAM,MAAM,GAAG,MAAM,aAAQ,CAAC,IAAI,CAAC,OAAO,CAAC,UAAU,CAAC,CAAC;YACvD,IAAI,CAAC,MAAM,CAAC,MAAM,EAAE,IAAI,CAAC,MAAM,CAAC,cAAc,EAAE,EAAE;gBAChD,OAAO;oBACL,OAAO,EAAE,6BAA6B,OAAO,CAAC,UAAU,8BAA8B;iBACvF,CAAC;aACH;SACF;QAAC,OAAO,GAAG,EAAE;YACZ,IAAI,CAAA,GAAG,aAAH,GAAG,uBAAH,GAAG,CAAE,IAAI,MAAK,QAAQ,EAAE;gBAC1B,wEAAwE;gBACxE,MAAM,QAAQ,GACZ,OAAO,CAAC,GAAG,IAAI,OAAO,CAAC,GAAG,CAAC,IAAI,CAAC,CAAC,CAAC,OAAO,CAAC,GAAG,CAAC,IAAI,CAAC,KAAK,CAAC,IAAI,CAAC,SAAS,CAAC,CAAC,CAAC,CAAC,SAAS,CAAC;gBACvF,MAAM,UAAU,GAAG,MAAM,IAAA,sBAAc,EAAC,OAAO,CAAC,UAAU,EAAE,~~GAAG~~,EAAE,QAAQ,CAAC,CAAC;~~gBAC3E~~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~~AA1NC~~;IADC,IAAA,cAAS,EAAC,2BAAW,CAAC;;0CACc;AAF1B,UAAU;IADtB,IAAA,eAAU,EAAC,EAAE,QAAQ,EAAE,IAAI,EAAE,CAAC;;GAClB,UAAU,~~CA4NtB~~;~~AA5NY~~,gCAAU"}
1	+ {"version":3,"file":"pty.js","sourceRoot":"","sources":["../../src/node/pty.ts"],"names":[],"mappings":"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"}

package/lib/node/terminal.service.client.js CHANGED Viewed

@@ -48,7 +48,7 @@ let TerminalServiceClientImpl = class TerminalServiceClientImpl extends ide_conn
             const pty = await this.terminalService.create2(id, cols, rows, launchConfig);
             if (pty) {
                 this.terminalService.setClient(this.clientId, this);
-                this.logger.log(`client ${id} create ${pty.pid} with options `, launchConfig);
+                this.logger.log(`client ${id} create ${pty} with options `, launchConfig);
                 this.terminalMap.set(id, pty);
                 return {
                     id,

package/lib/node/terminal.service.client.js.map CHANGED Viewed

	@@ -1 +1 @@
1	- {"version":3,"file":"terminal.service.client.js","sourceRoot":"","sources":["../../src/node/terminal.service.client.ts"],"names":[],"mappings":";;;;AAAA,qCAAqD;AACrD,6DAAsD;AACtD,sCAMmB;AAEnB,2DAAsD;AACtD,2CAAoF;AACpF,mCAA2G;AAC3G,yEAAqG;AAErG,qEAA6E;AAU7E;;;GAGG;AAEH,IAAa,yBAAyB,GAAtC,MAAa,yBAA0B,SAAQ,2BAA+B;IAA9E;;QACU,gBAAW,GAA6B,IAAI,GAAG,EAAE,CAAC;IA6K5D,CAAC;IAhKC,qBAAqB,CAAC,QAAgB;QACpC,IAAI,CAAC,QAAQ,GAAG,QAAQ,CAAC;QACzB,IAAI,CAAC,eAAe,CAAC,SAAS,CAAC,IAAI,CAAC,QAAQ,EAAE,IAAI,CAAC,CAAC;IACtD,CAAC;IAED,aAAa,CAAC,EAAU,EAAE,IAAY;QACpC,IAAI,IAAI,CAAC,MAAM,EAAE;YACf,IAAI,CAAC,MAAM,CAAC,SAAS,CAAC,EAAE,EAAE,IAAI,CAAC,CAAC;SACjC;aAAM;YACL,IAAI,CAAC,MAAM,CAAC,IAAI,CAAC,iBAAiB,EAAE,sBAAsB,CAAC,CAAC;SAC7D;IACH,CAAC;IAED,WAAW,CAAC,EAAU,EAAE,IAAkE,EAAE,MAAe;QACzG,IAAI,IAAI,CAAC,MAAM,EAAE;YACf,IAAI,CAAC,MAAM,CAAC,WAAW,CAAC,EAAE,EAAE,IAAI,EAAE,MAAM,CAAC,CAAC;SAC3C;aAAM;YACL,IAAI,CAAC,MAAM,CAAC,IAAI,CAAC,iBAAiB,EAAE,sBAAsB,CAAC,CAAC;SAC7D;IACH,CAAC;IAED,kBAAkB;IAClB,cAAc,CAAC,aAAuB;QACpC,OAAO,IAAI,CAAC,eAAe,CAAC,oBAAoB,CAAC,IAAI,CAAC,QAAQ,EAAE,aAAa,CAAC,CAAC;IACjF,CAAC;IAED,KAAK,CAAC,OAAO,CACX,EAAU,EACV,IAAY,EACZ,IAAY,EACZ,YAAgC;QAEhC,IAAI;YACF,MAAM,GAAG,GAAG,MAAM,IAAI,CAAC,eAAe,CAAC,OAAO,CAAC,EAAE,EAAE,IAAI,EAAE,IAAI,EAAE,YAAY,CAAC,CAAC;YAC7E,IAAI,GAAG,EAAE;gBACP,IAAI,CAAC,eAAe,CAAC,SAAS,CAAC,IAAI,CAAC,QAAQ,EAAE,IAAI,CAAC,CAAC;gBACpD,IAAI,CAAC,MAAM,CAAC,GAAG,CAAC,UAAU,EAAE,WAAW,GAAG,~~CAAC,GAAG,~~gBAAgB,EAAE,YAAY,CAAC,CAAC;~~gBAC9E~~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"}
1	+ {"version":3,"file":"terminal.service.client.js","sourceRoot":"","sources":["../../src/node/terminal.service.client.ts"],"names":[],"mappings":"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"}

package/package.json CHANGED Viewed

@@ -1,6 +1,6 @@
 {
   "name": "@opensumi/ide-terminal-next",
-  "version": "2.15.4-next-1646729005.0",
+  "version": "2.15.4",
   "files": [
     "lib"
   ],
@@ -16,10 +16,10 @@
     "url": "git@github.com:opensumi/core.git"
   },
   "dependencies": {
-    "@opensumi/ide-connection": "2.15.4-next-1646729005.0",
-    "@opensumi/ide-core-common": "2.15.4-next-1646729005.0",
-    "@opensumi/ide-core-node": "2.15.4-next-1646729005.0",
-    "@opensumi/ide-file-service": "2.15.4-next-1646729005.0",
+    "@opensumi/ide-connection": "2.15.4",
+    "@opensumi/ide-core-common": "2.15.4",
+    "@opensumi/ide-core-node": "2.15.4",
+    "@opensumi/ide-file-service": "2.15.4",
     "event-kit": "^2.5.3",
     "lodash.omit": "^4.1.1",
     "node-pty": "0.10.0",
@@ -29,21 +29,21 @@
     "xterm-addon-search": "^0.9.0-beta.3"
   },
   "devDependencies": {
-    "@opensumi/ide-components": "2.15.4-next-1646729005.0",
-    "@opensumi/ide-core-browser": "2.15.4-next-1646729005.0",
+    "@opensumi/ide-components": "2.15.4",
+    "@opensumi/ide-core-browser": "2.15.4",
     "@opensumi/ide-dev-tool": "^1.3.1",
-    "@opensumi/ide-editor": "2.15.4-next-1646729005.0",
-    "@opensumi/ide-main-layout": "2.15.4-next-1646729005.0",
-    "@opensumi/ide-overlay": "2.15.4-next-1646729005.0",
-    "@opensumi/ide-status-bar": "2.15.4-next-1646729005.0",
-    "@opensumi/ide-theme": "2.15.4-next-1646729005.0",
-    "@opensumi/ide-variable": "2.15.4-next-1646729005.0",
-    "@opensumi/ide-workspace": "2.15.4-next-1646729005.0",
+    "@opensumi/ide-editor": "2.15.4",
+    "@opensumi/ide-main-layout": "2.15.4",
+    "@opensumi/ide-overlay": "2.15.4",
+    "@opensumi/ide-status-bar": "2.15.4",
+    "@opensumi/ide-theme": "2.15.4",
+    "@opensumi/ide-variable": "2.15.4",
+    "@opensumi/ide-workspace": "2.15.4",
     "@types/event-kit": "^2.4.0",
     "@types/http-proxy": "^1.17.2",
     "@types/puppeteer": "^2.0.0",
     "http-proxy": "^1.18.0",
     "puppeteer": "^2.0.0"
   },
-  "gitHead": "21cfb3e6927556b30d8c2daeab38d2d0bb94658b"
+  "gitHead": "6d71b2ea43a1034e971d1ec8bdf428b7d984b585"
 }