@opensumi/ide-terminal-next 2.13.10 → 2.14.0

package/lib/browser/links/link.js

@@ -1,16 +1,24 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
 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");
-class TerminalLink extends ide_core_common_1.Disposable {
-    constructor(_xterm, range, text, _viewportY, _activateCallback, _isHighConfidenceLink) {
+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;
+let TerminalLink = class TerminalLink extends ide_core_common_1.Disposable {
+    constructor(_xterm, range, text, _viewportY, _activateCallback, _tooltipCallback, _isHighConfidenceLink, label) {
         super();
         this._xterm = _xterm;
         this.range = range;
         this.text = text;
         this._viewportY = _viewportY;
         this._activateCallback = _activateCallback;
+        this._tooltipCallback = _tooltipCallback;
         this._isHighConfidenceLink = _isHighConfidenceLink;
+        this.label = label;
         this._onInvalidated = new ide_core_common_1.Emitter();
         this.decorations = {
             pointerCursor: false,
@@ -21,10 +29,14 @@ class TerminalLink extends ide_core_common_1.Disposable {
         return this._onInvalidated.event;
     }
     dispose() {
-        var _a;
+        var _a, _b, _c;
         super.dispose();
         (_a = this._hoverListeners) === null || _a === void 0 ? void 0 : _a.dispose();
         this._hoverListeners = undefined;
+        (_b = this._tooltipScheduler) === null || _b === void 0 ? void 0 : _b.dispose();
+        this._tooltipScheduler = undefined;
+        (_c = this._tooltipDisposable) === null || _c === void 0 ? void 0 : _c.dispose();
+        this._tooltipDisposable = undefined;
     }
     activate(event, text) {
         this._activateCallback(event, text);
@@ -55,7 +67,21 @@ class TerminalLink extends ide_core_common_1.Disposable {
                 this._onInvalidated.fire();
             }
         }));
+        // Only show the tooltip and highlight for high confidence links (not word/search workspace
+        // links). Feedback was that this makes using the terminal overly noisy.
+        if (this._isHighConfidenceLink) {
+            this._tooltipScheduler = new ide_core_common_1.RunOnceScheduler(() => {
+                var _a;
+                this._tooltipDisposable = this._tooltipCallback(this, (0, helpers_1.convertBufferRangeToViewport)(this.range, this._viewportY), this._isHighConfidenceLink ? () => this._enableDecorations() : undefined, this._isHighConfidenceLink ? () => this._disableDecorations() : undefined);
+                // Clear out scheduler until next hover event
+                (_a = this._tooltipScheduler) === null || _a === void 0 ? void 0 : _a.dispose();
+                this._tooltipScheduler = undefined;
+            }, this.preferenceService.get('editor.hover.delay') || DEFAULT_HOVER_DELAY);
+            this._tooltipScheduler.schedule();
+        }
+        const origin = { x: event.pageX, y: event.pageY };
         this._hoverListeners.push(this._addDisposableListener(document, 'mousemove', (e) => {
+            var _a;
             // Update decorations
             if (this._isModifierDown(e)) {
                 this._enableDecorations();
@@ -63,12 +89,23 @@ class TerminalLink extends ide_core_common_1.Disposable {
             else {
                 this._disableDecorations();
             }
+            // Reset the scheduler if the mouse moves too much
+            if (Math.abs(e.pageX - origin.x) > window.devicePixelRatio * 2 ||
+                Math.abs(e.pageY - origin.y) > window.devicePixelRatio * 2) {
+                origin.x = e.pageX;
+                origin.y = e.pageY;
+                (_a = this._tooltipScheduler) === null || _a === void 0 ? void 0 : _a.schedule();
+            }
         }));
     }
     leave() {
-        var _a;
+        var _a, _b, _c;
         (_a = this._hoverListeners) === null || _a === void 0 ? void 0 : _a.dispose();
         this._hoverListeners = undefined;
+        (_b = this._tooltipScheduler) === null || _b === void 0 ? void 0 : _b.dispose();
+        this._tooltipScheduler = undefined;
+        (_c = this._tooltipDisposable) === null || _c === void 0 ? void 0 : _c.dispose();
+        this._tooltipDisposable = undefined;
     }
     _enableDecorations() {
         if (!this.decorations.pointerCursor) {
@@ -89,6 +126,14 @@ class TerminalLink extends ide_core_common_1.Disposable {
     _isModifierDown(event) {
         return ide_core_common_1.isOSX ? event.metaKey : event.ctrlKey;
     }
-}
+};
+(0, tslib_1.__decorate)([
+    (0, di_1.Autowired)(ide_core_browser_1.PreferenceService),
+    (0, tslib_1.__metadata)("design:type", Object)
+], TerminalLink.prototype, "preferenceService", void 0);
+TerminalLink = (0, tslib_1.__decorate)([
+    (0, di_1.Injectable)({ multiple: true }),
+    (0, tslib_1.__metadata)("design:paramtypes", [Function, Object, String, Number, Function, Function, Boolean, Object])
+], TerminalLink);
 exports.TerminalLink = TerminalLink;
 //# sourceMappingURL=link.js.map

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

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

package/lib/browser/links/protocol-link-provider.d.ts

@@ -1,11 +1,14 @@
-import type { Terminal } from 'xterm';
+import type { Terminal, IViewportRange } from 'xterm';
+import { IDisposable } from '@opensumi/ide-core-common';
 import { TerminalLink } from './link';
 import { TerminalBaseLinkProvider } from './base';
 export declare class TerminalProtocolLinkProvider extends TerminalBaseLinkProvider {
     private readonly _xterm;
     private readonly _activateCallback;
+    private readonly _tooltipCallback;
     private _linkComputerTarget;
-    constructor(_xterm: Terminal, _activateCallback: (event: MouseEvent | undefined, uri: string) => void);
+    private readonly injector;
+    constructor(_xterm: Terminal, _activateCallback: (event: MouseEvent | undefined, uri: string) => void, _tooltipCallback: (link: TerminalLink, viewportRange: IViewportRange, modifierDownCallback?: () => void, modifierUpCallback?: () => void) => IDisposable);
     protected _provideLinks(y: number): TerminalLink[];
 }
 //# sourceMappingURL=protocol-link-provider.d.ts.map

package/lib/browser/links/protocol-link-provider.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"protocol-link-provider.d.ts","sourceRoot":"","sources":["../../../src/browser/links/protocol-link-provider.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,QAAQ,EAAe,MAAM,OAAO,CAAC;AAGnD,OAAO,EAAE,YAAY,EAAE,MAAM,QAAQ,CAAC;AACtC,OAAO,EAAE,wBAAwB,EAAE,MAAM,QAAQ,CAAC;AAElD,qBAAa,4BAA6B,SAAQ,wBAAwB;IAItE,OAAO,CAAC,QAAQ,CAAC,MAAM;IACvB,OAAO,CAAC,QAAQ,CAAC,iBAAiB;IAJpC,OAAO,CAAC,mBAAmB,CAAkC;gBAG1C,MAAM,EAAE,QAAQ,EAChB,iBAAiB,EAAE,CAAC,KAAK,EAAE,UAAU,GAAG,SAAS,EAAE,GAAG,EAAE,MAAM,KAAK,IAAI;IAK1F,SAAS,CAAC,aAAa,CAAC,CAAC,EAAE,MAAM,GAAG,YAAY,EAAE;CAiCnD"}
+{"version":3,"file":"protocol-link-provider.d.ts","sourceRoot":"","sources":["../../../src/browser/links/protocol-link-provider.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,QAAQ,EAAe,cAAc,EAAE,MAAM,OAAO,CAAC;AAEnE,OAAO,EAAE,WAAW,EAAE,MAAM,2BAA2B,CAAC;AAGxD,OAAO,EAAE,YAAY,EAAE,MAAM,QAAQ,CAAC;AACtC,OAAO,EAAE,wBAAwB,EAAE,MAAM,QAAQ,CAAC;AAElD,qBACa,4BAA6B,SAAQ,wBAAwB;IAOtE,OAAO,CAAC,QAAQ,CAAC,MAAM;IACvB,OAAO,CAAC,QAAQ,CAAC,iBAAiB;IAClC,OAAO,CAAC,QAAQ,CAAC,gBAAgB;IARnC,OAAO,CAAC,mBAAmB,CAAkC;IAG7D,OAAO,CAAC,QAAQ,CAAC,QAAQ,CAAW;gBAGjB,MAAM,EAAE,QAAQ,EAChB,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;IAKlB,SAAS,CAAC,aAAa,CAAC,CAAC,EAAE,MAAM,GAAG,YAAY,EAAE;CAmCnD"}

package/lib/browser/links/protocol-link-provider.js

@@ -1,15 +1,18 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.TerminalProtocolLinkProvider = void 0;
+const tslib_1 = require("tslib");
+const di_1 = require("@opensumi/di");
 const common_1 = require("../../common");
 const helpers_1 = require("./helpers");
 const link_1 = require("./link");
 const base_1 = require("./base");
-class TerminalProtocolLinkProvider extends base_1.TerminalBaseLinkProvider {
-    constructor(_xterm, _activateCallback) {
+let TerminalProtocolLinkProvider = class TerminalProtocolLinkProvider extends base_1.TerminalBaseLinkProvider {
+    constructor(_xterm, _activateCallback, _tooltipCallback) {
         super();
         this._xterm = _xterm;
         this._activateCallback = _activateCallback;
+        this._tooltipCallback = _tooltipCallback;
     }
     _provideLinks(y) {
         var _a, _b;
@@ -30,10 +33,27 @@ class TerminalProtocolLinkProvider extends base_1.TerminalBaseLinkProvider {
             var _a;
             const range = (0, helpers_1.convertLinkRangeToBuffer)(lines, this._xterm.cols, link.range, startLine);
             // Check if the link if within the mouse position
-            return new link_1.TerminalLink(this._xterm, range, ((_a = link.url) === null || _a === void 0 ? void 0 : _a.toString()) || '', this._xterm.buffer.active.viewportY, this._activateCallback, true);
+            return this.injector.get(link_1.TerminalLink, [
+                this._xterm,
+                range,
+                ((_a = link.url) === null || _a === void 0 ? void 0 : _a.toString()) || '',
+                this._xterm.buffer.active.viewportY,
+                this._activateCallback,
+                this._tooltipCallback,
+                true,
+                undefined,
+            ]);
         });
     }
-}
+};
+(0, tslib_1.__decorate)([
+    (0, di_1.Autowired)(di_1.INJECTOR_TOKEN),
+    (0, tslib_1.__metadata)("design:type", di_1.Injector)
+], TerminalProtocolLinkProvider.prototype, "injector", void 0);
+TerminalProtocolLinkProvider = (0, tslib_1.__decorate)([
+    (0, di_1.Injectable)({ multiple: true }),
+    (0, tslib_1.__metadata)("design:paramtypes", [Function, Function, Function])
+], TerminalProtocolLinkProvider);
 exports.TerminalProtocolLinkProvider = TerminalProtocolLinkProvider;
 class TerminalLinkAdapter {
     constructor(_xterm, _lineStart, _lineEnd) {

package/lib/browser/links/protocol-link-provider.js.map

@@ -1 +1 @@
-{"version":3,"file":"protocol-link-provider.js","sourceRoot":"","sources":["../../../src/browser/links/protocol-link-provider.ts"],"names":[],"mappings":";;;AACA,yCAAiE;AACjE,uCAA0E;AAC1E,iCAAsC;AACtC,iCAAkD;AAElD,MAAa,4BAA6B,SAAQ,+BAAwB;IAGxE,YACmB,MAAgB,EAChB,iBAAuE;QAExF,KAAK,EAAE,CAAC;QAHS,WAAM,GAAN,MAAM,CAAU;QAChB,sBAAiB,GAAjB,iBAAiB,CAAsD;IAG1F,CAAC;IAES,aAAa,CAAC,CAAS;;QAC/B,IAAI,SAAS,GAAG,CAAC,GAAG,CAAC,CAAC;QACtB,IAAI,OAAO,GAAG,SAAS,CAAC;QAExB,MAAM,KAAK,GAAkB,CAAC,IAAI,CAAC,MAAM,CAAC,MAAM,CAAC,MAAM,CAAC,OAAO,CAAC,SAAS,CAAE,CAAC,CAAC;QAE7E,OAAO,SAAS,IAAI,CAAC,KAAI,MAAA,IAAI,CAAC,MAAM,CAAC,MAAM,CAAC,MAAM,CAAC,OAAO,CAAC,SAAS,CAAC,0CAAE,SAAS,CAAA,EAAE;YAChF,KAAK,CAAC,OAAO,CAAC,IAAI,CAAC,MAAM,CAAC,MAAM,CAAC,MAAM,CAAC,OAAO,CAAC,SAAS,GAAG,CAAC,CAAE,CAAC,CAAC;YACjE,SAAS,EAAE,CAAC;SACb;QAED,OAAO,OAAO,GAAG,IAAI,CAAC,MAAM,CAAC,MAAM,CAAC,MAAM,CAAC,MAAM,KAAI,MAAA,IAAI,CAAC,MAAM,CAAC,MAAM,CAAC,MAAM,CAAC,OAAO,CAAC,OAAO,GAAG,CAAC,CAAC,0CAAE,SAAS,CAAA,EAAE;YAC9G,KAAK,CAAC,IAAI,CAAC,IAAI,CAAC,MAAM,CAAC,MAAM,CAAC,MAAM,CAAC,OAAO,CAAC,OAAO,GAAG,CAAC,CAAE,CAAC,CAAC;YAC5D,OAAO,EAAE,CAAC;SACX;QAED,IAAI,CAAC,mBAAmB,GAAG,IAAI,mBAAmB,CAAC,IAAI,CAAC,MAAM,EAAE,SAAS,EAAE,OAAO,CAAC,CAAC;QACpF,MAAM,KAAK,GAAG,qBAAY,CAAC,YAAY,CAAC,IAAI,CAAC,mBAAmB,CAAC,CAAC;QAElE,OAAO,KAAK,CAAC,GAAG,CAAC,CAAC,IAAI,EAAE,EAAE;;YACxB,MAAM,KAAK,GAAG,IAAA,kCAAwB,EAAC,KAAK,EAAE,IAAI,CAAC,MAAM,CAAC,IAAI,EAAE,IAAI,CAAC,KAAK,EAAE,SAAS,CAAC,CAAC;YAEvF,iDAAiD;YACjD,OAAO,IAAI,mBAAY,CACrB,IAAI,CAAC,MAAM,EACX,KAAK,EACL,CAAA,MAAA,IAAI,CAAC,GAAG,0CAAE,QAAQ,EAAE,KAAI,EAAE,EAC1B,IAAI,CAAC,MAAM,CAAC,MAAM,CAAC,MAAM,CAAC,SAAS,EACnC,IAAI,CAAC,iBAAiB,EACtB,IAAI,CACL,CAAC;QACJ,CAAC,CAAC,CAAC;IACL,CAAC;CACF;AA3CD,oEA2CC;AAED,MAAM,mBAAmB;IACvB,YAAoB,MAAgB,EAAU,UAAkB,EAAU,QAAgB;QAAtE,WAAM,GAAN,MAAM,CAAU;QAAU,eAAU,GAAV,UAAU,CAAQ;QAAU,aAAQ,GAAR,QAAQ,CAAQ;IAAG,CAAC;IAE9F,YAAY;QACV,OAAO,CAAC,CAAC;IACX,CAAC;IAED,cAAc;QACZ,OAAO,IAAA,6BAAmB,EAAC,IAAI,CAAC,MAAM,CAAC,MAAM,CAAC,MAAM,EAAE,IAAI,CAAC,UAAU,EAAE,IAAI,CAAC,QAAQ,EAAE,IAAI,CAAC,MAAM,CAAC,IAAI,CAAC,CAAC;IAC1G,CAAC;CACF"}
+{"version":3,"file":"protocol-link-provider.js","sourceRoot":"","sources":["../../../src/browser/links/protocol-link-provider.ts"],"names":[],"mappings":"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"}

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

@@ -1,5 +1,5 @@
-import type { Terminal } from 'xterm';
-import { URI } from '@opensumi/ide-core-common';
+import type { Terminal, IViewportRange } from 'xterm';
+import { IDisposable, URI } from '@opensumi/ide-core-common';
 import type { TerminalClient } from '../terminal.client';
 import { TerminalLink } from './link';
 import { XtermLinkMatcherHandler } from './link-manager';
@@ -20,8 +20,10 @@ export declare class TerminalValidatedLocalLinkProvider extends TerminalBaseLink
     private readonly _client;
     private readonly _activateFileCallback;
     private readonly _wrapLinkHandler;
+    private readonly _tooltipCallback;
     private readonly _validationCallback;
-    constructor(_xterm: Terminal, _client: TerminalClient, _activateFileCallback: (event: MouseEvent | undefined, link: string) => void, _wrapLinkHandler: (handler: (event: MouseEvent | undefined, link: string) => void) => XtermLinkMatcherHandler, _validationCallback: (link: string, callback: (result: {
+    private readonly injector;
+    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);

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

@@ -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,MAAM,OAAO,CAAC;AACnD,OAAO,EAAE,GAAG,EAAE,MAAM,2BAA2B,CAAC;AAEhD,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,qBAAa,kCAAmC,SAAQ,wBAAwB;IAE5E,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,mBAAmB;gBANnB,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,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;IAqGjE,SAAS,KAAK,eAAe,IAAI,MAAM,CAItC;CACF"}
+{"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

@@ -6,6 +6,8 @@
 // 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 platform_1 = require("@opensumi/ide-core-common/lib/platform");
 const link_1 = require("./link");
 const base_1 = require("./base");
@@ -57,13 +59,14 @@ exports.unixLineAndColumnMatchIndex = 11;
 // Each line and column clause have 6 groups (ie no. of expressions in round brackets)
 exports.lineAndColumnClauseGroupCount = 6;
 const MAX_LENGTH = 2000;
-class TerminalValidatedLocalLinkProvider extends base_1.TerminalBaseLinkProvider {
-    constructor(_xterm, _client, _activateFileCallback, _wrapLinkHandler, _validationCallback) {
+let TerminalValidatedLocalLinkProvider = class TerminalValidatedLocalLinkProvider extends base_1.TerminalBaseLinkProvider {
+    constructor(_xterm, _client, _activateFileCallback, _wrapLinkHandler, _tooltipCallback, _validationCallback) {
         super();
         this._xterm = _xterm;
         this._client = _client;
         this._activateFileCallback = _activateFileCallback;
         this._wrapLinkHandler = _wrapLinkHandler;
+        this._tooltipCallback = _tooltipCallback;
         this._validationCallback = _validationCallback;
     }
     async _provideLinks(y) {
@@ -130,7 +133,16 @@ class TerminalValidatedLocalLinkProvider extends base_1.TerminalBaseLinkProvider
                         const activateCallback = this._wrapLinkHandler((event, text) => {
                             this._activateFileCallback(event, text);
                         });
-                        r(new link_1.TerminalLink(this._xterm, bufferRange, link, this._xterm.buffer.active.viewportY, activateCallback, true));
+                        r(this.injector.get(link_1.TerminalLink, [
+                            this._xterm,
+                            bufferRange,
+                            link,
+                            this._xterm.buffer.active.viewportY,
+                            activateCallback,
+                            this._tooltipCallback,
+                            true,
+                            undefined,
+                        ]));
                     }
                     else {
                         r(undefined);
@@ -148,6 +160,14 @@ class TerminalValidatedLocalLinkProvider extends base_1.TerminalBaseLinkProvider
         // Append line and column number regex
         return new RegExp(`${baseLocalLinkClause}(${exports.lineAndColumnClause})`);
     }
-}
+};
+(0, tslib_1.__decorate)([
+    (0, di_1.Autowired)(di_1.INJECTOR_TOKEN),
+    (0, tslib_1.__metadata)("design:type", di_1.Injector)
+], TerminalValidatedLocalLinkProvider.prototype, "injector", void 0);
+TerminalValidatedLocalLinkProvider = (0, tslib_1.__decorate)([
+    (0, di_1.Injectable)({ multiple: true }),
+    (0, tslib_1.__metadata)("design:paramtypes", [Function, Function, Function, Function, Function, Function])
+], TerminalValidatedLocalLinkProvider);
 exports.TerminalValidatedLocalLinkProvider = TerminalValidatedLocalLinkProvider;
 //# sourceMappingURL=validated-local-link-provider.js.map

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

@@ -1 +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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"}
+{"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;AAE/E,qEAAyE;AAEzE,iCAAsC;AAEtC,iCAAkD;AAClD,uCAA0E;AAE1E,MAAM,UAAU,GAAG,eAAe,CAAC;AACnC,MAAM,mBAAmB,GAAG,KAAK,CAAC;AAClC,yEAAyE;AACzE,qEAAqE;AACrE,MAAM,4BAA4B,GAAG,iCAAiC,CAAC;AACvE,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,wCAAwC,CAAC;AACjF,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,2CAA2C;IAC3C,8BAA8B;IAC9B,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;IAI9E,YACmB,MAAgB,EAChB,OAAuB,EACvB,qBAA4E,EAC5E,gBAEW,EACX,gBAKD,EACC,mBAGR;QAET,KAAK,EAAE,CAAC;QAjBS,WAAM,GAAN,MAAM,CAAU;QAChB,YAAO,GAAP,OAAO,CAAgB;QACvB,0BAAqB,GAArB,qBAAqB,CAAuD;QAC5E,qBAAgB,GAAhB,gBAAgB,CAEL;QACX,qBAAgB,GAAhB,gBAAgB,CAKjB;QACC,wBAAmB,GAAnB,mBAAmB,CAG3B;IAGX,CAAC;IAES,KAAK,CAAC,aAAa,CAAC,CAAS;;QACrC,MAAM,MAAM,GAAmB,EAAE,CAAC;QAClC,IAAI,SAAS,GAAG,CAAC,GAAG,CAAC,CAAC;QACtB,IAAI,OAAO,GAAG,SAAS,CAAC;QAExB,MAAM,KAAK,GAAkB,CAAC,IAAI,CAAC,MAAM,CAAC,MAAM,CAAC,MAAM,CAAC,OAAO,CAAC,SAAS,CAAE,CAAC,CAAC;QAE7E,OAAO,SAAS,IAAI,CAAC,KAAI,MAAA,IAAI,CAAC,MAAM,CAAC,MAAM,CAAC,MAAM,CAAC,OAAO,CAAC,SAAS,CAAC,0CAAE,SAAS,CAAA,EAAE;YAChF,KAAK,CAAC,OAAO,CAAC,IAAI,CAAC,MAAM,CAAC,MAAM,CAAC,MAAM,CAAC,OAAO,CAAC,SAAS,GAAG,CAAC,CAAE,CAAC,CAAC;YACjE,SAAS,EAAE,CAAC;SACb;QAED,OAAO,OAAO,GAAG,IAAI,CAAC,MAAM,CAAC,MAAM,CAAC,MAAM,CAAC,MAAM,KAAI,MAAA,IAAI,CAAC,MAAM,CAAC,MAAM,CAAC,MAAM,CAAC,OAAO,CAAC,OAAO,GAAG,CAAC,CAAC,0CAAE,SAAS,CAAA,EAAE;YAC9G,KAAK,CAAC,IAAI,CAAC,IAAI,CAAC,MAAM,CAAC,MAAM,CAAC,MAAM,CAAC,OAAO,CAAC,OAAO,GAAG,CAAC,CAAE,CAAC,CAAC;YAC5D,OAAO,EAAE,CAAC;SACX;QAED,MAAM,IAAI,GAAG,IAAA,6BAAmB,EAAC,IAAI,CAAC,MAAM,CAAC,MAAM,CAAC,MAAM,EAAE,SAAS,EAAE,OAAO,EAAE,IAAI,CAAC,MAAM,CAAC,IAAI,CAAC,CAAC;QAClG,IAAI,IAAI,CAAC,MAAM,GAAG,UAAU,EAAE;YAC5B,OAAO,EAAE,CAAC;SACX;QAED,4CAA4C;QAC5C,MAAM,GAAG,GAAG,IAAI,MAAM,CAAC,IAAI,CAAC,eAAe,EAAE,GAAG,CAAC,CAAC;QAClD,IAAI,KAAK,CAAC;QACV,IAAI,WAAW,GAAG,CAAC,CAAC,CAAC;QACrB,OAAO,CAAC,KAAK,GAAG,GAAG,CAAC,IAAI,CAAC,IAAI,CAAC,CAAC,KAAK,IAAI,EAAE;YACxC,uFAAuF;YACvF,IAAI,IAAI,GAAG,KAAK,CAAC,CAAC,CAAC,CAAC;YACpB,IAAI,CAAC,IAAI,EAAE;gBACT,kEAAkE;gBAClE,6EAA6E;gBAC7E,0FAA0F;gBAC1F,MAAM;aACP;YAED,6EAA6E;YAC7E,+EAA+E;YAC/E,mCAAmC;YACnC,qEAAqE;YACrE,WAAW,GAAG,IAAI,CAAC,OAAO,CAAC,IAAI,EAAE,WAAW,GAAG,CAAC,CAAC,CAAC;YAClD,GAAG,CAAC,SAAS,GAAG,WAAW,GAAG,IAAI,CAAC,MAAM,CAAC;YAC1C,IAAI,WAAW,GAAG,CAAC,EAAE;gBACnB,iDAAiD;gBACjD,MAAM;aACP;YAED,yEAAyE;YACzE;YACE,gBAAgB;YAChB,gBAAgB;YAChB,CAAC,CAAC,IAAI,CAAC,UAAU,CAAC,QAAQ,CAAC,IAAI,IAAI,CAAC,UAAU,CAAC,QAAQ,CAAC,CAAC,IAAI,WAAW,KAAK,CAAC,CAAC;gBAC/E,iCAAiC;gBACjC,CAAC,IAAI,CAAC,UAAU,CAAC,YAAY,CAAC,IAAI,CAAC,IAAI,CAAC,UAAU,CAAC,IAAI,CAAC,IAAI,IAAI,CAAC,UAAU,CAAC,IAAI,CAAC,CAAC,CAAC,EACnF;gBACA,IAAI,GAAG,IAAI,CAAC,SAAS,CAAC,CAAC,CAAC,CAAC;gBACzB,WAAW,IAAI,CAAC,CAAC;aAClB;YAED,mEAAmE;YACnE,MAAM,WAAW,GAAG,IAAA,kCAAwB,EAC1C,KAAK,EACL,IAAI,CAAC,MAAM,CAAC,IAAI,EAChB;gBACE,WAAW,EAAE,WAAW,GAAG,CAAC;gBAC5B,eAAe,EAAE,CAAC;gBAClB,SAAS,EAAE,WAAW,GAAG,IAAI,CAAC,MAAM,GAAG,CAAC;gBACxC,aAAa,EAAE,CAAC;aACjB,EACD,SAAS,CACV,CAAC;YAEF,MAAM,aAAa,GAAG,MAAM,IAAI,OAAO,CAA2B,CAAC,CAAC,EAAE,EAAE;gBACtE,IAAI,CAAC,mBAAmB,CAAC,IAAI,EAAE,CAAC,MAAM,EAAE,EAAE;oBACxC,IAAI,MAAM,IAAI,CAAC,MAAM,CAAC,WAAW,EAAE;wBACjC,MAAM,gBAAgB,GAAG,IAAI,CAAC,gBAAgB,CAAC,CAAC,KAA6B,EAAE,IAAY,EAAE,EAAE;4BAC7F,IAAI,CAAC,qBAAqB,CAAC,KAAK,EAAE,IAAI,CAAC,CAAC;wBAC1C,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,SAAS;yBACV,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;CACF,CAAA;AAnIC;IADC,IAAA,cAAS,EAAC,mBAAc,CAAC;2CACC,aAAQ;oEAAC;AAFzB,kCAAkC;IAD9C,IAAA,eAAU,EAAC,EAAE,QAAQ,EAAE,IAAI,EAAE,CAAC;;GAClB,kCAAkC,CAqI9C;AArIY,gFAAkC"}

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

@@ -21,7 +21,7 @@ export declare class FilePathAddon extends Disposable implements ITerminalAddon
     activate(terminal: Terminal): void;
 }
 export declare class AttachAddon extends Disposable implements ITerminalAddon {
-    private _connection;
+    connection: ITerminalConnection | undefined;
     private _disposeConnection;
     private _terminal;
     private _onData;

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

@@ -1 +1 @@
-{"version":3,"file":"terminal.addon.d.ts","sourceRoot":"","sources":["../../src/browser/terminal.addon.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,QAAQ,EAAE,mBAAmB,EAAE,cAAc,EAAE,MAAM,OAAO,CAAC;AACtE,OAAO,EAAE,kBAAkB,EAAY,MAAM,uCAAuC,CAAC;AACrF,OAAO,EAAO,UAAU,EAAW,KAAK,EAAE,MAAM,2BAA2B,CAAC;AAC5E,OAAO,EAAE,sBAAsB,EAAE,MAAM,iCAAiC,CAAC;AACzE,OAAO,EAAE,4BAA4B,EAAE,MAAM,kBAAkB,CAAC;AAChE,OAAO,EAAE,mBAAmB,EAAE,MAAM,WAAW,CAAC;AAiBhD,eAAO,MAAM,MAAM,QAA6D,CAAC;AAEjF,qBAAa,aAAc,SAAQ,UAAW,YAAW,cAAc;IAKnE,OAAO,CAAC,UAAU;IAClB,OAAO,CAAC,YAAY;IACpB,OAAO,CAAC,cAAc;IACtB,OAAO,CAAC,gBAAgB;IACxB,OAAO,CAAC,QAAQ;IARlB,OAAO,CAAC,cAAc,CAAqB;IAC3C,OAAO,CAAC,SAAS,CAAuB;gBAG9B,UAAU,EAAE,MAAM,EAClB,YAAY,EAAE,kBAAkB,EAChC,cAAc,EAAE,sBAAsB,EACtC,gBAAgB,EAAE,4BAA4B,EAC9C,QAAQ,GAAE,mBAAwB;IAM5C,OAAO,CAAC,gBAAgB;YAYV,oBAAoB;YAapB,SAAS;YAkBT,SAAS;IA0BvB,QAAQ,CAAC,QAAQ,EAAE,QAAQ,GAAG,IAAI;CAYnC;AAED,qBAAa,WAAY,SAAQ,UAAW,YAAW,cAAc;IACnE,OAAO,CAAC,WAAW,CAAkC;IACrD,OAAO,CAAC,kBAAkB,CAAoB;IAC9C,OAAO,CAAC,SAAS,CAAW;IAE5B,OAAO,CAAC,OAAO,CAAuC;IACtD,MAAM,EAAE,KAAK,CAAC,MAAM,GAAG,WAAW,CAAC,CAAsB;IACzD,OAAO,CAAC,OAAO,CAAqC;IACpD,MAAM,EAAE,KAAK,CAAC,MAAM,GAAG,SAAS,CAAC,CAAsB;IACvD,OAAO,CAAC,OAAO,CAAyB;IACxC,MAAM,EAAE,KAAK,CAAC,MAAM,CAAC,CAAsB;IAE3C,OAAO,CAAC,cAAc,CAAK;IAEpB,aAAa,CAAC,UAAU,EAAE,mBAAmB,GAAG,SAAS;IA4BnD,QAAQ,CAAC,QAAQ,EAAE,QAAQ,GAAG,OAAO,CAAC,IAAI,CAAC;IAOxD,OAAO,CAAC,SAAS;IAQjB,OAAO,CAAC,WAAW;IAYnB,OAAO,CAAC,aAAa;CAGtB;AAED,eAAO,MAAM,WAAW,KAAK,CAAC;AAC9B,eAAO,MAAM,WAAW,KAAK,CAAC"}
+{"version":3,"file":"terminal.addon.d.ts","sourceRoot":"","sources":["../../src/browser/terminal.addon.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,QAAQ,EAAE,mBAAmB,EAAE,cAAc,EAAE,MAAM,OAAO,CAAC;AACtE,OAAO,EAAE,kBAAkB,EAAY,MAAM,uCAAuC,CAAC;AACrF,OAAO,EAAO,UAAU,EAAW,KAAK,EAAE,MAAM,2BAA2B,CAAC;AAC5E,OAAO,EAAE,sBAAsB,EAAE,MAAM,iCAAiC,CAAC;AACzE,OAAO,EAAE,4BAA4B,EAAE,MAAM,kBAAkB,CAAC;AAChE,OAAO,EAAE,mBAAmB,EAAE,MAAM,WAAW,CAAC;AAiBhD,eAAO,MAAM,MAAM,QAA6D,CAAC;AAEjF,qBAAa,aAAc,SAAQ,UAAW,YAAW,cAAc;IAKnE,OAAO,CAAC,UAAU;IAClB,OAAO,CAAC,YAAY;IACpB,OAAO,CAAC,cAAc;IACtB,OAAO,CAAC,gBAAgB;IACxB,OAAO,CAAC,QAAQ;IARlB,OAAO,CAAC,cAAc,CAAqB;IAC3C,OAAO,CAAC,SAAS,CAAuB;gBAG9B,UAAU,EAAE,MAAM,EAClB,YAAY,EAAE,kBAAkB,EAChC,cAAc,EAAE,sBAAsB,EACtC,gBAAgB,EAAE,4BAA4B,EAC9C,QAAQ,GAAE,mBAAwB;IAM5C,OAAO,CAAC,gBAAgB;YAYV,oBAAoB;YAapB,SAAS;YAkBT,SAAS;IA0BvB,QAAQ,CAAC,QAAQ,EAAE,QAAQ,GAAG,IAAI;CAYnC;AAED,qBAAa,WAAY,SAAQ,UAAW,YAAW,cAAc;IACnE,UAAU,EAAE,mBAAmB,GAAG,SAAS,CAAC;IAC5C,OAAO,CAAC,kBAAkB,CAAoB;IAC9C,OAAO,CAAC,SAAS,CAAW;IAE5B,OAAO,CAAC,OAAO,CAAuC;IACtD,MAAM,8BAAsB;IAE5B,OAAO,CAAC,OAAO,CAAqC;IACpD,MAAM,4BAAsB;IAE5B,OAAO,CAAC,OAAO,CAAyB;IACxC,MAAM,gBAAsB;IAE5B,OAAO,CAAC,cAAc,CAAK;IAEpB,aAAa,CAAC,UAAU,EAAE,mBAAmB,GAAG,SAAS;IA4BnD,QAAQ,CAAC,QAAQ,EAAE,QAAQ,GAAG,OAAO,CAAC,IAAI,CAAC;IAOxD,OAAO,CAAC,SAAS;IAQjB,OAAO,CAAC,WAAW;IAYnB,OAAO,CAAC,aAAa;CAGtB;AAED,eAAO,MAAM,WAAW,KAAK,CAAC;AAC9B,eAAO,MAAM,WAAW,KAAK,CAAC"}

package/lib/browser/terminal.addon.js

@@ -118,7 +118,7 @@ class AttachAddon extends ide_core_common_1.Disposable {
             this._disposeConnection.dispose();
             this._disposeConnection = null;
         }
-        this._connection = connection;
+        this.connection = connection;
         if (connection) {
             this._disposeConnection = new ide_core_common_1.Disposable(connection.onData((data) => {
                 this._terminal.write(typeof data === 'string' ? data : new Uint8Array(data));
@@ -143,14 +143,14 @@ class AttachAddon extends ide_core_common_1.Disposable {
         this.addDispose(terminal.onBinary((data) => this._sendBinary(data)));
     }
     _sendData(data) {
-        if (!this._connection || this._connection.readonly) {
+        if (!this.connection || this.connection.readonly) {
             return;
         }
         this._timeResponse();
-        this._connection.sendData(data);
+        this.connection.sendData(data);
     }
     _sendBinary(data) {
-        if (!this._connection || this._connection.readonly) {
+        if (!this.connection || this.connection.readonly) {
             return;
         }
         const buffer = new Uint8Array(data.length);
@@ -158,7 +158,7 @@ class AttachAddon extends ide_core_common_1.Disposable {
             buffer[i] = data.charCodeAt(i) & 255;
         }
         this._timeResponse();
-        this._connection.sendData(buffer);
+        this.connection.sendData(buffer);
     }
     _timeResponse() {
         this._lastInputTime = Date.now();

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

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

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

@@ -11,6 +11,7 @@ import { TerminalOptions, ITerminalController, ITerminalClient, ITerminalTheme,
 import { ITerminalPreference } from '../common/preference';
 import { CorePreferences, QuickPickService } from '@opensumi/ide-core-browser';
 import { IEnvironmentVariableService } from '../common/environmentVariable';
+import { IMessageService } from '@opensumi/ide-overlay';
 export declare class TerminalClient extends Disposable implements ITerminalClient {
     static WORKSPACE_PATH_CACHED: Map<string, string>;
     /** properties */
@@ -38,10 +39,11 @@ export declare class TerminalClient extends Disposable implements ITerminalClien
     private _os;
     /** end */
     protected readonly injector: Injector;
-    protected readonly service: ITerminalInternalService;
+    protected readonly internalService: ITerminalInternalService;
     protected readonly workspace: IWorkspaceService;
     protected readonly editorService: WorkbenchEditorService;
     protected readonly fileService: IFileServiceClient;
+    protected readonly messageService: IMessageService;
     protected readonly theme: ITerminalTheme;
     protected readonly corePreferences: CorePreferences;
     protected readonly controller: ITerminalController;

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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"}

package/lib/browser/terminal.client.js

@@ -21,6 +21,7 @@ const preference_1 = require("../common/preference");
 const ide_core_browser_1 = require("@opensumi/ide-core-browser");
 const link_manager_1 = require("./links/link-manager");
 const environmentVariable_1 = require("../common/environmentVariable");
+const ide_overlay_1 = require("@opensumi/ide-overlay");
 const terminal_module_less_1 = (0, tslib_1.__importDefault)(require("./component/terminal.module.less"));
 let TerminalClient = TerminalClient_1 = class TerminalClient extends ide_core_common_1.Disposable {
     constructor() {
@@ -51,7 +52,7 @@ let TerminalClient = TerminalClient_1 = class TerminalClient extends ide_core_co
         this._container = document.createElement('div');
         this._container.className = terminal_module_less_1.default.terminalInstance;
         this._prepare();
-        this._term = new xterm_1.Terminal(Object.assign(Object.assign({ theme: this.theme.terminalTheme }, this.preference.toJSON()), this.service.getOptions()));
+        this._term = new xterm_1.Terminal(Object.assign(Object.assign({ theme: this.theme.terminalTheme }, this.preference.toJSON()), this.internalService.getOptions()));
         if (options.message) {
             this._term.writeln(options.message);
         }
@@ -99,6 +100,9 @@ let TerminalClient = TerminalClient_1 = class TerminalClient extends ide_core_co
                 this._layout();
             }
         }));
+        this.addDispose(this.internalService.onError((error) => {
+            this.messageService.error(error.message);
+        }));
         this._apply(widget);
         if (await this._checkWorkspace()) {
             this._attachXterm();
@@ -109,7 +113,7 @@ let TerminalClient = TerminalClient_1 = class TerminalClient extends ide_core_co
         return this._term;
     }
     get pid() {
-        return this.service.getProcessId(this.id);
+        return this.internalService.getProcessId(this.id);
     }
     get options() {
         return this._options;
@@ -153,6 +157,11 @@ let TerminalClient = TerminalClient_1 = class TerminalClient extends ide_core_co
                 this._onOutput.fire({ id: this.id, data });
             }),
             this._attachAddon.onExit((code) => {
+                var _a, _b;
+                this.logger.warn(`${this.id} ${this.name} exit with ${code}`);
+                if (code !== 0) {
+                    this.messageService.error(`terminal ${this.name}(${(_b = (_a = this._attachAddon.connection) === null || _a === void 0 ? void 0 : _a.ptyInstance) === null || _b === void 0 ? void 0 : _b.shellPath}) exited with non-zero code ${code}`);
+                }
                 this._onExit.fire({ id: this.id, code });
             }),
             this._attachAddon.onTime((delta) => {
@@ -188,27 +197,23 @@ let TerminalClient = TerminalClient_1 = class TerminalClient extends ide_core_co
         this._onLinksReady.fire(this);
     }
     async _doAttach() {
+        var _a;
         const sessionId = this.id;
         const type = this.preference.get('type');
-        const linuxShellArgs = this.corePreferences.get('terminal.integrated.shellArgs.linux');
-        const extraShellArgs = [];
-        if (this._os === platform_1.OperatingSystem.Windows && type === 'git-bash') {
-            extraShellArgs.push('--login');
-        }
-        const ptyOptions = Object.assign(Object.assign({ cwd: this._workspacePath }, this._options), { shellArgs: [...(this._options.shellArgs || []), ...(linuxShellArgs || []), ...extraShellArgs] });
         const { rows = terminal_addon_1.DEFAULT_ROW, cols = terminal_addon_1.DEFAULT_COL } = this._term;
         let connection;
+        const finalOptions = Object.assign(Object.assign({}, this._options), { cwd: ((_a = this._options) === null || _a === void 0 ? void 0 : _a.cwd) || this._workspacePath });
         try {
-            connection = await this.service.attach(sessionId, this._term, rows, cols, ptyOptions, type);
+            connection = await this.internalService.attach(sessionId, this._term, rows, cols, finalOptions, type);
         }
-        catch (_a) {
-            // noop
+        catch (e) {
+            this.logger.error(`attach ${sessionId} terminal failed, type: ${type}`, JSON.stringify(finalOptions), e);
         }
-        this._attachAddon.setConnection(connection);
         if (!connection) {
             this._attached.resolve();
             return;
         }
+        this._attachAddon.setConnection(connection);
         this.name = this.name || connection.name || 'shell';
         this._ready = true;
         this._attached.resolve();
@@ -218,7 +223,7 @@ let TerminalClient = TerminalClient_1 = class TerminalClient extends ide_core_co
         });
     }
     _doResize() {
-        this.service.resize(this.id, this._term.cols, this._term.rows);
+        this.internalService.resize(this.id, this._term.cols, this._term.rows);
     }
     _prepare() {
         var _a, _b, _c, _d, _e;
@@ -241,11 +246,11 @@ let TerminalClient = TerminalClient_1 = class TerminalClient extends ide_core_co
     }
     _attachAfterRender() {
         // 等待 widget 渲染后再 attach，尽可能在创建时获取到准确的宽高
-        // rAF 在不可见状态下会丢失，所以一定要用 setTimeout
-        setTimeout(() => {
+        // requestAnimationFrame 在不可见状态下会丢失，所以一定要用 queueMicrotask
+        queueMicrotask(() => {
             var _a;
             this._layout();
-            this.service.getOs().then((os) => {
+            this.internalService.getOs().then((os) => {
                 this._os = os;
             });
             this.attach();
@@ -308,7 +313,7 @@ let TerminalClient = TerminalClient_1 = class TerminalClient extends ide_core_co
     }
     _checkReady() {
         if (!this._ready) {
-            throw new Error('client not ready');
+            throw new Error('terminal client not ready');
         }
     }
     _layout() {
@@ -394,7 +399,7 @@ let TerminalClient = TerminalClient_1 = class TerminalClient extends ide_core_co
         this._widget.name = options.name || this.name;
     }
     async sendText(message) {
-        await this.service.sendText(this.id, message);
+        await this.internalService.sendText(this.id, message);
         this._onInput.fire({ id: this.id, data: message });
     }
     registerLinkProvider(provider) {
@@ -407,7 +412,7 @@ let TerminalClient = TerminalClient_1 = class TerminalClient extends ide_core_co
         this._container.remove();
         super.dispose();
         if (clear) {
-            this.service.disposeById(this.id);
+            this.internalService.disposeById(this.id);
         }
     }
 };
@@ -419,7 +424,7 @@ TerminalClient.WORKSPACE_PATH_CACHED = new Map();
 (0, tslib_1.__decorate)([
     (0, di_1.Autowired)(common_5.ITerminalInternalService),
     (0, tslib_1.__metadata)("design:type", Object)
-], TerminalClient.prototype, "service", void 0);
+], TerminalClient.prototype, "internalService", void 0);
 (0, tslib_1.__decorate)([
     (0, di_1.Autowired)(common_4.IWorkspaceService),
     (0, tslib_1.__metadata)("design:type", Object)
@@ -432,6 +437,10 @@ TerminalClient.WORKSPACE_PATH_CACHED = new Map();
     (0, di_1.Autowired)(common_2.IFileServiceClient),
     (0, tslib_1.__metadata)("design:type", Object)
 ], TerminalClient.prototype, "fileService", void 0);
+(0, tslib_1.__decorate)([
+    (0, di_1.Autowired)(ide_overlay_1.IMessageService),
+    (0, tslib_1.__metadata)("design:type", Object)
+], TerminalClient.prototype, "messageService", void 0);
 (0, tslib_1.__decorate)([
     (0, di_1.Autowired)(common_5.ITerminalTheme),
     (0, tslib_1.__metadata)("design:type", Object)