@opensumi/ide-terminal-next 2.16.11 → 2.17.0
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/tab.item.d.ts.map +1 -1
- package/lib/browser/component/tab.item.js +10 -5
- package/lib/browser/component/tab.item.js.map +1 -1
- package/lib/browser/component/tab.module.less +41 -21
- package/lib/browser/component/tab.view.d.ts.map +1 -1
- package/lib/browser/component/tab.view.js +17 -14
- package/lib/browser/component/tab.view.js.map +1 -1
- package/lib/browser/component/terminal.module.less +9 -1
- package/lib/browser/contribution/terminal.command.d.ts +1 -0
- package/lib/browser/contribution/terminal.command.d.ts.map +1 -1
- package/lib/browser/contribution/terminal.command.js +42 -1
- package/lib/browser/contribution/terminal.command.js.map +1 -1
- package/lib/browser/contribution/terminal.keybinding.d.ts.map +1 -1
- package/lib/browser/contribution/terminal.keybinding.js +24 -0
- package/lib/browser/contribution/terminal.keybinding.js.map +1 -1
- package/lib/browser/terminal.api.js +2 -2
- package/lib/browser/terminal.api.js.map +1 -1
- package/lib/browser/terminal.client.d.ts +1 -0
- package/lib/browser/terminal.client.d.ts.map +1 -1
- package/lib/browser/terminal.client.js +14 -2
- package/lib/browser/terminal.client.js.map +1 -1
- package/lib/browser/terminal.color.d.ts +6 -0
- package/lib/browser/terminal.color.d.ts.map +1 -1
- package/lib/browser/terminal.color.js +31 -1
- package/lib/browser/terminal.color.js.map +1 -1
- package/lib/browser/terminal.environment.service.d.ts.map +1 -1
- package/lib/browser/terminal.environment.service.js +5 -5
- package/lib/browser/terminal.environment.service.js.map +1 -1
- package/lib/browser/terminal.internal.service.d.ts +2 -1
- package/lib/browser/terminal.internal.service.d.ts.map +1 -1
- package/lib/browser/terminal.internal.service.js +3 -0
- package/lib/browser/terminal.internal.service.js.map +1 -1
- package/lib/browser/terminal.preference.d.ts +14 -10
- package/lib/browser/terminal.preference.d.ts.map +1 -1
- package/lib/browser/terminal.preference.js +58 -18
- package/lib/browser/terminal.preference.js.map +1 -1
- package/lib/browser/terminal.search.d.ts +2 -1
- package/lib/browser/terminal.search.d.ts.map +1 -1
- package/lib/browser/terminal.search.js +9 -5
- package/lib/browser/terminal.search.js.map +1 -1
- package/lib/browser/terminal.service.d.ts +4 -1
- package/lib/browser/terminal.service.d.ts.map +1 -1
- package/lib/browser/terminal.service.js +5 -0
- package/lib/browser/terminal.service.js.map +1 -1
- package/lib/browser/terminal.view.d.ts +2 -0
- package/lib/browser/terminal.view.d.ts.map +1 -1
- package/lib/browser/terminal.view.js +18 -11
- package/lib/browser/terminal.view.js.map +1 -1
- package/lib/browser/xterm.d.ts +16 -2
- package/lib/browser/xterm.d.ts.map +1 -1
- package/lib/browser/xterm.js +69 -2
- package/lib/browser/xterm.js.map +1 -1
- package/lib/common/client.d.ts +1 -0
- package/lib/common/client.d.ts.map +1 -1
- package/lib/common/client.js.map +1 -1
- package/lib/common/commands.d.ts +1 -96
- package/lib/common/commands.d.ts.map +1 -1
- package/lib/common/commands.js +2 -98
- package/lib/common/commands.js.map +1 -1
- package/lib/common/preference.d.ts +7 -8
- package/lib/common/preference.d.ts.map +1 -1
- package/lib/common/preference.js +8 -6
- package/lib/common/preference.js.map +1 -1
- package/lib/common/pty.d.ts +1 -0
- package/lib/common/pty.d.ts.map +1 -1
- package/lib/common/pty.js.map +1 -1
- package/lib/common/resize.d.ts +1 -0
- package/lib/common/resize.d.ts.map +1 -1
- package/lib/common/service.d.ts +5 -0
- package/lib/common/service.d.ts.map +1 -1
- package/lib/common/service.js.map +1 -1
- package/lib/node/pty.d.ts +3 -0
- package/lib/node/pty.d.ts.map +1 -1
- package/lib/node/pty.js +9 -2
- package/lib/node/pty.js.map +1 -1
- package/lib/node/terminal.service.client.d.ts +2 -0
- package/lib/node/terminal.service.client.d.ts.map +1 -1
- package/lib/node/terminal.service.client.js +5 -0
- package/lib/node/terminal.service.client.js.map +1 -1
- package/lib/node/terminal.service.d.ts.map +1 -1
- package/lib/node/terminal.service.js +10 -0
- package/lib/node/terminal.service.js.map +1 -1
- package/package.json +18 -19
|
@@ -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":";AAQA,OAAO,EAAE,SAAS,EAAY,MAAM,cAAc,CAAC;AAInD,wBAAgB,cAAc,CAAC,KAAK,EAAE,SAAS,eAkE9C;AAED,wBAAgB,aAAa,CAAC,KAAK,EAAE,SAAS,eAY7C;gCAEsB,SAAS;AAAhC,wBAWE"}
|
|
@@ -3,14 +3,17 @@ Object.defineProperty(exports, "__esModule", { value: true });
|
|
|
3
3
|
exports.renderAddItem = exports.renderInfoItem = void 0;
|
|
4
4
|
const tslib_1 = require("tslib");
|
|
5
5
|
const classnames_1 = tslib_1.__importDefault(require("classnames"));
|
|
6
|
-
const
|
|
6
|
+
const debounce_1 = tslib_1.__importDefault(require("lodash/debounce"));
|
|
7
7
|
const react_1 = tslib_1.__importDefault(require("react"));
|
|
8
|
+
const icon_1 = require("@opensumi/ide-components/lib/icon/icon");
|
|
8
9
|
const ide_core_browser_1 = require("@opensumi/ide-core-browser");
|
|
10
|
+
const loading_1 = require("@opensumi/ide-core-browser/lib/components/loading");
|
|
9
11
|
const common_1 = require("../../common");
|
|
10
12
|
const tab_module_less_1 = tslib_1.__importDefault(require("./tab.module.less"));
|
|
11
13
|
function renderInfoItem(props) {
|
|
12
|
-
|
|
13
|
-
const
|
|
14
|
+
var _a;
|
|
15
|
+
const handleSelect = (0, debounce_1.default)(() => props.onClick && props.onClick(), 20);
|
|
16
|
+
const handleClose = (0, debounce_1.default)(() => props.onClose && props.onClose(), 20);
|
|
14
17
|
const handleOnKeyDown = (e) => {
|
|
15
18
|
if (e.key === 'Enter' && props.onInputEnter && props.id) {
|
|
16
19
|
props.onInputEnter(props.id, e.target.value);
|
|
@@ -28,7 +31,9 @@ function renderInfoItem(props) {
|
|
|
28
31
|
[tab_module_less_1.default.item_container]: true,
|
|
29
32
|
[tab_module_less_1.default.item_selected]: !!props.selected,
|
|
30
33
|
}), onClick: () => handleSelect(), onContextMenu: (event) => props.onContextMenu && props.onContextMenu(event) },
|
|
31
|
-
props.editable ? (react_1.default.createElement("input", { autoFocus: true, ref: (ele) => ele && ele.select(), className: tab_module_less_1.default.item_info_input, defaultValue: props.name, onClick: (e) => e.stopPropagation(), onBlur: () => props.onInputBlur && props.id && props.onInputBlur(props.id), onKeyDown: (e) => handleOnKeyDown(e) })) : (react_1.default.createElement("div", { id: props.id, className: tab_module_less_1.default.item_info_name, title: props.name }, props.name
|
|
34
|
+
props.editable ? (react_1.default.createElement("input", { autoFocus: true, ref: (ele) => ele && ele.select(), className: tab_module_less_1.default.item_info_input, defaultValue: props.name, onClick: (e) => e.stopPropagation(), onBlur: () => props.onInputBlur && props.id && props.onInputBlur(props.id), onKeyDown: (e) => handleOnKeyDown(e) })) : (react_1.default.createElement("div", { id: props.id, className: tab_module_less_1.default.item_info_name, title: props.name }, props.name !== '' ? (react_1.default.createElement(react_1.default.Fragment, null,
|
|
35
|
+
react_1.default.createElement(icon_1.Icon, { iconClass: (0, ide_core_browser_1.getIcon)(((_a = props.name) === null || _a === void 0 ? void 0 : _a.toLowerCase()) || 'terminal') || (0, ide_core_browser_1.getIcon)('terminal'), style: { marginRight: 4, color: 'inherit', fontSize: 14 } }),
|
|
36
|
+
react_1.default.createElement("span", { className: tab_module_less_1.default.item_title }, props.name))) : (react_1.default.createElement(loading_1.Loading, null)))),
|
|
32
37
|
props.editable ? (react_1.default.createElement("div", null)) : (react_1.default.createElement("div", { className: (0, classnames_1.default)([(0, ide_core_browser_1.getIcon)('close'), tab_module_less_1.default.close_icon]), onClick: (event) => {
|
|
33
38
|
event.stopPropagation();
|
|
34
39
|
handleClose();
|
|
@@ -36,7 +41,7 @@ function renderInfoItem(props) {
|
|
|
36
41
|
}
|
|
37
42
|
exports.renderInfoItem = renderInfoItem;
|
|
38
43
|
function renderAddItem(props) {
|
|
39
|
-
const handleAdd =
|
|
44
|
+
const handleAdd = (0, debounce_1.default)(() => props.onClick && props.onClick(), 20);
|
|
40
45
|
return (react_1.default.createElement("div", { className: (0, classnames_1.default)({
|
|
41
46
|
[(0, ide_core_browser_1.getIcon)('plus')]: true,
|
|
42
47
|
[tab_module_less_1.default.item_add]: true,
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"tab.item.js","sourceRoot":"","sources":["../../../src/browser/component/tab.item.tsx"],"names":[],"mappings":";;;;AAAA,oEAA6B;AAC7B,
|
|
1
|
+
{"version":3,"file":"tab.item.js","sourceRoot":"","sources":["../../../src/browser/component/tab.item.tsx"],"names":[],"mappings":"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"}
|
|
@@ -6,39 +6,49 @@
|
|
|
6
6
|
}
|
|
7
7
|
|
|
8
8
|
.tabs {
|
|
9
|
-
|
|
9
|
+
flex-grow: 1;
|
|
10
|
+
width: 10px;
|
|
11
|
+
|
|
12
|
+
:global(.thumb-vertical) {
|
|
13
|
+
opacity: 0 !important;
|
|
14
|
+
}
|
|
15
|
+
|
|
10
16
|
:first-child {
|
|
11
17
|
&.item_container {
|
|
12
18
|
border-left: 1px solid var(--kt-panelTab-border);
|
|
13
19
|
}
|
|
14
20
|
}
|
|
21
|
+
|
|
22
|
+
.tab_contents {
|
|
23
|
+
overflow-y: hidden;
|
|
24
|
+
display: inline-flex;
|
|
25
|
+
position: relative;
|
|
26
|
+
}
|
|
15
27
|
}
|
|
16
28
|
|
|
17
29
|
.tabs::-webkit-scrollbar {
|
|
18
30
|
display: none;
|
|
19
31
|
}
|
|
20
32
|
|
|
21
|
-
.button {
|
|
22
|
-
flex: 1;
|
|
23
|
-
}
|
|
24
|
-
|
|
25
33
|
.item_container {
|
|
26
34
|
padding: 0px 12px 0px 12px;
|
|
27
35
|
cursor: pointer;
|
|
28
36
|
user-select: none;
|
|
29
|
-
height:
|
|
37
|
+
height: var(--tabBar-height);
|
|
38
|
+
line-height: var(--tabBar-height);
|
|
39
|
+
font-size: var(--tab-fontSize);
|
|
40
|
+
min-width: var(--tab-min-size);
|
|
30
41
|
display: flex;
|
|
31
42
|
color: var(--kt-panelTab-inactiveForeground);
|
|
32
43
|
background-color: var(--kt-panelTab-inactiveBackground);
|
|
33
44
|
border-right: 1px solid var(--kt-panelTab-border);
|
|
34
|
-
|
|
35
|
-
min-width: 105px;
|
|
45
|
+
border-top: 1px solid transparent;
|
|
36
46
|
align-items: center;
|
|
37
47
|
position: relative;
|
|
38
|
-
|
|
48
|
+
.close_icon {
|
|
39
49
|
transition: opacity 0.2s ease-in-out;
|
|
40
50
|
opacity: 0;
|
|
41
|
-
line-height:
|
|
51
|
+
line-height: var(--tabBar-height);
|
|
42
52
|
border-right: 0;
|
|
43
53
|
}
|
|
44
54
|
&::before {
|
|
@@ -48,27 +58,31 @@
|
|
|
48
58
|
bottom: 0;
|
|
49
59
|
width: 100%;
|
|
50
60
|
height: 1px;
|
|
51
|
-
background-color: var(--
|
|
61
|
+
background-color: var(--sideBar-border);
|
|
52
62
|
}
|
|
53
63
|
}
|
|
54
64
|
|
|
55
65
|
.item_container:hover {
|
|
56
|
-
|
|
66
|
+
.close_icon {
|
|
57
67
|
opacity: 1;
|
|
58
68
|
}
|
|
59
69
|
}
|
|
60
70
|
|
|
61
71
|
.item_info_name {
|
|
62
|
-
flex: 1;
|
|
63
72
|
margin-right: 8px;
|
|
64
|
-
overflow: hidden;
|
|
65
|
-
text-overflow: ellipsis;
|
|
66
|
-
white-space: nowrap;
|
|
67
|
-
line-height: 20px;
|
|
68
|
-
height: 20px;
|
|
69
73
|
position: relative;
|
|
70
|
-
|
|
71
|
-
|
|
74
|
+
min-width: var(--tab-min-size);
|
|
75
|
+
display: flex;
|
|
76
|
+
align-items: center;
|
|
77
|
+
|
|
78
|
+
.item_title {
|
|
79
|
+
flex: 1;
|
|
80
|
+
overflow: hidden;
|
|
81
|
+
text-overflow: ellipsis;
|
|
82
|
+
white-space: nowrap;
|
|
83
|
+
line-height: 20px;
|
|
84
|
+
height: 20px;
|
|
85
|
+
}
|
|
72
86
|
}
|
|
73
87
|
|
|
74
88
|
.item_info_input {
|
|
@@ -88,6 +102,8 @@
|
|
|
88
102
|
color: var(--kt-panelTab-activeForeground);
|
|
89
103
|
background-color: var(--kt-panelTab-activeBackground);
|
|
90
104
|
position: relative;
|
|
105
|
+
border-top-color: var(--tab-activeBorderTop);
|
|
106
|
+
|
|
91
107
|
&::before {
|
|
92
108
|
content: '';
|
|
93
109
|
position: absolute;
|
|
@@ -102,11 +118,15 @@
|
|
|
102
118
|
.item_add {
|
|
103
119
|
display: inline-block;
|
|
104
120
|
padding: 0 6px;
|
|
105
|
-
line-height:
|
|
121
|
+
line-height: var(--tabBar-height);
|
|
106
122
|
cursor: pointer;
|
|
107
123
|
user-select: none;
|
|
108
124
|
}
|
|
109
125
|
|
|
110
126
|
.close_icon {
|
|
127
|
+
&::before {
|
|
128
|
+
font-size: 14px;
|
|
129
|
+
}
|
|
130
|
+
|
|
111
131
|
color: var(--kt-panelTabActionIcon-foreground);
|
|
112
132
|
}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"tab.view.d.ts","sourceRoot":"","sources":["../../../src/browser/component/tab.view.tsx"],"names":[],"mappings":"AACA,OAAO,
|
|
1
|
+
{"version":3,"file":"tab.view.d.ts","sourceRoot":"","sources":["../../../src/browser/component/tab.view.tsx"],"names":[],"mappings":"AACA,OAAO,KAAiB,MAAM,OAAO,CAAC;;AAWtC,wBA8CG"}
|
|
@@ -2,8 +2,9 @@
|
|
|
2
2
|
Object.defineProperty(exports, "__esModule", { value: true });
|
|
3
3
|
const tslib_1 = require("tslib");
|
|
4
4
|
const mobx_react_lite_1 = require("mobx-react-lite");
|
|
5
|
-
const react_1 = tslib_1.
|
|
5
|
+
const react_1 = tslib_1.__importStar(require("react"));
|
|
6
6
|
const ide_core_browser_1 = require("@opensumi/ide-core-browser");
|
|
7
|
+
const scroll_1 = require("@opensumi/ide-core-browser/lib/components/scroll");
|
|
7
8
|
const common_1 = require("../../common");
|
|
8
9
|
const terminal_context_menu_1 = require("../terminal.context-menu");
|
|
9
10
|
const tab_item_1 = tslib_1.__importDefault(require("./tab.item"));
|
|
@@ -12,19 +13,21 @@ exports.default = (0, mobx_react_lite_1.observer)(() => {
|
|
|
12
13
|
const view = (0, ide_core_browser_1.useInjectable)(common_1.ITerminalGroupViewService);
|
|
13
14
|
const provider = (0, ide_core_browser_1.useInjectable)(common_1.ITerminalRenderProvider);
|
|
14
15
|
const menuService = (0, ide_core_browser_1.useInjectable)(terminal_context_menu_1.TerminalContextMenuService);
|
|
16
|
+
const tabContainer = (0, react_1.useRef)();
|
|
15
17
|
return (react_1.default.createElement("div", { className: tab_module_less_1.default.view_container },
|
|
16
|
-
react_1.default.createElement("div", { className: tab_module_less_1.default.tabs },
|
|
17
|
-
|
|
18
|
-
|
|
19
|
-
|
|
20
|
-
|
|
21
|
-
|
|
22
|
-
|
|
23
|
-
|
|
24
|
-
|
|
25
|
-
|
|
26
|
-
|
|
27
|
-
|
|
28
|
-
|
|
18
|
+
react_1.default.createElement("div", { className: tab_module_less_1.default.tabs },
|
|
19
|
+
react_1.default.createElement(scroll_1.Scroll, { ref: (el) => (el ? (tabContainer.current = el.ref) : null) },
|
|
20
|
+
react_1.default.createElement("div", { className: tab_module_less_1.default.tab_contents }, view.groups.map((group, index) => {
|
|
21
|
+
if (!group) {
|
|
22
|
+
return;
|
|
23
|
+
}
|
|
24
|
+
return (react_1.default.createElement(tab_item_1.default, { key: group.id, id: group.id, editable: group.editable, name: group.snapshot, selected: view.currentGroup && view.currentGroup.id === group.id, onInputBlur: () => group.unedit(), onInputEnter: (_, name) => group.rename(name), onClick: () => view.selectGroup(index), onClose: () => view.removeGroup(index), onContextMenu: (event) => menuService.onTabContextMenu(event, index), provider: provider }));
|
|
25
|
+
})))),
|
|
26
|
+
react_1.default.createElement(tab_item_1.default, { type: common_1.ItemType.add, onClick: () => {
|
|
27
|
+
const index = view.createGroup();
|
|
28
|
+
const group = view.getGroup(index);
|
|
29
|
+
view.createWidget(group);
|
|
30
|
+
view.selectGroup(index);
|
|
31
|
+
}, provider: provider })));
|
|
29
32
|
});
|
|
30
33
|
//# sourceMappingURL=tab.view.js.map
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"tab.view.js","sourceRoot":"","sources":["../../../src/browser/component/tab.view.tsx"],"names":[],"mappings":";;;AAAA,qDAA2C;AAC3C,
|
|
1
|
+
{"version":3,"file":"tab.view.js","sourceRoot":"","sources":["../../../src/browser/component/tab.view.tsx"],"names":[],"mappings":";;;AAAA,qDAA2C;AAC3C,uDAAsC;AAEtC,iEAA2D;AAC3D,6EAA0E;AAE1E,yCAA4F;AAC5F,oEAAsE;AAEtE,kEAAiC;AACjC,gFAAuC;AAEvC,kBAAe,IAAA,0BAAQ,EAAC,GAAG,EAAE;IAC3B,MAAM,IAAI,GAAG,IAAA,gCAAa,EAA4B,kCAAyB,CAAC,CAAC;IACjF,MAAM,QAAQ,GAAG,IAAA,gCAAa,EAA0B,gCAAuB,CAAC,CAAC;IACjF,MAAM,WAAW,GAAG,IAAA,gCAAa,EAA6B,kDAA0B,CAAC,CAAC;IAC1F,MAAM,YAAY,GAAG,IAAA,cAAM,GAAyB,CAAC;IAErD,OAAO,CACL,uCAAK,SAAS,EAAE,yBAAM,CAAC,cAAc;QACnC,uCAAK,SAAS,EAAE,yBAAM,CAAC,IAAI;YACzB,8BAAC,eAAM,IAAC,GAAG,EAAE,CAAC,EAAE,EAAE,EAAE,CAAC,CAAC,EAAE,CAAC,CAAC,CAAC,CAAC,YAAY,CAAC,OAAO,GAAG,EAAE,CAAC,GAAG,CAAC,CAAC,CAAC,CAAC,IAAI,CAAC;gBAChE,uCAAK,SAAS,EAAE,yBAAM,CAAC,YAAY,IAChC,IAAI,CAAC,MAAM,CAAC,GAAG,CAAC,CAAC,KAAK,EAAE,KAAK,EAAE,EAAE;oBAChC,IAAI,CAAC,KAAK,EAAE;wBACV,OAAO;qBACR;oBACD,OAAO,CACL,8BAAC,kBAAO,IACN,GAAG,EAAE,KAAK,CAAC,EAAE,EACb,EAAE,EAAE,KAAK,CAAC,EAAE,EACZ,QAAQ,EAAE,KAAK,CAAC,QAAQ,EACxB,IAAI,EAAE,KAAK,CAAC,QAAQ,EACpB,QAAQ,EAAE,IAAI,CAAC,YAAY,IAAI,IAAI,CAAC,YAAY,CAAC,EAAE,KAAK,KAAK,CAAC,EAAE,EAChE,WAAW,EAAE,GAAG,EAAE,CAAC,KAAK,CAAC,MAAM,EAAE,EACjC,YAAY,EAAE,CAAC,CAAS,EAAE,IAAY,EAAE,EAAE,CAAC,KAAK,CAAC,MAAM,CAAC,IAAI,CAAC,EAC7D,OAAO,EAAE,GAAG,EAAE,CAAC,IAAI,CAAC,WAAW,CAAC,KAAK,CAAC,EACtC,OAAO,EAAE,GAAG,EAAE,CAAC,IAAI,CAAC,WAAW,CAAC,KAAK,CAAC,EACtC,aAAa,EAAE,CAAC,KAAK,EAAE,EAAE,CAAC,WAAW,CAAC,gBAAgB,CAAC,KAAK,EAAE,KAAK,CAAC,EACpE,QAAQ,EAAE,QAAQ,GACT,CACZ,CAAC;gBACJ,CAAC,CAAC,CACE,CACC,CACL;QACN,8BAAC,kBAAO,IACN,IAAI,EAAE,iBAAQ,CAAC,GAAG,EAClB,OAAO,EAAE,GAAG,EAAE;gBACZ,MAAM,KAAK,GAAG,IAAI,CAAC,WAAW,EAAE,CAAC;gBACjC,MAAM,KAAK,GAAG,IAAI,CAAC,QAAQ,CAAC,KAAK,CAAC,CAAC;gBACnC,IAAI,CAAC,YAAY,CAAC,KAAK,CAAC,CAAC;gBACzB,IAAI,CAAC,WAAW,CAAC,KAAK,CAAC,CAAC;YAC1B,CAAC,EACD,QAAQ,EAAE,QAAQ,GAClB,CACE,CACP,CAAC;AACJ,CAAC,CAAC,CAAC"}
|
|
@@ -54,8 +54,16 @@
|
|
|
54
54
|
background: var(--kt-panelTitle-background);
|
|
55
55
|
border: none;
|
|
56
56
|
outline: none;
|
|
57
|
-
|
|
57
|
+
height: 28px;
|
|
58
|
+
padding: 0px 8px;
|
|
58
59
|
font-size: 12px;
|
|
60
|
+
border-style: solid;
|
|
61
|
+
border-width: 1px;
|
|
62
|
+
border-color: transparent;
|
|
63
|
+
|
|
64
|
+
&:focus {
|
|
65
|
+
border-color: var(--focusBorder);
|
|
66
|
+
}
|
|
59
67
|
}
|
|
60
68
|
|
|
61
69
|
div {
|
|
@@ -18,5 +18,6 @@ export declare class TerminalCommandContribution implements CommandContribution
|
|
|
18
18
|
protected readonly clipboardService: IClipboardService;
|
|
19
19
|
onReconnect(): void;
|
|
20
20
|
registerCommands(registry: CommandRegistry): void;
|
|
21
|
+
private getNextOrPrevTerminalClient;
|
|
21
22
|
}
|
|
22
23
|
//# sourceMappingURL=terminal.command.d.ts.map
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"terminal.command.d.ts","sourceRoot":"","sources":["../../../src/browser/contribution/terminal.command.ts"],"names":[],"mappings":"AACA,OAAO,EAIL,SAAS,EACT,cAAc,EAEd,eAAe,EACf,iBAAiB,EACjB,mBAAmB,EACnB,0BAA0B,EAC1B,OAAO,EACP,iBAAiB,EAElB,MAAM,4BAA4B,CAAC;AAEpC,OAAO,EACL,mBAAmB,EACnB,gBAAgB,EAChB,yBAAyB,EACzB,sBAAsB,EACtB,mBAAmB,
|
|
1
|
+
{"version":3,"file":"terminal.command.d.ts","sourceRoot":"","sources":["../../../src/browser/contribution/terminal.command.ts"],"names":[],"mappings":"AACA,OAAO,EAIL,SAAS,EACT,cAAc,EAEd,eAAe,EACf,iBAAiB,EACjB,mBAAmB,EACnB,0BAA0B,EAC1B,OAAO,EACP,iBAAiB,EAElB,MAAM,4BAA4B,CAAC;AAEpC,OAAO,EACL,mBAAmB,EACnB,gBAAgB,EAChB,yBAAyB,EACzB,sBAAsB,EACtB,mBAAmB,EAGpB,MAAM,cAAc,CAAC;AACtB,OAAO,EAAE,0BAA0B,EAAE,MAAM,iCAAiC,CAAC;AAC7E,OAAO,EAAE,4BAA4B,EAAE,MAAM,mBAAmB,CAAC;AAIjE,qBACa,2BAA4B,YAAW,mBAAmB;IAErE,SAAS,CAAC,QAAQ,CAAC,kBAAkB,EAAE,mBAAmB,CAAC;IAG3D,SAAS,CAAC,QAAQ,CAAC,0BAA0B,EAAE,0BAA0B,CAAC;IAG1E,SAAS,CAAC,QAAQ,CAAC,IAAI,EAAE,yBAAyB,CAAC;IAGnD,SAAS,CAAC,QAAQ,CAAC,MAAM,EAAE,sBAAsB,CAAC;IAGlD,SAAS,CAAC,QAAQ,CAAC,KAAK,EAAE,gBAAgB,CAAC;IAG3C,SAAS,CAAC,QAAQ,CAAC,WAAW,EAAE,mBAAmB,CAAC;IAGpD,SAAS,CAAC,QAAQ,CAAC,UAAU,EAAE,iBAAiB,CAAC;IAGjD,SAAS,CAAC,QAAQ,CAAC,cAAc,EAAE,0BAA0B,CAAC;IAG9D,SAAS,CAAC,QAAQ,CAAC,QAAQ,EAAE,cAAc,CAAC;IAG5C,SAAS,CAAC,QAAQ,CAAC,MAAM,EAAE,SAAS,CAAC;IAGrC,SAAS,CAAC,QAAQ,CAAC,aAAa,EAAE,4BAA4B,CAAC;IAG/D,SAAS,CAAC,QAAQ,CAAC,MAAM,EAAE,OAAO,CAAC;IAGnC,SAAS,CAAC,QAAQ,CAAC,gBAAgB,EAAE,iBAAiB,CAAC;IAEvD,WAAW;IAIX,gBAAgB,CAAC,QAAQ,EAAE,eAAe;IAgP1C,OAAO,CAAC,2BAA2B;CAcpC"}
|
|
@@ -28,11 +28,19 @@ let TerminalCommandContribution = class TerminalCommandContribution {
|
|
|
28
28
|
},
|
|
29
29
|
});
|
|
30
30
|
// 删除所有终端
|
|
31
|
-
registry.registerCommand(
|
|
31
|
+
registry.registerCommand(common_1.TERMINAL_COMMANDS.CLEAR, {
|
|
32
32
|
execute: () => {
|
|
33
33
|
this.view.clear();
|
|
34
34
|
},
|
|
35
35
|
});
|
|
36
|
+
registry.registerCommand(common_1.TERMINAL_COMMANDS.ADD, {
|
|
37
|
+
execute: async () => {
|
|
38
|
+
await this.terminalController.createClientWithWidget2({
|
|
39
|
+
terminalOptions: {},
|
|
40
|
+
});
|
|
41
|
+
this.terminalController.showTerminalPanel();
|
|
42
|
+
},
|
|
43
|
+
});
|
|
36
44
|
registry.registerCommand(common_1.TERMINAL_COMMANDS.SEARCH_NEXT, {
|
|
37
45
|
execute: () => {
|
|
38
46
|
if (this.search.show) {
|
|
@@ -166,6 +174,39 @@ let TerminalCommandContribution = class TerminalCommandContribution {
|
|
|
166
174
|
return env;
|
|
167
175
|
},
|
|
168
176
|
});
|
|
177
|
+
registry.registerCommand(common_1.TERMINAL_COMMANDS.FOCUS_NEXT_TERMINAL, {
|
|
178
|
+
execute: () => {
|
|
179
|
+
const group = this.view.currentGroup;
|
|
180
|
+
if (group.widgets.length <= 1) {
|
|
181
|
+
return;
|
|
182
|
+
}
|
|
183
|
+
const client = this.getNextOrPrevTerminalClient('next');
|
|
184
|
+
client === null || client === void 0 ? void 0 : client.focus();
|
|
185
|
+
},
|
|
186
|
+
});
|
|
187
|
+
registry.registerCommand(common_1.TERMINAL_COMMANDS.FOCUS_PREVIOUS_TERMINAL, {
|
|
188
|
+
execute: () => {
|
|
189
|
+
const group = this.view.currentGroup;
|
|
190
|
+
if (group.widgets.length <= 1) {
|
|
191
|
+
return;
|
|
192
|
+
}
|
|
193
|
+
const client = this.getNextOrPrevTerminalClient('prev');
|
|
194
|
+
client === null || client === void 0 ? void 0 : client.focus();
|
|
195
|
+
},
|
|
196
|
+
});
|
|
197
|
+
}
|
|
198
|
+
getNextOrPrevTerminalClient(kind) {
|
|
199
|
+
const group = this.view.currentGroup;
|
|
200
|
+
const currentIdx = group.widgets.findIndex((w) => w.id === this.view.currentWidgetId);
|
|
201
|
+
let index;
|
|
202
|
+
if (kind === 'next') {
|
|
203
|
+
index = currentIdx === group.widgets.length - 1 ? 0 : currentIdx + 1;
|
|
204
|
+
}
|
|
205
|
+
else {
|
|
206
|
+
index = currentIdx === 0 ? group.widgets.length - 1 : currentIdx - 1;
|
|
207
|
+
}
|
|
208
|
+
const widget = group.widgets[index];
|
|
209
|
+
return this.terminalController.findClientFromWidgetId(widget.id);
|
|
169
210
|
}
|
|
170
211
|
};
|
|
171
212
|
tslib_1.__decorate([
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"terminal.command.js","sourceRoot":"","sources":["../../../src/browser/contribution/terminal.command.ts"],"names":[],"mappings":";;;;AAAA,qCAAyC;AACzC,iEAcoC;AAEpC,
|
|
1
|
+
{"version":3,"file":"terminal.command.js","sourceRoot":"","sources":["../../../src/browser/contribution/terminal.command.ts"],"names":[],"mappings":"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"}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"terminal.keybinding.d.ts","sourceRoot":"","sources":["../../../src/browser/contribution/terminal.keybinding.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,sBAAsB,EAAE,kBAAkB,EAAE,MAAM,4BAA4B,CAAC;AAOxF,qBACa,+BAAgC,YAAW,sBAAsB;IAC5E,mBAAmB,CAAC,QAAQ,EAAE,kBAAkB;
|
|
1
|
+
{"version":3,"file":"terminal.keybinding.d.ts","sourceRoot":"","sources":["../../../src/browser/contribution/terminal.keybinding.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,sBAAsB,EAAE,kBAAkB,EAAE,MAAM,4BAA4B,CAAC;AAOxF,qBACa,+BAAgC,YAAW,sBAAsB;IAC5E,mBAAmB,CAAC,QAAQ,EAAE,kBAAkB;CAmEjD"}
|
|
@@ -46,6 +46,30 @@ let TerminalKeybindinngContribution = class TerminalKeybindinngContribution {
|
|
|
46
46
|
keybinding: 'ctrlcmd+\\',
|
|
47
47
|
when: contextkey_1.IsTerminalFocused.raw,
|
|
48
48
|
});
|
|
49
|
+
registry.registerKeybinding({
|
|
50
|
+
command: common_1.TERMINAL_COMMANDS.ADD.id,
|
|
51
|
+
keybinding: 'ctrl+shift+`',
|
|
52
|
+
});
|
|
53
|
+
registry.registerKeybinding({
|
|
54
|
+
command: common_1.TERMINAL_COMMANDS.FOCUS_NEXT_TERMINAL.id,
|
|
55
|
+
keybinding: 'ctrlcmd+alt+right',
|
|
56
|
+
when: contextkey_1.IsTerminalFocused.raw,
|
|
57
|
+
});
|
|
58
|
+
registry.registerKeybinding({
|
|
59
|
+
command: common_1.TERMINAL_COMMANDS.FOCUS_NEXT_TERMINAL.id,
|
|
60
|
+
keybinding: 'ctrlcmd+alt+down',
|
|
61
|
+
when: contextkey_1.IsTerminalFocused.raw,
|
|
62
|
+
});
|
|
63
|
+
registry.registerKeybinding({
|
|
64
|
+
command: common_1.TERMINAL_COMMANDS.FOCUS_PREVIOUS_TERMINAL.id,
|
|
65
|
+
keybinding: 'ctrlcmd+alt+left',
|
|
66
|
+
when: contextkey_1.IsTerminalFocused.raw,
|
|
67
|
+
});
|
|
68
|
+
registry.registerKeybinding({
|
|
69
|
+
command: common_1.TERMINAL_COMMANDS.FOCUS_PREVIOUS_TERMINAL.id,
|
|
70
|
+
keybinding: 'ctrlcmd+alt+up',
|
|
71
|
+
when: contextkey_1.IsTerminalFocused.raw,
|
|
72
|
+
});
|
|
49
73
|
}
|
|
50
74
|
};
|
|
51
75
|
TerminalKeybindinngContribution = tslib_1.__decorate([
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"terminal.keybinding.js","sourceRoot":"","sources":["../../../src/browser/contribution/terminal.keybinding.ts"],"names":[],"mappings":";;;;AAAA,iEAAwF;AACxF,0EAA8E;AAC9E,oFAA+E;AAC/E,+DAA8D;AAE9D,yCAAiD;AAGjD,IAAa,+BAA+B,GAA5C,MAAa,+BAA+B;IAC1C,mBAAmB,CAAC,QAA4B;QAC9C,QAAQ,CAAC,kBAAkB,CAAC;YAC1B,OAAO,EAAE,0BAAiB,CAAC,WAAW,CAAC,EAAE;YACzC,UAAU,EAAE,WAAW;YACvB,IAAI,EAAE,8BAAiB,CAAC,GAAG;SAC5B,CAAC,CAAC;QACH,QAAQ,CAAC,kBAAkB,CAAC;YAC1B,OAAO,EAAE,0BAAiB,CAAC,aAAa,CAAC,EAAE;YAC3C,UAAU,EAAE,WAAW;YACvB,IAAI,EAAE,8BAAiB,CAAC,GAAG;SAC5B,CAAC,CAAC;QACH,QAAQ,CAAC,kBAAkB,CAAC;YAC1B,OAAO,EAAE,0BAAiB,CAAC,WAAW,CAAC,EAAE;YACzC,UAAU,EAAE,WAAW;YACvB,IAAI,EAAE,8BAAiB,CAAC,GAAG;SAC5B,CAAC,CAAC;QACH,QAAQ,CAAC,kBAAkB,CAAC;YAC1B,OAAO,EAAE,0BAAiB,CAAC,IAAI,CAAC,EAAE;YAClC,UAAU,EAAE,2BAAS,CAAC,CAAC,CAAC,iBAAiB,CAAC,CAAC,CAAC,WAAW;YACvD,iDAAiD;YACjD,IAAI,EAAE,+BAAa,CAAC,GAAG,CAAC,8BAAiB,CAAC,GAAG,EAAE,0BAA0B,CAAC;SAC3E,CAAC,CAAC;QACH,QAAQ,CAAC,kBAAkB,CAAC;YAC1B,OAAO,EAAE,0BAAiB,CAAC,KAAK,CAAC,EAAE;YACnC,UAAU,EAAE,2BAAS,CAAC,CAAC,CAAC,iBAAiB,CAAC,CAAC,CAAC,WAAW;YACvD,iDAAiD;YACjD,IAAI,EAAE,+BAAa,CAAC,GAAG,CAAC,8BAAiB,CAAC,GAAG,EAAE,0BAA0B,CAAC;SAC3E,CAAC,CAAC;QACH,QAAQ,CAAC,kBAAkB,CAAC;YAC1B,OAAO,EAAE,0BAAiB,CAAC,UAAU,CAAC,EAAE;YACxC,UAAU,EAAE,WAAW;YACvB,IAAI,EAAE,8BAAiB,CAAC,GAAG;SAC5B,CAAC,CAAC;QACH,QAAQ,CAAC,kBAAkB,CAAC;YAC1B,OAAO,EAAE,0BAAiB,CAAC,KAAK,CAAC,EAAE;YACnC,UAAU,EAAE,YAAY;YACxB,IAAI,EAAE,8BAAiB,CAAC,GAAG;SAC5B,CAAC,CAAC;IACL,CAAC;CACF,CAAA;
|
|
1
|
+
{"version":3,"file":"terminal.keybinding.js","sourceRoot":"","sources":["../../../src/browser/contribution/terminal.keybinding.ts"],"names":[],"mappings":"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"}
|
|
@@ -2,7 +2,7 @@
|
|
|
2
2
|
Object.defineProperty(exports, "__esModule", { value: true });
|
|
3
3
|
exports.TerminalApiService = void 0;
|
|
4
4
|
const tslib_1 = require("tslib");
|
|
5
|
-
const
|
|
5
|
+
const capitalize_1 = tslib_1.__importDefault(require("lodash/capitalize"));
|
|
6
6
|
const di_1 = require("@opensumi/di");
|
|
7
7
|
const ide_core_common_1 = require("@opensumi/ide-core-common");
|
|
8
8
|
const common_1 = require("../common");
|
|
@@ -99,7 +99,7 @@ let TerminalApiService = class TerminalApiService {
|
|
|
99
99
|
const groupIndex = this.view.createGroup();
|
|
100
100
|
const group = this.view.getGroup(groupIndex);
|
|
101
101
|
const widget = this.view.createWidget(group, widgetId, false, true);
|
|
102
|
-
widget.name = (0,
|
|
102
|
+
widget.name = (0, capitalize_1.default)(uniqName);
|
|
103
103
|
this.view.selectWidget(widgetId);
|
|
104
104
|
widget.onRender(() => {
|
|
105
105
|
widgetRenderFunc(widget.element);
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"terminal.api.js","sourceRoot":"","sources":["../../src/browser/terminal.api.ts"],"names":[],"mappings":";;;;AAAA,
|
|
1
|
+
{"version":3,"file":"terminal.api.js","sourceRoot":"","sources":["../../src/browser/terminal.api.ts"],"names":[],"mappings":"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"}
|
|
@@ -118,6 +118,7 @@ export declare class TerminalClient extends Disposable implements ITerminalClien
|
|
|
118
118
|
selectAll(): void;
|
|
119
119
|
paste(text: string): void;
|
|
120
120
|
findNext(text: string): boolean;
|
|
121
|
+
closeSearch(): void;
|
|
121
122
|
getSelection(): string;
|
|
122
123
|
updateTheme(): void;
|
|
123
124
|
updateOptions(options: TerminalOptions): void;
|
|
@@ -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,EAAE,MAAM,4BAA4B,CAAC;AAC/E,OAAO,EACL,UAAU,EACV,QAAQ,EAER,KAAK,EAEL,OAAO,EACP,WAAW,EAEX,mBAAmB,EACnB,SAAS,EAET,GAAG,EAGJ,MAAM,2BAA2B,CAAC;AACnC,OAAO,EAAE,eAAe,EAAM,MAAM,wCAAwC,CAAC;AAC7E,OAAO,EAAE,sBAAsB,EAAE,MAAM,iCAAiC,CAAC;AACzE,OAAO,EAAE,kBAAkB,EAAE,MAAM,uCAAuC,CAAC;AAC3E,OAAO,EAAE,eAAe,EAAE,MAAM,uBAAuB,CAAC;AACxD,OAAO,EAAE,wBAAwB,EAAE,MAAM,mCAAmC,CAAC;AAC7E,OAAO,EAAE,iBAAiB,EAAE,MAAM,oCAAoC,CAAC;AAEvE,OAAO,EACL,eAAe,EACf,mBAAmB,EACnB,eAAe,EACf,cAAc,EACd,yBAAyB,EACzB,wBAAwB,EACxB,OAAO,EACP,kBAAkB,EAClB,kBAAkB,EAClB,mBAAmB,EACnB,6BAA6B,EAC7B,sBAAsB,EACtB,uBAAuB,EACvB,gBAAgB,EAChB,kBAAkB,EAClB,+BAA+B,EAEhC,MAAM,WAAW,CAAC;AACnB,OAAO,EAAmC,2BAA2B,EAAE,MAAM,+BAA+B,CAAC;AAC7G,OAAO,
|
|
1
|
+
{"version":3,"file":"terminal.client.d.ts","sourceRoot":"","sources":["../../src/browser/terminal.client.ts"],"names":[],"mappings":"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"}
|
|
@@ -43,7 +43,7 @@ let TerminalClient = TerminalClient_1 = class TerminalClient extends ide_core_co
|
|
|
43
43
|
this.name = '';
|
|
44
44
|
this.xterm = this.injector.get(xterm_1.XTerm, [
|
|
45
45
|
{
|
|
46
|
-
xtermOptions: Object.assign(Object.assign({ theme: this.theme.terminalTheme }, this.
|
|
46
|
+
xtermOptions: Object.assign(Object.assign({ theme: this.theme.terminalTheme }, this.internalService.getOptions()), this.preference.toJSON()),
|
|
47
47
|
},
|
|
48
48
|
]);
|
|
49
49
|
this.addDispose(this.xterm);
|
|
@@ -64,6 +64,11 @@ let TerminalClient = TerminalClient_1 = class TerminalClient extends ide_core_co
|
|
|
64
64
|
});
|
|
65
65
|
}
|
|
66
66
|
}));
|
|
67
|
+
this.addDispose(this.internalService.onProcessChange((e) => {
|
|
68
|
+
if (e.sessionId === this.id) {
|
|
69
|
+
this.widget.processName = e.processName;
|
|
70
|
+
}
|
|
71
|
+
}));
|
|
67
72
|
}
|
|
68
73
|
onWidgetShow() {
|
|
69
74
|
if (this._show) {
|
|
@@ -86,6 +91,9 @@ let TerminalClient = TerminalClient_1 = class TerminalClient extends ide_core_co
|
|
|
86
91
|
await this._show.promise;
|
|
87
92
|
}
|
|
88
93
|
this._setOption(name, value);
|
|
94
|
+
this.xterm.updatePreferences({
|
|
95
|
+
[name]: value,
|
|
96
|
+
});
|
|
89
97
|
}));
|
|
90
98
|
// 在拆分终端时,widget 渲染的时机会比较早
|
|
91
99
|
// 如果 widget show 已经为 true,确保
|
|
@@ -288,6 +296,7 @@ let TerminalClient = TerminalClient_1 = class TerminalClient extends ide_core_co
|
|
|
288
296
|
this._onLinksReady.fire(this);
|
|
289
297
|
}
|
|
290
298
|
_doResize() {
|
|
299
|
+
// TODO: debounce
|
|
291
300
|
this.internalService.resize(this.id, this.xterm.raw.cols, this.xterm.raw.rows);
|
|
292
301
|
}
|
|
293
302
|
_prepare() {
|
|
@@ -319,6 +328,7 @@ let TerminalClient = TerminalClient_1 = class TerminalClient extends ide_core_co
|
|
|
319
328
|
var _a;
|
|
320
329
|
this._layout();
|
|
321
330
|
this.attach();
|
|
331
|
+
this.focus();
|
|
322
332
|
if (!this.widget.show) {
|
|
323
333
|
(_a = this._show) === null || _a === void 0 ? void 0 : _a.promise.then(async () => {
|
|
324
334
|
this._show = new ide_core_common_1.Deferred();
|
|
@@ -392,7 +402,6 @@ let TerminalClient = TerminalClient_1 = class TerminalClient extends ide_core_co
|
|
|
392
402
|
return;
|
|
393
403
|
}
|
|
394
404
|
this._attachAddon.setConnection(connection);
|
|
395
|
-
this.name = this.name || connection.name || 'shell';
|
|
396
405
|
this._ready = true;
|
|
397
406
|
this._attached.resolve();
|
|
398
407
|
this._widget.name = this.name;
|
|
@@ -473,6 +482,9 @@ let TerminalClient = TerminalClient_1 = class TerminalClient extends ide_core_co
|
|
|
473
482
|
this._checkReady();
|
|
474
483
|
return this.xterm.findNext(text);
|
|
475
484
|
}
|
|
485
|
+
closeSearch() {
|
|
486
|
+
this.xterm.closeSearch();
|
|
487
|
+
}
|
|
476
488
|
getSelection() {
|
|
477
489
|
this._checkReady();
|
|
478
490
|
if (this.xterm.raw.hasSelection()) {
|