@opensumi/ide-terminal-next 2.17.3-next-1652155566.0 → 2.17.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.
- package/lib/browser/component/resize.delegate.d.ts +1 -0
- package/lib/browser/component/resize.delegate.d.ts.map +1 -1
- package/lib/browser/component/tab.item.d.ts +4 -3
- package/lib/browser/component/tab.item.d.ts.map +1 -1
- package/lib/browser/component/tab.item.js +7 -8
- package/lib/browser/component/tab.item.js.map +1 -1
- package/lib/browser/component/terminal.variable.d.ts +1 -0
- package/lib/browser/component/terminal.variable.d.ts.map +1 -1
- package/lib/browser/component/terminal.view.d.ts.map +1 -1
- package/lib/browser/component/terminal.view.js +24 -25
- package/lib/browser/component/terminal.view.js.map +1 -1
- package/lib/browser/component/terminal.widget.d.ts +1 -0
- package/lib/browser/component/terminal.widget.d.ts.map +1 -1
- package/lib/browser/links/link-manager.d.ts.map +1 -1
- package/lib/browser/links/link-manager.js +11 -10
- package/lib/browser/links/link-manager.js.map +1 -1
- package/lib/browser/links/validated-local-link-provider.d.ts.map +1 -1
- package/lib/browser/links/validated-local-link-provider.js +2 -1
- package/lib/browser/links/validated-local-link-provider.js.map +1 -1
- package/lib/browser/terminal.client.d.ts +2 -4
- package/lib/browser/terminal.client.d.ts.map +1 -1
- package/lib/browser/terminal.client.js +5 -8
- package/lib/browser/terminal.client.js.map +1 -1
- package/lib/browser/terminal.controller.d.ts +1 -6
- package/lib/browser/terminal.controller.d.ts.map +1 -1
- package/lib/browser/terminal.controller.js +12 -55
- package/lib/browser/terminal.controller.js.map +1 -1
- package/lib/browser/terminal.input.js +2 -2
- package/lib/browser/terminal.input.js.map +1 -1
- package/lib/browser/terminal.internal.service.d.ts +6 -6
- package/lib/browser/terminal.internal.service.d.ts.map +1 -1
- package/lib/browser/terminal.internal.service.js +23 -4
- package/lib/browser/terminal.internal.service.js.map +1 -1
- package/lib/browser/terminal.profile.d.ts.map +1 -1
- package/lib/browser/terminal.profile.internal.d.ts.map +1 -1
- package/lib/browser/terminal.profile.internal.js +6 -4
- package/lib/browser/terminal.profile.internal.js.map +1 -1
- package/lib/browser/terminal.profile.js +2 -3
- package/lib/browser/terminal.profile.js.map +1 -1
- package/lib/browser/terminal.render.d.ts +3 -3
- package/lib/browser/terminal.render.d.ts.map +1 -1
- package/lib/browser/terminal.restore.d.ts.map +1 -1
- package/lib/browser/terminal.restore.js +1 -3
- package/lib/browser/terminal.restore.js.map +1 -1
- package/lib/browser/terminal.search.d.ts.map +1 -1
- package/lib/browser/terminal.search.js +0 -6
- package/lib/browser/terminal.search.js.map +1 -1
- package/lib/browser/terminal.service.d.ts +17 -5
- package/lib/browser/terminal.service.d.ts.map +1 -1
- package/lib/browser/terminal.service.js +77 -4
- package/lib/browser/terminal.service.js.map +1 -1
- package/lib/browser/terminal.view.js +3 -3
- package/lib/browser/terminal.view.js.map +1 -1
- package/lib/browser/xterm.d.ts +1 -2
- package/lib/browser/xterm.d.ts.map +1 -1
- package/lib/browser/xterm.js.map +1 -1
- package/lib/common/client.d.ts +0 -8
- package/lib/common/client.d.ts.map +1 -1
- package/lib/common/client.js.map +1 -1
- package/lib/common/controller.d.ts +3 -12
- package/lib/common/controller.d.ts.map +1 -1
- package/lib/common/controller.js.map +1 -1
- package/lib/common/environmentVariable.d.ts +3 -2
- package/lib/common/environmentVariable.d.ts.map +1 -1
- package/lib/common/environmentVariable.js.map +1 -1
- package/lib/common/environmentVariableCollection.d.ts +3 -2
- package/lib/common/environmentVariableCollection.d.ts.map +1 -1
- package/lib/common/environmentVariableCollection.js +2 -2
- package/lib/common/environmentVariableCollection.js.map +1 -1
- package/lib/common/profile.d.ts +2 -1
- package/lib/common/profile.d.ts.map +1 -1
- package/lib/common/profile.js.map +1 -1
- package/lib/common/pty.d.ts +10 -81
- package/lib/common/pty.d.ts.map +1 -1
- package/lib/common/pty.js +1 -4
- package/lib/common/pty.js.map +1 -1
- package/lib/common/render.d.ts +2 -2
- package/lib/common/render.d.ts.map +1 -1
- package/lib/common/service.d.ts +11 -8
- package/lib/common/service.d.ts.map +1 -1
- package/lib/common/service.js.map +1 -1
- package/lib/node/index.d.ts.map +1 -1
- package/lib/node/index.js +0 -5
- package/lib/node/index.js.map +1 -1
- package/lib/node/pty.d.ts +4 -8
- package/lib/node/pty.d.ts.map +1 -1
- package/lib/node/pty.js +10 -13
- package/lib/node/pty.js.map +1 -1
- package/lib/node/shell.d.ts +1 -1
- package/lib/node/shell.d.ts.map +1 -1
- package/lib/node/shell.js +15 -14
- package/lib/node/shell.js.map +1 -1
- package/lib/node/terminal.profile.service.d.ts.map +1 -1
- package/lib/node/terminal.profile.service.js +6 -4
- package/lib/node/terminal.profile.service.js.map +1 -1
- package/lib/node/terminal.service.client.d.ts +8 -3
- package/lib/node/terminal.service.client.d.ts.map +1 -1
- package/lib/node/terminal.service.client.js +39 -8
- package/lib/node/terminal.service.client.js.map +1 -1
- package/lib/node/terminal.service.d.ts +2 -3
- package/lib/node/terminal.service.d.ts.map +1 -1
- package/lib/node/terminal.service.js +9 -28
- package/lib/node/terminal.service.js.map +1 -1
- package/package.json +16 -16
- package/lib/common/xterm.d.ts +0 -16
- package/lib/common/xterm.d.ts.map +0 -1
- package/lib/common/xterm.js +0 -3
- package/lib/common/xterm.js.map +0 -1
- package/lib/node/pty.manager.d.ts +0 -52
- package/lib/node/pty.manager.d.ts.map +0 -1
- package/lib/node/pty.manager.js +0 -133
- package/lib/node/pty.manager.js.map +0 -1
- package/lib/node/pty.manager.remote.d.ts +0 -9
- package/lib/node/pty.manager.remote.d.ts.map +0 -1
- package/lib/node/pty.manager.remote.js +0 -55
- package/lib/node/pty.manager.remote.js.map +0 -1
- package/lib/node/pty.proxy.d.ts +0 -45
- package/lib/node/pty.proxy.d.ts.map +0 -1
- package/lib/node/pty.proxy.js +0 -250
- package/lib/node/pty.proxy.js.map +0 -1
- package/lib/node/pty.proxy.remote.exec.d.ts +0 -2
- package/lib/node/pty.proxy.remote.exec.d.ts.map +0 -1
- package/lib/node/pty.proxy.remote.exec.js +0 -7
- package/lib/node/pty.proxy.remote.exec.js.map +0 -1
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"resize.delegate.d.ts","sourceRoot":"","sources":["../../../src/browser/component/resize.delegate.tsx"],"names":[],"mappings":"AAEA,OAAO,EAAE,OAAO,EAAE,MAAM,qBAAqB,CAAC;AAI9C,MAAM,WAAW,oBAAoB;IACnC,KAAK,EAAE,MAAM,IAAI,CAAC;IAClB,IAAI,EAAE,MAAM,IAAI,CAAC;IACjB,IAAI,EAAE,OAAO,GAAG,IAAI,CAAC;IACrB,IAAI,EAAE,OAAO,CAAC;IACd,KAAK,EAAE,OAAO,GAAG,IAAI,CAAC;IACtB,IAAI,EAAE,OAAO,CAAC;IACd,UAAU,EAAE,MAAM,CAAC;CACpB;gCAMsB,oBAAoB;AAA3C,wBA6CE"}
|
|
1
|
+
{"version":3,"file":"resize.delegate.d.ts","sourceRoot":"","sources":["../../../src/browser/component/resize.delegate.tsx"],"names":[],"mappings":";AAEA,OAAO,EAAE,OAAO,EAAE,MAAM,qBAAqB,CAAC;AAI9C,MAAM,WAAW,oBAAoB;IACnC,KAAK,EAAE,MAAM,IAAI,CAAC;IAClB,IAAI,EAAE,MAAM,IAAI,CAAC;IACjB,IAAI,EAAE,OAAO,GAAG,IAAI,CAAC;IACrB,IAAI,EAAE,OAAO,CAAC;IACd,KAAK,EAAE,OAAO,GAAG,IAAI,CAAC;IACtB,IAAI,EAAE,OAAO,CAAC;IACd,UAAU,EAAE,MAAM,CAAC;CACpB;gCAMsB,oBAAoB;AAA3C,wBA6CE"}
|
|
@@ -1,6 +1,7 @@
|
|
|
1
|
+
import React from 'react';
|
|
1
2
|
import { ItemProps } from '../../common';
|
|
2
|
-
export declare
|
|
3
|
-
export declare
|
|
4
|
-
declare const _default: (props: ItemProps) =>
|
|
3
|
+
export declare const renderInfoItem: React.FunctionComponent<ItemProps>;
|
|
4
|
+
export declare const renderAddItem: React.FunctionComponent<ItemProps>;
|
|
5
|
+
declare const _default: (props: ItemProps) => React.FunctionComponentElement<ItemProps> | null;
|
|
5
6
|
export default _default;
|
|
6
7
|
//# sourceMappingURL=tab.item.d.ts.map
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"tab.item.d.ts","sourceRoot":"","sources":["../../../src/browser/component/tab.item.tsx"],"names":[],"mappings":"
|
|
1
|
+
{"version":3,"file":"tab.item.d.ts","sourceRoot":"","sources":["../../../src/browser/component/tab.item.tsx"],"names":[],"mappings":"AAGA,OAAO,KAAK,MAAM,OAAO,CAAC;AAM1B,OAAO,EAAE,SAAS,EAAY,MAAM,cAAc,CAAC;AAInD,eAAO,MAAM,cAAc,oCAkEzB,CAAC;AAEH,eAAO,MAAM,aAAa,oCAYxB,CAAC;gCAEoB,SAAS;AAAhC,wBAUE"}
|
|
@@ -4,13 +4,14 @@ exports.renderAddItem = exports.renderInfoItem = void 0;
|
|
|
4
4
|
const tslib_1 = require("tslib");
|
|
5
5
|
const classnames_1 = tslib_1.__importDefault(require("classnames"));
|
|
6
6
|
const debounce_1 = tslib_1.__importDefault(require("lodash/debounce"));
|
|
7
|
+
const mobx_react_lite_1 = require("mobx-react-lite");
|
|
7
8
|
const react_1 = tslib_1.__importDefault(require("react"));
|
|
8
9
|
const icon_1 = require("@opensumi/ide-components/lib/icon/icon");
|
|
9
10
|
const ide_core_browser_1 = require("@opensumi/ide-core-browser");
|
|
10
11
|
const loading_1 = require("@opensumi/ide-core-browser/lib/components/loading");
|
|
11
12
|
const common_1 = require("../../common");
|
|
12
13
|
const tab_module_less_1 = tslib_1.__importDefault(require("./tab.module.less"));
|
|
13
|
-
|
|
14
|
+
exports.renderInfoItem = (0, mobx_react_lite_1.observer)((props) => {
|
|
14
15
|
var _a;
|
|
15
16
|
const handleSelect = (0, debounce_1.default)(() => props.onClick && props.onClick(), 20);
|
|
16
17
|
const handleClose = (0, debounce_1.default)(() => props.onClose && props.onClose(), 20);
|
|
@@ -38,23 +39,21 @@ function renderInfoItem(props) {
|
|
|
38
39
|
event.stopPropagation();
|
|
39
40
|
handleClose();
|
|
40
41
|
} }))));
|
|
41
|
-
}
|
|
42
|
-
exports.
|
|
43
|
-
function renderAddItem(props) {
|
|
42
|
+
});
|
|
43
|
+
exports.renderAddItem = (0, mobx_react_lite_1.observer)((props) => {
|
|
44
44
|
const handleAdd = (0, debounce_1.default)(() => props.onClick && props.onClick(), 20);
|
|
45
45
|
return (react_1.default.createElement("div", { className: (0, classnames_1.default)({
|
|
46
46
|
[(0, ide_core_browser_1.getIcon)('plus')]: true,
|
|
47
47
|
[tab_module_less_1.default.item_add]: true,
|
|
48
48
|
}), onClick: () => handleAdd() }));
|
|
49
|
-
}
|
|
50
|
-
exports.renderAddItem = renderAddItem;
|
|
49
|
+
});
|
|
51
50
|
exports.default = (props) => {
|
|
52
51
|
const type = props.type || common_1.ItemType.info;
|
|
53
52
|
switch (type) {
|
|
54
53
|
case common_1.ItemType.info:
|
|
55
|
-
return props.provider.infoItemRender
|
|
54
|
+
return react_1.default.createElement(props.provider.infoItemRender, props);
|
|
56
55
|
case common_1.ItemType.add:
|
|
57
|
-
return props.provider.addItemRender
|
|
56
|
+
return react_1.default.createElement(props.provider.addItemRender, props);
|
|
58
57
|
default:
|
|
59
58
|
return null;
|
|
60
59
|
}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"tab.item.js","sourceRoot":"","sources":["../../../src/browser/component/tab.item.tsx"],"names":[],"mappings":";;;;AAAA,oEAA6B;AAC7B,uEAAuC;AACvC,0DAA0B;AAE1B,iEAA8D;AAC9D,
|
|
1
|
+
{"version":3,"file":"tab.item.js","sourceRoot":"","sources":["../../../src/browser/component/tab.item.tsx"],"names":[],"mappings":"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"}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"terminal.variable.d.ts","sourceRoot":"","sources":["../../../src/browser/component/terminal.variable.tsx"],"names":[],"mappings":"AAIA,OAAO,EAEL,wCAAwC,EAEzC,MAAM,kCAAkC,CAAC;AAI1C,UAAU,sBAAsB;IAC9B,IAAI,EAAE,wCAAwC,CAAC;CAChD;AAaD,eAAO,MAAM,gBAAgB,aAAc,sBAAsB,gBA+ChE,CAAC"}
|
|
1
|
+
{"version":3,"file":"terminal.variable.d.ts","sourceRoot":"","sources":["../../../src/browser/component/terminal.variable.tsx"],"names":[],"mappings":";AAIA,OAAO,EAEL,wCAAwC,EAEzC,MAAM,kCAAkC,CAAC;AAI1C,UAAU,sBAAsB;IAC9B,IAAI,EAAE,wCAAwC,CAAC;CAChD;AAaD,eAAO,MAAM,gBAAgB,aAAc,sBAAsB,gBA+ChE,CAAC"}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"terminal.view.d.ts","sourceRoot":"","sources":["../../../src/browser/component/terminal.view.tsx"],"names":[],"mappings":"AACA,OAAO,KAAK,MAAM,OAAO,CAAC;AAkB1B,OAAO,qBAAqB,CAAC;;AAE7B,
|
|
1
|
+
{"version":3,"file":"terminal.view.d.ts","sourceRoot":"","sources":["../../../src/browser/component/terminal.view.tsx"],"names":[],"mappings":"AACA,OAAO,KAAK,MAAM,OAAO,CAAC;AAkB1B,OAAO,qBAAqB,CAAC;;AAE7B,wBAuGG"}
|
|
@@ -12,25 +12,22 @@ require("xterm/css/xterm.css");
|
|
|
12
12
|
exports.default = (0, mobx_react_lite_1.observer)(() => {
|
|
13
13
|
const controller = (0, ide_core_browser_1.useInjectable)(common_1.ITerminalController);
|
|
14
14
|
const view = (0, ide_core_browser_1.useInjectable)(common_1.ITerminalGroupViewService);
|
|
15
|
-
const
|
|
15
|
+
const search = (0, ide_core_browser_1.useInjectable)(common_1.ITerminalSearchService);
|
|
16
16
|
const errorService = (0, ide_core_browser_1.useInjectable)(common_1.ITerminalErrorService);
|
|
17
17
|
const network = (0, ide_core_browser_1.useInjectable)(common_1.ITerminalNetwork);
|
|
18
18
|
const { errors } = errorService;
|
|
19
19
|
const { groups, currentGroupIndex, currentGroupId } = view;
|
|
20
20
|
const inputRef = react_1.default.useRef(null);
|
|
21
21
|
const wrapperRef = react_1.default.createRef();
|
|
22
|
-
|
|
23
|
-
|
|
24
|
-
|
|
25
|
-
|
|
26
|
-
|
|
27
|
-
inputRef.current.setSelectionRange(0, inputRef.current.value.length);
|
|
28
|
-
}
|
|
22
|
+
search.onOpen(() => {
|
|
23
|
+
if (inputRef.current) {
|
|
24
|
+
inputRef.current.focus();
|
|
25
|
+
if (inputRef.current.value.length > 0) {
|
|
26
|
+
inputRef.current.setSelectionRange(0, inputRef.current.value.length);
|
|
29
27
|
}
|
|
30
|
-
}
|
|
31
|
-
|
|
32
|
-
|
|
33
|
-
const renderWidget = react_1.default.useCallback((widget, index) => {
|
|
28
|
+
}
|
|
29
|
+
});
|
|
30
|
+
const renderWidget = (widget, index) => {
|
|
34
31
|
const client = controller.findClientFromWidgetId(widget.id);
|
|
35
32
|
let error;
|
|
36
33
|
if (client) {
|
|
@@ -40,29 +37,31 @@ exports.default = (0, mobx_react_lite_1.observer)(() => {
|
|
|
40
37
|
error = errors.get(widget.id);
|
|
41
38
|
}
|
|
42
39
|
return react_1.default.createElement(terminal_widget_1.default, { show: currentGroupIndex === index, error: error, widget: widget });
|
|
43
|
-
}
|
|
44
|
-
const searchInput =
|
|
45
|
-
|
|
46
|
-
|
|
47
|
-
|
|
48
|
-
const searchKeyDown = react_1.default.useCallback((event) => {
|
|
40
|
+
};
|
|
41
|
+
const searchInput = (event) => {
|
|
42
|
+
search.input = event.target.value;
|
|
43
|
+
};
|
|
44
|
+
const searchKeyDown = (event) => {
|
|
49
45
|
if (event.key === 'Enter') {
|
|
50
|
-
|
|
46
|
+
search.search();
|
|
51
47
|
}
|
|
52
48
|
if (event.key === 'Escape') {
|
|
53
|
-
|
|
54
|
-
|
|
49
|
+
search.close();
|
|
50
|
+
search.clear();
|
|
55
51
|
}
|
|
56
|
-
}
|
|
52
|
+
};
|
|
53
|
+
const searchClose = () => {
|
|
54
|
+
search.close();
|
|
55
|
+
};
|
|
57
56
|
react_1.default.useEffect(() => {
|
|
58
57
|
if (wrapperRef.current) {
|
|
59
58
|
controller.initContextKey(wrapperRef.current);
|
|
60
59
|
}
|
|
61
60
|
}, [wrapperRef.current]);
|
|
62
61
|
return (react_1.default.createElement("div", { ref: wrapperRef, className: terminal_module_less_1.default.terminalWrapper, style: { backgroundColor: controller.themeBackground }, "data-group-current": currentGroupId },
|
|
63
|
-
|
|
64
|
-
react_1.default.createElement("input", { autoFocus: true, ref: inputRef, placeholder: '\u67E5\u627E', value:
|
|
65
|
-
react_1.default.createElement("div", { className: (0, ide_core_browser_1.getIcon)('close'), onClick:
|
|
62
|
+
search.show && (react_1.default.createElement("div", { className: terminal_module_less_1.default.terminalSearch },
|
|
63
|
+
react_1.default.createElement("input", { autoFocus: true, ref: inputRef, placeholder: '\u67E5\u627E', value: search.input, onChange: (event) => searchInput(event), onKeyDown: (event) => searchKeyDown(event) }),
|
|
64
|
+
react_1.default.createElement("div", { className: (0, ide_core_browser_1.getIcon)('close'), onClick: () => searchClose() }))),
|
|
66
65
|
groups.map((group, index) => {
|
|
67
66
|
if (!group.activated) {
|
|
68
67
|
return;
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"terminal.view.js","sourceRoot":"","sources":["../../../src/browser/component/terminal.view.tsx"],"names":[],"mappings":";;;AAAA,qDAA2C;AAC3C,0DAA0B;AAE1B,iEAAoE;AAEpE,yCAQsB;AAEtB,qEAA4D;AAC5D,0FAA4C;AAC5C,gFAA+C;AAE/C,+BAA6B;AAE7B,kBAAe,IAAA,0BAAQ,EAAC,GAAG,EAAE;IAC3B,MAAM,UAAU,GAAG,IAAA,gCAAa,EAAsB,4BAAmB,CAAC,CAAC;IAC3E,MAAM,IAAI,GAAG,IAAA,gCAAa,EAA4B,kCAAyB,CAAC,CAAC;IACjF,MAAM,
|
|
1
|
+
{"version":3,"file":"terminal.view.js","sourceRoot":"","sources":["../../../src/browser/component/terminal.view.tsx"],"names":[],"mappings":"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"}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"terminal.widget.d.ts","sourceRoot":"","sources":["../../../src/browser/component/terminal.widget.tsx"],"names":[],"mappings":"AAIA,OAAO,EAEL,OAAO,EACP,cAAc,EAGf,MAAM,cAAc,CAAC;AAItB,MAAM,WAAW,MAAM;IACrB,MAAM,EAAE,OAAO,CAAC;IAChB,IAAI,EAAE,OAAO,CAAC;IACd,KAAK,EAAE,cAAc,GAAG,SAAS,CAAC;CACnC;kDA8CwC,MAAM;AAA/C,wBAmCE"}
|
|
1
|
+
{"version":3,"file":"terminal.widget.d.ts","sourceRoot":"","sources":["../../../src/browser/component/terminal.widget.tsx"],"names":[],"mappings":";AAIA,OAAO,EAEL,OAAO,EACP,cAAc,EAGf,MAAM,cAAc,CAAC;AAItB,MAAM,WAAW,MAAM;IACrB,MAAM,EAAE,OAAO,CAAC;IAChB,IAAI,EAAE,OAAO,CAAC;IACd,KAAK,EAAE,cAAc,GAAG,SAAS,CAAC;CACnC;kDA8CwC,MAAM;AAA/C,wBAmCE"}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"link-manager.d.ts","sourceRoot":"","sources":["../../../src/browser/links/link-manager.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,QAAQ,EAAiB,cAAc,EAAE,MAAM,OAAO,CAAC;AAIhE,OAAO,EAEL,UAAU,EACV,WAAW,
|
|
1
|
+
{"version":3,"file":"link-manager.d.ts","sourceRoot":"","sources":["../../../src/browser/links/link-manager.ts"],"names":[],"mappings":"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"}
|
|
@@ -6,6 +6,8 @@ const xterm_1 = require("xterm");
|
|
|
6
6
|
const di_1 = require("@opensumi/di");
|
|
7
7
|
const ide_core_browser_1 = require("@opensumi/ide-core-browser");
|
|
8
8
|
const ide_core_common_1 = require("@opensumi/ide-core-common");
|
|
9
|
+
const path_1 = require("@opensumi/ide-core-common/lib/path");
|
|
10
|
+
const platform_1 = require("@opensumi/ide-core-common/lib/platform");
|
|
9
11
|
const common_1 = require("@opensumi/ide-editor/lib/common");
|
|
10
12
|
const ide_file_service_1 = require("@opensumi/ide-file-service");
|
|
11
13
|
const common_2 = require("../../common");
|
|
@@ -13,7 +15,6 @@ const terminal_client_1 = require("../terminal.client");
|
|
|
13
15
|
const external_link_provider_adapter_1 = require("./external-link-provider-adapter");
|
|
14
16
|
const protocol_link_provider_1 = require("./protocol-link-provider");
|
|
15
17
|
const validated_local_link_provider_1 = require("./validated-local-link-provider");
|
|
16
|
-
const { posix, win32 } = ide_core_common_1.path;
|
|
17
18
|
/**
|
|
18
19
|
* An object responsible for managing registration of link matchers and link providers.
|
|
19
20
|
*/
|
|
@@ -107,7 +108,7 @@ let TerminalLinkManager = class TerminalLinkManager extends ide_core_common_1.Di
|
|
|
107
108
|
};
|
|
108
109
|
}
|
|
109
110
|
get _localLinkRegex() {
|
|
110
|
-
const baseLocalLinkClause = this._client.os ===
|
|
111
|
+
const baseLocalLinkClause = this._client.os === platform_1.OperatingSystem.Windows ? validated_local_link_provider_1.winLocalLinkClause : validated_local_link_provider_1.unixLocalLinkClause;
|
|
111
112
|
// Append line and column number regex
|
|
112
113
|
return new RegExp(`${baseLocalLinkClause}(${validated_local_link_provider_1.lineAndColumnClause})`);
|
|
113
114
|
}
|
|
@@ -138,7 +139,7 @@ let TerminalLinkManager = class TerminalLinkManager extends ide_core_common_1.Di
|
|
|
138
139
|
// fsPath 是基于当前环境判断 sep 的，连接远程服务时，如果当前系统为 Windows，
|
|
139
140
|
// 而 uri 来自远程 Linux，则会出现生成的链接 sep 不正确，导致打开文件失败。
|
|
140
141
|
const fsPath = ide_core_common_1.FileUri.fsPath(uri);
|
|
141
|
-
this._handleLocalLink(this._client.os !==
|
|
142
|
+
this._handleLocalLink(this._client.os !== platform_1.OperatingSystem.Windows && platform_1.isWindows ? fsPath.replace(/\\/g, path_1.posix.sep) : fsPath);
|
|
142
143
|
return;
|
|
143
144
|
}
|
|
144
145
|
// Open as a web link if it's not a file
|
|
@@ -148,16 +149,16 @@ let TerminalLinkManager = class TerminalLinkManager extends ide_core_common_1.Di
|
|
|
148
149
|
return ide_core_common_1.isOSX ? event.metaKey : event.ctrlKey;
|
|
149
150
|
}
|
|
150
151
|
get osPath() {
|
|
151
|
-
if (this._client.os ===
|
|
152
|
-
return win32;
|
|
152
|
+
if (this._client.os === platform_1.OperatingSystem.Windows) {
|
|
153
|
+
return path_1.win32;
|
|
153
154
|
}
|
|
154
|
-
return posix;
|
|
155
|
+
return path_1.posix;
|
|
155
156
|
}
|
|
156
157
|
_getLinkHoverString(uri, label) {
|
|
157
158
|
const multiCursorModifier = this.preferenceService.get('editor.multiCursorModifier');
|
|
158
159
|
let clickLabel = '';
|
|
159
160
|
if (multiCursorModifier === 'ctrlCmd') {
|
|
160
|
-
if (
|
|
161
|
+
if (platform_1.isMacintosh) {
|
|
161
162
|
clickLabel = (0, ide_core_common_1.localize)('terminalLinkHandler.followLinkAlt.mac', 'option + click');
|
|
162
163
|
}
|
|
163
164
|
else {
|
|
@@ -165,7 +166,7 @@ let TerminalLinkManager = class TerminalLinkManager extends ide_core_common_1.Di
|
|
|
165
166
|
}
|
|
166
167
|
}
|
|
167
168
|
else {
|
|
168
|
-
if (
|
|
169
|
+
if (platform_1.isMacintosh) {
|
|
169
170
|
clickLabel = (0, ide_core_common_1.localize)('terminalLinkHandler.followLinkCmd', 'cmd + click');
|
|
170
171
|
}
|
|
171
172
|
else {
|
|
@@ -204,7 +205,7 @@ let TerminalLinkManager = class TerminalLinkManager extends ide_core_common_1.Di
|
|
|
204
205
|
}
|
|
205
206
|
else if (link.charAt(0) !== '/' && link.charAt(0) !== '~') {
|
|
206
207
|
// Resolve workspace path . | .. | <relative_path> -> <path>/. | <path>/.. | <path>/<relative_path>
|
|
207
|
-
if (this._client.os ===
|
|
208
|
+
if (this._client.os === platform_1.OperatingSystem.Windows) {
|
|
208
209
|
if (!link.match('^' + validated_local_link_provider_1.winDrivePrefix) && !link.startsWith('\\\\?\\')) {
|
|
209
210
|
if (!this._processCwd) {
|
|
210
211
|
// Abort if no workspace is open
|
|
@@ -264,7 +265,7 @@ let TerminalLinkManager = class TerminalLinkManager extends ide_core_common_1.Di
|
|
|
264
265
|
if (!matches) {
|
|
265
266
|
return lineColumnInfo;
|
|
266
267
|
}
|
|
267
|
-
const lineAndColumnMatchIndex = this._client.os ===
|
|
268
|
+
const lineAndColumnMatchIndex = this._client.os === platform_1.OperatingSystem.Windows ? validated_local_link_provider_1.winLineAndColumnMatchIndex : validated_local_link_provider_1.unixLineAndColumnMatchIndex;
|
|
268
269
|
for (let i = 0; i < validated_local_link_provider_1.lineAndColumnClause.length; i++) {
|
|
269
270
|
const lineMatchIndex = lineAndColumnMatchIndex + validated_local_link_provider_1.lineAndColumnClauseGroupCount * i;
|
|
270
271
|
const rowNumber = matches[lineMatchIndex];
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"link-manager.js","sourceRoot":"","sources":["../../../src/browser/links/link-manager.ts"],"names":[],"mappings":";;;;AAAA,iCAAgE;AAEhE,qCAA+E;AAC/E,iEAA+E;AAC/E,+
|
|
1
|
+
{"version":3,"file":"link-manager.js","sourceRoot":"","sources":["../../../src/browser/links/link-manager.ts"],"names":[],"mappings":"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"}
|
|
@@ -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;AAInE,OAAO,EAAE,cAAc,EAAE,MAAM,uCAAuC,CAAC;AACvE,OAAO,EAAkB,WAAW,EAAE,GAAG,
|
|
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;AAInE,OAAO,EAAE,cAAc,EAAE,MAAM,uCAAuC,CAAC;AACvE,OAAO,EAAkB,WAAW,EAAE,GAAG,EAAE,MAAM,2BAA2B,CAAC;AAI7E,OAAO,KAAK,EAAE,cAAc,EAAE,MAAM,oBAAoB,CAAC;AAEzD,OAAO,EAAE,wBAAwB,EAAE,MAAM,QAAQ,CAAC;AAElD,OAAO,EAA6E,YAAY,EAAE,MAAM,QAAQ,CAAC;AACjH,OAAO,EAAE,uBAAuB,EAAE,MAAM,gBAAgB,CAAC;AAOzD,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"}
|
|
@@ -11,6 +11,7 @@ const di_1 = require("@opensumi/di");
|
|
|
11
11
|
const config_provider_1 = require("@opensumi/ide-core-browser/lib/react-providers/config-provider");
|
|
12
12
|
const window_1 = require("@opensumi/ide-core-browser/lib/window");
|
|
13
13
|
const ide_core_common_1 = require("@opensumi/ide-core-common");
|
|
14
|
+
const platform_1 = require("@opensumi/ide-core-common/lib/platform");
|
|
14
15
|
const workspace_defination_1 = require("@opensumi/ide-workspace/lib/common/workspace-defination");
|
|
15
16
|
const base_1 = require("./base");
|
|
16
17
|
const helpers_1 = require("./helpers");
|
|
@@ -169,7 +170,7 @@ let TerminalValidatedLocalLinkProvider = class TerminalValidatedLocalLinkProvide
|
|
|
169
170
|
return result;
|
|
170
171
|
}
|
|
171
172
|
get _localLinkRegex() {
|
|
172
|
-
const baseLocalLinkClause = this._client.os ===
|
|
173
|
+
const baseLocalLinkClause = this._client.os === platform_1.OperatingSystem.Windows ? exports.winLocalLinkClause : exports.unixLocalLinkClause;
|
|
173
174
|
// Append line and column number regex
|
|
174
175
|
return new RegExp(`${baseLocalLinkClause}(${exports.lineAndColumnClause})`);
|
|
175
176
|
}
|
|
@@ -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;;;;AAI3K,qCAA+E;AAC/E,oGAA2F;AAC3F,kEAAuE;AACvE,+
|
|
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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"}
|
|
@@ -1,7 +1,8 @@
|
|
|
1
1
|
/// <reference types="xterm" />
|
|
2
2
|
import { Injector } from '@opensumi/di';
|
|
3
3
|
import { CorePreferences, QuickPickService } from '@opensumi/ide-core-browser';
|
|
4
|
-
import { Disposable, Deferred, Event, ILogger, IDisposable, IApplicationService, IReporter, Uri
|
|
4
|
+
import { Disposable, Deferred, Event, ILogger, IDisposable, IApplicationService, IReporter, Uri } from '@opensumi/ide-core-common';
|
|
5
|
+
import { OperatingSystem } from '@opensumi/ide-core-common/lib/platform';
|
|
5
6
|
import { WorkbenchEditorService } from '@opensumi/ide-editor/lib/common';
|
|
6
7
|
import { IFileServiceClient } from '@opensumi/ide-file-service/lib/common';
|
|
7
8
|
import { IMessageService } from '@opensumi/ide-overlay';
|
|
@@ -21,8 +22,6 @@ export declare class TerminalClient extends Disposable implements ITerminalClien
|
|
|
21
22
|
private _workspacePath;
|
|
22
23
|
private _linkManager;
|
|
23
24
|
/** end */
|
|
24
|
-
isTaskExecutor: boolean;
|
|
25
|
-
taskId: string | undefined;
|
|
26
25
|
/** status */
|
|
27
26
|
private _ready;
|
|
28
27
|
private _attached;
|
|
@@ -53,7 +52,6 @@ export declare class TerminalClient extends Disposable implements ITerminalClien
|
|
|
53
52
|
terminalProfileService: ITerminalProfileService;
|
|
54
53
|
terminalProfileInternalService: ITerminalProfileInternalService;
|
|
55
54
|
variableResolver: IVariableResolverService;
|
|
56
|
-
private readonly eventBus;
|
|
57
55
|
private _onInput;
|
|
58
56
|
onInput: Event<ITerminalDataEvent>;
|
|
59
57
|
private _onOutput;
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"terminal.client.d.ts","sourceRoot":"","sources":["../../src/browser/terminal.client.ts"],"names":[],"mappings":";AAGA,OAAO,EAAyB,QAAQ,EAAkB,MAAM,cAAc,CAAC;AAC/E,OAAO,EAAE,eAAe,EAAE,gBAAgB,
|
|
1
|
+
{"version":3,"file":"terminal.client.d.ts","sourceRoot":"","sources":["../../src/browser/terminal.client.ts"],"names":[],"mappings":"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"}
|
|
@@ -7,6 +7,7 @@ const mobx_1 = require("mobx");
|
|
|
7
7
|
const di_1 = require("@opensumi/di");
|
|
8
8
|
const ide_core_browser_1 = require("@opensumi/ide-core-browser");
|
|
9
9
|
const ide_core_common_1 = require("@opensumi/ide-core-common");
|
|
10
|
+
const platform_1 = require("@opensumi/ide-core-common/lib/platform");
|
|
10
11
|
const common_1 = require("@opensumi/ide-editor/lib/common");
|
|
11
12
|
const common_2 = require("@opensumi/ide-file-service/lib/common");
|
|
12
13
|
const ide_overlay_1 = require("@opensumi/ide-overlay");
|
|
@@ -24,11 +25,11 @@ let TerminalClient = TerminalClient_1 = class TerminalClient extends ide_core_co
|
|
|
24
25
|
constructor() {
|
|
25
26
|
super();
|
|
26
27
|
/** end */
|
|
27
|
-
this.isTaskExecutor = false;
|
|
28
28
|
/** status */
|
|
29
29
|
this._ready = false;
|
|
30
30
|
this._hasOutput = false;
|
|
31
31
|
this._areLinksReady = false;
|
|
32
|
+
this._os = platform_1.OS;
|
|
32
33
|
this._onInput = new ide_core_common_1.Emitter();
|
|
33
34
|
this.onInput = this._onInput.event;
|
|
34
35
|
this._onOutput = new ide_core_common_1.Emitter();
|
|
@@ -311,7 +312,7 @@ let TerminalClient = TerminalClient_1 = class TerminalClient extends ide_core_co
|
|
|
311
312
|
this._error = new ide_core_common_1.Deferred();
|
|
312
313
|
this._firstStdout = new ide_core_common_1.Deferred();
|
|
313
314
|
(_e = this._attachAddon) === null || _e === void 0 ? void 0 : _e.setConnection(undefined);
|
|
314
|
-
this.internalService.
|
|
315
|
+
this.internalService.getOs().then((os) => {
|
|
315
316
|
this._os = os;
|
|
316
317
|
});
|
|
317
318
|
const { dispose } = this.onOutput(() => {
|
|
@@ -388,7 +389,7 @@ let TerminalClient = TerminalClient_1 = class TerminalClient extends ide_core_co
|
|
|
388
389
|
this._launchConfig = finalLaunchConfig;
|
|
389
390
|
this.logger.log('attach terminal by launchConfig: ', this._launchConfig);
|
|
390
391
|
try {
|
|
391
|
-
connection = await this.internalService.attachByLaunchConfig(sessionId, cols, rows, this._launchConfig
|
|
392
|
+
connection = await this.internalService.attachByLaunchConfig(sessionId, cols, rows, this._launchConfig);
|
|
392
393
|
}
|
|
393
394
|
catch (e) {
|
|
394
395
|
this.logger.error(`attach ${sessionId} terminal failed, _launchConfig`, JSON.stringify(this._launchConfig), e);
|
|
@@ -401,10 +402,10 @@ let TerminalClient = TerminalClient_1 = class TerminalClient extends ide_core_co
|
|
|
401
402
|
return;
|
|
402
403
|
}
|
|
403
404
|
this._attachAddon.setConnection(connection);
|
|
405
|
+
this.name = this.name || this._launchConfig.name || connection.name;
|
|
404
406
|
this._ready = true;
|
|
405
407
|
this._attached.resolve();
|
|
406
408
|
this._widget.name = this.name;
|
|
407
|
-
this.eventBus.fire(new ide_core_browser_1.TerminalClientAttachEvent({ clientId: this.id }));
|
|
408
409
|
this._firstStdout.promise.then(() => {
|
|
409
410
|
this._doResize();
|
|
410
411
|
});
|
|
@@ -601,10 +602,6 @@ tslib_1.__decorate([
|
|
|
601
602
|
(0, di_1.Autowired)(common_3.IVariableResolverService),
|
|
602
603
|
tslib_1.__metadata("design:type", Object)
|
|
603
604
|
], TerminalClient.prototype, "variableResolver", void 0);
|
|
604
|
-
tslib_1.__decorate([
|
|
605
|
-
(0, di_1.Autowired)(ide_core_browser_1.IEventBus),
|
|
606
|
-
tslib_1.__metadata("design:type", Object)
|
|
607
|
-
], TerminalClient.prototype, "eventBus", void 0);
|
|
608
605
|
tslib_1.__decorate([
|
|
609
606
|
mobx_1.observable,
|
|
610
607
|
tslib_1.__metadata("design:type", Object)
|