@opensumi/ide-terminal-next 2.27.3-rc-1711024024.0 → 2.27.3-rc-1711356268.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/resize.module.less +23 -1
- package/lib/browser/component/resize.view.d.ts.map +1 -1
- package/lib/browser/component/resize.view.js +12 -1
- package/lib/browser/component/resize.view.js.map +1 -1
- package/lib/node/easy-shell-intergration.d.ts +9 -0
- package/lib/node/easy-shell-intergration.d.ts.map +1 -0
- package/lib/node/easy-shell-intergration.js +54 -0
- package/lib/node/easy-shell-intergration.js.map +1 -0
- package/lib/node/pty.d.ts.map +1 -1
- package/lib/node/pty.js +13 -0
- package/lib/node/pty.js.map +1 -1
- package/package.json +16 -16
- package/src/browser/component/resize.module.less +23 -1
- package/src/browser/component/resize.view.tsx +17 -0
- package/src/node/easy-shell-intergration.ts +53 -0
- package/src/node/pty.ts +13 -0
|
@@ -16,10 +16,32 @@
|
|
|
16
16
|
justify-content: flex-end;
|
|
17
17
|
|
|
18
18
|
.resizeItem {
|
|
19
|
+
position: relative;
|
|
19
20
|
width: 100%;
|
|
20
21
|
height: 100%;
|
|
21
22
|
overflow: hidden;
|
|
22
|
-
padding: 8px
|
|
23
|
+
padding: 8px 20px 0 10px;
|
|
24
|
+
.closeBtn {
|
|
25
|
+
display: none;
|
|
26
|
+
position: absolute;
|
|
27
|
+
right: 12px;
|
|
28
|
+
top: 10px;
|
|
29
|
+
cursor: pointer;
|
|
30
|
+
border-radius: 4px;
|
|
31
|
+
font-size: 14px;
|
|
32
|
+
width: 16px;
|
|
33
|
+
height: 16px;
|
|
34
|
+
line-height: 16px;
|
|
35
|
+
&:hover {
|
|
36
|
+
background-color: var(--kt-icon-hoverBackground);
|
|
37
|
+
transform: scale(1.1);
|
|
38
|
+
}
|
|
39
|
+
}
|
|
40
|
+
&:hover {
|
|
41
|
+
.closeBtn {
|
|
42
|
+
display: block;
|
|
43
|
+
}
|
|
44
|
+
}
|
|
23
45
|
}
|
|
24
46
|
}
|
|
25
47
|
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"resize.view.d.ts","sourceRoot":"","sources":["../../../src/browser/component/resize.view.tsx"],"names":[],"mappings":"
|
|
1
|
+
{"version":3,"file":"resize.view.d.ts","sourceRoot":"","sources":["../../../src/browser/component/resize.view.tsx"],"names":[],"mappings":"AAEA,OAAO,KAAK,MAAM,OAAO,CAAC;AAK1B,OAAO,EAAE,OAAO,EAAE,YAAY,EAAE,MAAM,qBAAqB,CAAC;AAK5D,oBAAY,eAAe;IACzB,QAAQ,IAAA;IACR,UAAU,IAAA;CACX;AAED,MAAM,WAAW,gBAAgB;IAC/B,SAAS,EAAE,eAAe,CAAC;IAC3B,OAAO,EAAE,OAAO,CAAC;IACjB,MAAM,EAAE,OAAO,CAAC;IAChB,KAAK,EAAE,YAAY,CAAC;IACpB,IAAI,EAAE,CAAC,MAAM,EAAE,OAAO,KAAK,GAAG,CAAC,OAAO,CAAC;CACxC;iCAE+B,gBAAgB;;;AAAhD,wBA4EG"}
|
|
@@ -2,8 +2,11 @@
|
|
|
2
2
|
Object.defineProperty(exports, "__esModule", { value: true });
|
|
3
3
|
exports.ResizeDirection = void 0;
|
|
4
4
|
const tslib_1 = require("tslib");
|
|
5
|
+
const classnames_1 = tslib_1.__importDefault(require("classnames"));
|
|
5
6
|
const mobx_react_lite_1 = require("mobx-react-lite");
|
|
6
7
|
const react_1 = tslib_1.__importDefault(require("react"));
|
|
8
|
+
const ide_core_browser_1 = require("@opensumi/ide-core-browser");
|
|
9
|
+
const controller_1 = require("../../common/controller");
|
|
7
10
|
const resize_delegate_1 = tslib_1.__importDefault(require("./resize.delegate"));
|
|
8
11
|
const resize_module_less_1 = tslib_1.__importDefault(require("./resize.module.less"));
|
|
9
12
|
var ResizeDirection;
|
|
@@ -15,12 +18,16 @@ exports.default = (0, mobx_react_lite_1.observer)((props) => {
|
|
|
15
18
|
const { group, shadow } = props;
|
|
16
19
|
const [event, setEvent] = react_1.default.useState(false);
|
|
17
20
|
const [wholeWidth, setWholeWidth] = react_1.default.useState(Infinity);
|
|
21
|
+
const view = (0, ide_core_browser_1.useInjectable)(controller_1.ITerminalGroupViewService);
|
|
18
22
|
const whole = react_1.default.useRef(null);
|
|
19
23
|
react_1.default.useEffect(() => {
|
|
20
24
|
if (whole.current && whole.current.clientHeight !== wholeWidth) {
|
|
21
25
|
setWholeWidth(whole.current.clientWidth);
|
|
22
26
|
}
|
|
23
27
|
});
|
|
28
|
+
const handleRemoveWidget = react_1.default.useCallback((widgetId) => {
|
|
29
|
+
view.removeWidget(widgetId);
|
|
30
|
+
}, []);
|
|
24
31
|
return (react_1.default.createElement("div", { className: resize_module_less_1.default.resizeWrapper, ref: whole },
|
|
25
32
|
react_1.default.createElement("div", { style: {
|
|
26
33
|
pointerEvents: event ? 'all' : 'none',
|
|
@@ -35,6 +42,10 @@ exports.default = (0, mobx_react_lite_1.observer)((props) => {
|
|
|
35
42
|
react_1.default.createElement("div", { style: {
|
|
36
43
|
pointerEvents: !event ? 'all' : 'none',
|
|
37
44
|
}, className: resize_module_less_1.default.resizePanel }, group &&
|
|
38
|
-
group.widgets.map((widget) => (react_1.default.createElement("div", { key: widget.id, style: { width: `${shadow ? widget.dynamic : widget.shadowDynamic}%` }, className: resize_module_less_1.default.resizeItem },
|
|
45
|
+
group.widgets.map((widget) => (react_1.default.createElement("div", { key: widget.id, style: { width: `${shadow ? widget.dynamic : widget.shadowDynamic}%` }, className: resize_module_less_1.default.resizeItem },
|
|
46
|
+
props.draw(widget),
|
|
47
|
+
group.widgets.length > 1 && (react_1.default.createElement("div", { className: (0, classnames_1.default)(resize_module_less_1.default.closeBtn, (0, ide_core_browser_1.getIcon)('close')), onClick: () => {
|
|
48
|
+
handleRemoveWidget(widget.id);
|
|
49
|
+
} }))))))));
|
|
39
50
|
});
|
|
40
51
|
//# sourceMappingURL=resize.view.js.map
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"resize.view.js","sourceRoot":"","sources":["../../../src/browser/component/resize.view.tsx"],"names":[],"mappings":";;;;AAAA,qDAA2C;AAC3C,0DAA0B;
|
|
1
|
+
{"version":3,"file":"resize.view.js","sourceRoot":"","sources":["../../../src/browser/component/resize.view.tsx"],"names":[],"mappings":"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"}
|
|
@@ -0,0 +1,9 @@
|
|
|
1
|
+
export declare const shellIntergrationDirPath: string;
|
|
2
|
+
export declare const bashIntergrationPath: string;
|
|
3
|
+
/**
|
|
4
|
+
注入的 bash initfile，用于 ShellIntergration 功能的搭建
|
|
5
|
+
后续会针对 ShellIntergation 做整体的架构设计，目前满足基础功能需求
|
|
6
|
+
*/
|
|
7
|
+
export declare const bashIntergrationContent: string;
|
|
8
|
+
export declare const initShellIntergrationFile: () => Promise<void>;
|
|
9
|
+
//# sourceMappingURL=easy-shell-intergration.d.ts.map
|
|
@@ -0,0 +1 @@
|
|
|
1
|
+
{"version":3,"file":"easy-shell-intergration.d.ts","sourceRoot":"","sources":["../../src/node/easy-shell-intergration.ts"],"names":[],"mappings":"AAMA,eAAO,MAAM,wBAAwB,QAA8D,CAAC;AAEpG,eAAO,MAAM,oBAAoB,QAAgE,CAAC;AAElG;;;GAGG;AACH,eAAO,MAAM,uBAAuB,QAiCnC,CAAC;AAEF,eAAO,MAAM,yBAAyB,qBAGrC,CAAC"}
|
|
@@ -0,0 +1,54 @@
|
|
|
1
|
+
"use strict";
|
|
2
|
+
Object.defineProperty(exports, "__esModule", { value: true });
|
|
3
|
+
exports.initShellIntergrationFile = exports.bashIntergrationContent = exports.bashIntergrationPath = exports.shellIntergrationDirPath = void 0;
|
|
4
|
+
const tslib_1 = require("tslib");
|
|
5
|
+
const os_1 = tslib_1.__importDefault(require("os"));
|
|
6
|
+
const path_1 = tslib_1.__importDefault(require("path"));
|
|
7
|
+
const fs_extra_1 = tslib_1.__importDefault(require("fs-extra"));
|
|
8
|
+
// 未来适配 OpenSumi 的时候需要调整
|
|
9
|
+
exports.shellIntergrationDirPath = path_1.default.join(os_1.default.tmpdir(), '.sumi-shell', 'shell-intergration');
|
|
10
|
+
exports.bashIntergrationPath = path_1.default.join(exports.shellIntergrationDirPath, 'bash-intergration.bash');
|
|
11
|
+
/**
|
|
12
|
+
注入的 bash initfile，用于 ShellIntergration 功能的搭建
|
|
13
|
+
后续会针对 ShellIntergation 做整体的架构设计，目前满足基础功能需求
|
|
14
|
+
*/
|
|
15
|
+
exports.bashIntergrationContent = String.raw `
|
|
16
|
+
|
|
17
|
+
if [ -r /etc/profile ]; then
|
|
18
|
+
. /etc/profile
|
|
19
|
+
fi
|
|
20
|
+
if [ -r ~/.bashrc ]; then
|
|
21
|
+
. ~/.bashrc
|
|
22
|
+
fi
|
|
23
|
+
if [ -r ~/.bash_profile ]; then
|
|
24
|
+
. ~/.bash_profile
|
|
25
|
+
elif [ -r ~/.bash_login ]; then
|
|
26
|
+
. ~/.bash_login
|
|
27
|
+
elif [ -r ~/.profile ]; then
|
|
28
|
+
. ~/.profile
|
|
29
|
+
fi
|
|
30
|
+
|
|
31
|
+
__is_prompt_start() {
|
|
32
|
+
builtin printf '\e]6973;PS\a'
|
|
33
|
+
}
|
|
34
|
+
|
|
35
|
+
__is_prompt_end() {
|
|
36
|
+
builtin printf '\e]6973;PE\a'
|
|
37
|
+
}
|
|
38
|
+
|
|
39
|
+
__is_update_prompt() {
|
|
40
|
+
if [[ "$__is_custom_PS1" == "" || "$__is_custom_PS1" != "$PS1" ]]; then
|
|
41
|
+
__is_original_PS1=$PS1
|
|
42
|
+
__is_custom_PS1="\[$(__is_prompt_start)\]$__is_original_PS1\[$(__is_prompt_end)\]"
|
|
43
|
+
export PS1="$__is_custom_PS1"
|
|
44
|
+
fi
|
|
45
|
+
}
|
|
46
|
+
|
|
47
|
+
__is_update_prompt
|
|
48
|
+
`;
|
|
49
|
+
const initShellIntergrationFile = async () => {
|
|
50
|
+
await fs_extra_1.default.mkdirp(exports.shellIntergrationDirPath);
|
|
51
|
+
await fs_extra_1.default.writeFile(exports.bashIntergrationPath, exports.bashIntergrationContent);
|
|
52
|
+
};
|
|
53
|
+
exports.initShellIntergrationFile = initShellIntergrationFile;
|
|
54
|
+
//# sourceMappingURL=easy-shell-intergration.js.map
|
|
@@ -0,0 +1 @@
|
|
|
1
|
+
{"version":3,"file":"easy-shell-intergration.js","sourceRoot":"","sources":["../../src/node/easy-shell-intergration.ts"],"names":[],"mappings":";;;;AAAA,oDAAoB;AACpB,wDAAwB;AAExB,gEAA0B;AAE1B,wBAAwB;AACX,QAAA,wBAAwB,GAAG,cAAI,CAAC,IAAI,CAAC,YAAE,CAAC,MAAM,EAAE,EAAE,aAAa,EAAE,oBAAoB,CAAC,CAAC;AAEvF,QAAA,oBAAoB,GAAG,cAAI,CAAC,IAAI,CAAC,gCAAwB,EAAE,wBAAwB,CAAC,CAAC;AAElG;;;GAGG;AACU,QAAA,uBAAuB,GAAG,MAAM,CAAC,GAAG,CAAA;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;CAiChD,CAAC;AAEK,MAAM,yBAAyB,GAAG,KAAK,IAAI,EAAE;IAClD,MAAM,kBAAE,CAAC,MAAM,CAAC,gCAAwB,CAAC,CAAC;IAC1C,MAAM,kBAAE,CAAC,SAAS,CAAC,4BAAoB,EAAE,+BAAuB,CAAC,CAAC;AACpE,CAAC,CAAC;AAHW,QAAA,yBAAyB,6BAGpC"}
|
package/lib/node/pty.d.ts.map
CHANGED
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"pty.d.ts","sourceRoot":"","sources":["../../src/node/pty.ts"],"names":[],"mappings":"AAWA,OAAO,KAAK,GAAG,MAAM,UAAU,CAAC;AAIhC,OAAO,EAAE,UAAU,EAAW,WAAW,EAAwB,MAAM,yBAAyB,CAAC;AAGjG,OAAO,EAAE,kBAAkB,EAAE,oBAAoB,EAAE,MAAM,WAAW,CAAC;AACrE,OAAO,EAAE,iBAAiB,EAAE,kBAAkB,EAAE,MAAM,mBAAmB,CAAC;AAC1E,OAAO,EAAE,gBAAgB,EAAoB,MAAM,eAAe,CAAC;
|
|
1
|
+
{"version":3,"file":"pty.d.ts","sourceRoot":"","sources":["../../src/node/pty.ts"],"names":[],"mappings":"AAWA,OAAO,KAAK,GAAG,MAAM,UAAU,CAAC;AAIhC,OAAO,EAAE,UAAU,EAAW,WAAW,EAAwB,MAAM,yBAAyB,CAAC;AAGjG,OAAO,EAAE,kBAAkB,EAAE,oBAAoB,EAAE,MAAM,WAAW,CAAC;AACrE,OAAO,EAAE,iBAAiB,EAAE,kBAAkB,EAAE,MAAM,mBAAmB,CAAC;AAC1E,OAAO,EAAE,gBAAgB,EAAoB,MAAM,eAAe,CAAC;AAGnE,OAAO,EAAE,kBAAkB,EAA0B,MAAM,eAAe,CAAC;AAG3E,eAAO,MAAM,WAAW,eAAwB,CAAC;AAEjD,qBACa,UAAW,SAAQ,UAAU;IA+BrB,EAAE,EAAE,MAAM;aAAkB,iBAAiB,EAAE,kBAAkB;IA7BpF,SAAS,CAAC,QAAQ,CAAC,MAAM,EAAE,WAAW,CAAC;IAGvC,SAAS,CAAC,QAAQ,CAAC,iBAAiB,EAAE,kBAAkB,CAAC;IAEzD,SAAS,CAAC,QAAQ,CAAC,WAAW,EAAE,GAAG,CAAC,eAAe,GAAG,GAAG,CAAC,sBAAsB,CAAC;IACjF,OAAO,CAAC,WAAW,CAA+B;IAElD,OAAO,CAAC,QAAQ,CAAC,OAAO,CAAyB;IACjD,QAAQ,CAAC,MAAM,kDAAsB;IAErC,OAAO,CAAC,QAAQ,CAAC,QAAQ,CAAqC;IAC9D,QAAQ,CAAC,OAAO,8DAAuB;IAEvC,OAAO,CAAC,QAAQ,CAAC,OAAO,CAAoC;IAC5D,QAAQ,CAAC,MAAM,6DAAsB;IAGrC,OAAO,CAAC,QAAQ,CAAC,SAAS,CAAS;IAEnC,OAAO,CAAC,QAAQ,CAAC,gBAAgB,CAAyB;IAC1D,QAAQ,CAAC,eAAe,kDAA+B;IAEvD,OAAO,CAAC,iBAAiB,CAAqB;IAE9C,IAAI,GAAG,iCAEN;gBAEkB,EAAE,EAAE,MAAM,EAAkB,iBAAiB,EAAE,kBAAkB,EAAE,IAAI,EAAE,MAAM,EAAE,IAAI,EAAE,MAAM;IAsB1G,IAAI,IAAI,OAAO,CAAC,IAAI,CAAC;IAYrB,YAAY,IAAI,OAAO,CAAC,oBAAoB,GAAG,SAAS,CAAC;IAuBzD,mBAAmB,IAAI,OAAO,CAAC,oBAAoB,GAAG,SAAS,CAAC;IAiChE,KAAK,IAAI,OAAO,CAAC,oBAAoB,GAAG,SAAS,CAAC;cAgExC,eAAe;IAwC/B,OAAO,CAAC,cAAc;IAMtB,QAAQ;IASR,YAAY;IAIZ,MAAM;IAIA,MAAM;IAOZ,MAAM,CAAC,IAAI,EAAE,MAAM,EAAE,IAAI,EAAE,MAAM;IASjC,SAAS,CAAC,IAAI,EAAE,MAAM;CAGvB"}
|
package/lib/node/pty.js
CHANGED
|
@@ -14,6 +14,7 @@ const osLocale = tslib_1.__importStar(require("os-locale"));
|
|
|
14
14
|
const di_1 = require("@opensumi/di");
|
|
15
15
|
const ide_core_node_1 = require("@opensumi/ide-core-node");
|
|
16
16
|
const shell_path_1 = require("@opensumi/ide-core-node/lib/bootstrap/shell-path");
|
|
17
|
+
const easy_shell_intergration_1 = require("./easy-shell-intergration");
|
|
17
18
|
const pty_manager_1 = require("./pty.manager");
|
|
18
19
|
const shell_1 = require("./shell");
|
|
19
20
|
exports.IPtyService = Symbol('IPtyService');
|
|
@@ -121,6 +122,7 @@ let PtyService = class PtyService extends ide_core_node_1.Disposable {
|
|
|
121
122
|
}
|
|
122
123
|
}
|
|
123
124
|
async start() {
|
|
125
|
+
var _a;
|
|
124
126
|
const options = this.shellLaunchConfig;
|
|
125
127
|
const locale = await osLocale.default();
|
|
126
128
|
let ptyEnv;
|
|
@@ -148,6 +150,17 @@ let PtyService = class PtyService extends ide_core_node_1.Disposable {
|
|
|
148
150
|
PATH: await (0, shell_path_1.getShellPath)(),
|
|
149
151
|
}, options.env);
|
|
150
152
|
}
|
|
153
|
+
// HACK: 这里的处理逻辑有些黑，后续需要整体去整理下 Shell Intergration，然后整体优化一下
|
|
154
|
+
// 如果是启动 bash，则使用 init file 植入 Intergration 能力
|
|
155
|
+
if ((_a = options.executable) === null || _a === void 0 ? void 0 : _a.includes('bash')) {
|
|
156
|
+
await (0, easy_shell_intergration_1.initShellIntergrationFile)();
|
|
157
|
+
if (!options.args) {
|
|
158
|
+
options.args = [];
|
|
159
|
+
}
|
|
160
|
+
if (Array.isArray(options.args)) {
|
|
161
|
+
options.args.push('--init-file', easy_shell_intergration_1.bashIntergrationPath);
|
|
162
|
+
}
|
|
163
|
+
}
|
|
151
164
|
this._ptyOptions['env'] = ptyEnv;
|
|
152
165
|
const results = await Promise.all([this._validateCwd(), this._validateExecutable()]);
|
|
153
166
|
const firstError = results.find((r) => r !== undefined);
|
package/lib/node/pty.js.map
CHANGED
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"pty.js","sourceRoot":"","sources":["../../src/node/pty.ts"],"names":[],"mappings":"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
|
|
1
|
+
{"version":3,"file":"pty.js","sourceRoot":"","sources":["../../src/node/pty.ts"],"names":[],"mappings":";AAAA;;;gGAGgG;;;;AAEhG,sIAAsI;AAEtI,2BAA8B;AAC9B,oDAAoB;AAEpB,+DAA+B;AAE/B,4DAAsC;AAEtC,qCAAqD;AACrD,2DAAiG;AACjG,iFAAgF;AAMhF,uEAA4F;AAC5F,+CAA2E;AAC3E,mCAAyC;AAE5B,QAAA,WAAW,GAAG,MAAM,CAAC,aAAa,CAAC,CAAC;AAG1C,IAAM,UAAU,GAAhB,MAAM,UAAW,SAAQ,0BAAU;IA2BxC,IAAI,GAAG;QACL,OAAO,IAAI,CAAC,WAAW,CAAC;IAC1B,CAAC;IAED,YAAmB,EAAU,EAAkB,iBAAqC,EAAE,IAAY,EAAE,IAAY;QAC9G,KAAK,EAAE,CAAC;QADS,OAAE,GAAF,EAAE,CAAQ;QAAkB,sBAAiB,GAAjB,iBAAiB,CAAoB;QArBnE,YAAO,GAAG,IAAI,uBAAO,EAAU,CAAC;QACxC,WAAM,GAAG,IAAI,CAAC,OAAO,CAAC,KAAK,CAAC;QAEpB,aAAQ,GAAG,IAAI,uBAAO,EAAsB,CAAC;QACrD,YAAO,GAAG,IAAI,CAAC,QAAQ,CAAC,KAAK,CAAC;QAEtB,YAAO,GAAG,IAAI,uBAAO,EAAqB,CAAC;QACnD,WAAM,GAAG,IAAI,CAAC,OAAO,CAAC,KAAK,CAAC;QAKpB,qBAAgB,GAAG,IAAI,uBAAO,EAAU,CAAC;QACjD,oBAAe,GAAG,IAAI,CAAC,gBAAgB,CAAC,KAAK,CAAC;QAUrD,IAAI,IAAY,CAAC;QACjB,IAAI,yBAAS,EAAE;YACb,IAAI,GAAG,oBAAI,CAAC,QAAQ,CAAC,IAAI,CAAC,iBAAiB,CAAC,UAAU,IAAI,EAAE,CAAC,CAAC;SAC/D;aAAM;YACL,+FAA+F;YAC/F,yDAAyD;YACzD,IAAI,GAAG,gBAAgB,CAAC;SACzB;QAED,MAAM,GAAG,GAAG,IAAI,CAAC,QAAQ,EAAE,CAAC;QAC5B,IAAI,CAAC,WAAW,GAAG;YACjB,IAAI;YACJ,GAAG;YACH,GAAG,EAAE,iBAAiB,CAAC,GAAgC;YACvD,IAAI;YACJ,IAAI;SACL,CAAC;QACF,IAAI,CAAC,SAAS,GAAG,EAAE,CAAC;IACtB,CAAC;IAED,KAAK,CAAC,IAAI;QACR,IAAI,IAAI,CAAC,QAAQ,EAAE;YACjB,OAAO;SACR;QAED,IAAI;YACF,IAAI,IAAI,CAAC,WAAW,EAAE;gBACpB,IAAI,CAAC,WAAW,CAAC,IAAI,EAAE,CAAC;aACzB;SACF;QAAC,OAAO,EAAE,EAAE,GAAE;IACjB,CAAC;IAED,KAAK,CAAC,YAAY;QAChB,MAAM,EAAE,GAAG,EAAE,GAAG,IAAI,CAAC,WAAW,CAAC;QACjC,IAAI,GAAG,EAAE;YACP,IAAI;gBACF,MAAM,MAAM,GAAG,MAAM,aAAQ,CAAC,IAAI,CAAC,GAAG,CAAC,CAAC;gBACxC,IAAI,CAAC,MAAM,CAAC,WAAW,EAAE,EAAE;oBACzB,OAAO;wBACL,OAAO,EAAE,6BAA6B,GAAG,sBAAsB;qBAChE,CAAC;iBACH;aACF;YAAC,OAAO,GAAG,EAAE;gBACZ,IAAI,CAAA,GAAG,aAAH,GAAG,uBAAH,GAAG,CAAE,IAAI,MAAK,QAAQ,EAAE;oBAC1B,OAAO;wBACL,OAAO,EAAE,6BAA6B,GAAG,kBAAkB;qBAC5D,CAAC;iBACH;aACF;SACF;aAAM;YACL,OAAO;gBACL,OAAO,EAAE,6BAA6B;aACvC,CAAC;SACH;IACH,CAAC;IACD,KAAK,CAAC,mBAAmB;QACvB,MAAM,OAAO,GAAG,IAAI,CAAC,iBAAiB,CAAC;QACvC,MAAM,EAAE,GAAG,EAAE,GAAG,IAAI,CAAC,WAAW,CAAC;QACjC,IAAI,CAAC,OAAO,CAAC,UAAU,EAAE;YACvB,OAAO;gBACL,OAAO,EAAE,uCAAuC;aACjD,CAAC;SACH;QACD,IAAI;YACF,MAAM,MAAM,GAAG,MAAM,aAAQ,CAAC,IAAI,CAAC,OAAO,CAAC,UAAU,CAAC,CAAC;YACvD,IAAI,CAAC,MAAM,CAAC,MAAM,EAAE,IAAI,CAAC,MAAM,CAAC,cAAc,EAAE,EAAE;gBAChD,OAAO;oBACL,OAAO,EAAE,6BAA6B,OAAO,CAAC,UAAU,8BAA8B;iBACvF,CAAC;aACH;SACF;QAAC,OAAO,GAAG,EAAE;YACZ,IAAI,CAAA,GAAG,aAAH,GAAG,uBAAH,GAAG,CAAE,IAAI,MAAK,QAAQ,EAAE;gBAC1B,wEAAwE;gBACxE,MAAM,QAAQ,GACZ,OAAO,CAAC,GAAG,IAAI,OAAO,CAAC,GAAG,CAAC,IAAI,CAAC,CAAC,CAAC,OAAO,CAAC,GAAG,CAAC,IAAI,CAAC,KAAK,CAAC,oBAAI,CAAC,SAAS,CAAC,CAAC,CAAC,CAAC,SAAS,CAAC;gBACvF,MAAM,UAAU,GAAG,MAAM,IAAA,sBAAc,EAAC,OAAO,CAAC,UAAU,EAAE,GAAG,EAAE,QAAQ,CAAC,CAAC;gBAC3E,IAAI,CAAC,UAAU,EAAE;oBACf,OAAO;wBACL,OAAO,EAAE,6BAA6B,OAAO,CAAC,UAAU,kBAAkB;qBAC3E,CAAC;iBACH;gBACD,iFAAiF;gBACjF,aAAa;gBACb,OAAO,CAAC,UAAU,GAAG,UAAU,CAAC;aACjC;SACF;IACH,CAAC;IAED,KAAK,CAAC,KAAK;;QACT,MAAM,OAAO,GAAG,IAAI,CAAC,iBAAiB,CAAC;QAEvC,MAAM,MAAM,GAAG,MAAM,QAAQ,CAAC,OAAO,EAAE,CAAC;QACxC,IAAI,MAAiC,CAAC;QAEtC,IAAI,OAAO,CAAC,SAAS,EAAE;YACrB,MAAM,GAAG,OAAO,CAAC,GAAgC,CAAC;SACnD;aAAM;YACL,MAAM,GAAG,MAAM,CAAC,MAAM,CACpB,EAAE,EACF,IAAA,cAAI,EAAC,OAAO,CAAC,GAAG,EAAE;gBAChB,YAAY;gBACZ,sBAAsB;gBACtB,eAAe;gBACf,eAAe;gBACf,uBAAuB;gBACvB,mBAAmB;gBACnB,sBAAsB;aACvB,CAAC,EACF;gBACE,MAAM,EAAE,GAAG,MAAM,CAAC,OAAO,CAAC,GAAG,EAAE,GAAG,CAAC,QAAQ;gBAC3C,IAAI,EAAE,GAAG,MAAM,CAAC,OAAO,CAAC,GAAG,EAAE,GAAG,CAAC,QAAQ;gBACzC;;;;;mBAKG;gBACH,IAAI,EAAE,MAAM,IAAA,yBAAY,GAAE;aAC3B,EACD,OAAO,CAAC,GAAG,CACiB,CAAC;SAChC;QAED,0DAA0D;QAC1D,8CAA8C;QAC9C,IAAI,MAAA,OAAO,CAAC,UAAU,0CAAE,QAAQ,CAAC,MAAM,CAAC,EAAE;YACxC,MAAM,IAAA,mDAAyB,GAAE,CAAC;YAClC,IAAI,CAAC,OAAO,CAAC,IAAI,EAAE;gBACjB,OAAO,CAAC,IAAI,GAAG,EAAE,CAAC;aACnB;YACD,IAAI,KAAK,CAAC,OAAO,CAAC,OAAO,CAAC,IAAI,CAAC,EAAE;gBAC/B,OAAO,CAAC,IAAI,CAAC,IAAI,CAAC,aAAa,EAAE,8CAAoB,CAAC,CAAC;aACxD;SACF;QAED,IAAI,CAAC,WAAW,CAAC,KAAK,CAAC,GAAG,MAAM,CAAC;QAEjC,MAAM,OAAO,GAAG,MAAM,OAAO,CAAC,GAAG,CAAC,CAAC,IAAI,CAAC,YAAY,EAAE,EAAE,IAAI,CAAC,mBAAmB,EAAE,CAAC,CAAC,CAAC;QACrF,MAAM,UAAU,GAAG,OAAO,CAAC,IAAI,CAAC,CAAC,CAAC,EAAE,EAAE,CAAC,CAAC,KAAK,SAAS,CAAC,CAAC;QACxD,IAAI,UAAU,EAAE;YACd,OAAO,UAAU,CAAC;SACnB;QAED,IAAI;YACF,MAAM,IAAI,CAAC,eAAe,EAAE,CAAC;YAC7B,OAAO,SAAS,CAAC;SAClB;QAAC,OAAO,GAAG,EAAE;YACZ,IAAI,CAAC,MAAM,CAAC,KAAK,CAAC,6BAA6B,EAAE,GAAG,CAAC,CAAC;YACtD,OAAO,EAAE,OAAO,EAAE,8CAA8C,GAAG,CAAC,OAAO,GAAG,EAAE,CAAC;SAClF;IACH,CAAC;IAES,KAAK,CAAC,eAAe;QAC7B,MAAM,OAAO,GAAG,IAAI,CAAC,iBAAiB,CAAC;QACvC,MAAM,eAAe,GAAqB;YACxC,eAAe,EAAE,CAAC,CAAA,OAAO,aAAP,OAAO,uBAAP,OAAO,CAAE,sBAAsB,CAAA;SAClD,CAAC;QACF,MAAM,IAAI,GAAG,OAAO,CAAC,IAAI,IAAI,EAAE,CAAC;QAChC,MAAM,UAAU,GAAG,MAAM,IAAI,CAAC,iBAAiB,CAAC,KAAK,CACnD,OAAO,CAAC,UAAoB,EAC5B,IAAI,EACJ,IAAI,CAAC,WAAW,EAChB,IAAI,CAAC,SAAS,EACd,eAAe,CAChB,CAAC;QAEF,IAAI,CAAC,UAAU,CACb,UAAU,CAAC,MAAM,CAAC,KAAK,EAAE,CAAC,EAAE,EAAE;YAC5B,IAAI,CAAC,OAAO,CAAC,IAAI,CAAC,CAAC,CAAC,CAAC;YACrB,MAAM,WAAW,GAAG,MAAM,UAAU,CAAC,qBAAqB,EAAE,CAAC;YAC7D,IAAI,WAAW,KAAK,IAAI,CAAC,iBAAiB,EAAE;gBAC1C,IAAI,CAAC,iBAAiB,GAAG,WAAW,CAAC;gBACrC,IAAI,CAAC,gBAAgB,CAAC,IAAI,CAAC,WAAW,CAAC,CAAC;aACzC;QACH,CAAC,CAAC,CACH,CAAC;QAEF,IAAI,CAAC,UAAU,CACb,UAAU,CAAC,MAAM,CAAC,CAAC,CAAC,EAAE,EAAE;YACtB,IAAI,CAAC,OAAO,CAAC,IAAI,CAAC,CAAC,CAAC,CAAC;YACrB,IAAI,CAAC,OAAO,EAAE,CAAC;QACjB,CAAC,CAAC,CACH,CAAC;QAEF,UAAU,CAAC,GAAG,GAAG,OAAO,CAAC,UAAoB,CAAC;QAC9C,UAAU,CAAC,YAAY,GAAG,OAAO,CAAC;QAClC,UAAU,CAAC,UAAU,GAAG,oBAAI,CAAC,QAAQ,CAAC,OAAO,CAAC,UAAoB,CAAC,CAAC;QAEpE,IAAI,CAAC,cAAc,CAAC,UAAU,CAAC,GAAG,CAAC,CAAC;QAEpC,IAAI,CAAC,WAAW,GAAG,UAAU,CAAC;IAChC,CAAC;IACO,cAAc,CAAC,GAAW;QAChC,IAAI,CAAC,QAAQ,CAAC,IAAI,CAAC;YACjB,GAAG;SACJ,CAAC,CAAC;IACL,CAAC;IAED,QAAQ;QACN,IAAI,IAAI,CAAC,iBAAiB,CAAC,GAAG,EAAE;YAC9B,OAAO,OAAO,IAAI,CAAC,iBAAiB,CAAC,GAAG,KAAK,QAAQ;gBACnD,CAAC,CAAC,IAAI,CAAC,iBAAiB,CAAC,GAAG;gBAC5B,CAAC,CAAC,mBAAG,CAAC,IAAI,CAAC,IAAI,CAAC,iBAAiB,CAAC,GAAG,CAAC,CAAC,IAAI,CAAC,QAAQ,EAAE,CAAC;SAC1D;QACD,OAAO,YAAE,CAAC,OAAO,EAAE,CAAC;IACtB,CAAC;IAED,YAAY;;QACV,OAAO,CAAA,MAAA,IAAI,CAAC,WAAW,0CAAE,UAAU,KAAI,aAAa,CAAC;IACvD,CAAC;IAED,MAAM;;QACJ,OAAO,CAAA,MAAA,IAAI,CAAC,WAAW,0CAAE,GAAG,KAAI,CAAC,CAAC,CAAC;IACrC,CAAC;IAED,KAAK,CAAC,MAAM;QACV,IAAI,CAAC,IAAI,CAAC,WAAW,EAAE;YACrB,OAAO,SAAS,CAAC;SAClB;QACD,OAAO,IAAI,CAAC,WAAW,CAAC,MAAM,EAAE,CAAC;IACnC,CAAC;IAED,MAAM,CAAC,IAAY,EAAE,IAAY;;QAC/B,IAAI;YACF,MAAA,IAAI,CAAC,WAAW,0CAAE,MAAM,CAAC,IAAI,EAAE,IAAI,CAAC,CAAC;SACtC;QAAC,OAAO,CAAC,EAAE;YACV,OAAO,KAAK,CAAC;SACd;QACD,OAAO,IAAI,CAAC;IACd,CAAC;IAED,SAAS,CAAC,IAAY;;QACpB,MAAA,IAAI,CAAC,WAAW,0CAAE,KAAK,CAAC,IAAI,CAAC,CAAC;IAChC,CAAC;CACF,CAAA;AA1QC;IAAC,IAAA,cAAS,EAAC,2BAAW,CAAC;;0CACgB;AAEvC;IAAC,IAAA,cAAS,EAAC,oCAAsB,CAAC;;qDACuB;AAL9C,UAAU;IADtB,IAAA,eAAU,EAAC,EAAE,QAAQ,EAAE,IAAI,EAAE,CAAC;;GAClB,UAAU,CA2QtB;AA3QY,gCAAU"}
|
package/package.json
CHANGED
|
@@ -1,6 +1,6 @@
|
|
|
1
1
|
{
|
|
2
2
|
"name": "@opensumi/ide-terminal-next",
|
|
3
|
-
"version": "2.27.3-rc-
|
|
3
|
+
"version": "2.27.3-rc-1711356268.0",
|
|
4
4
|
"files": [
|
|
5
5
|
"lib",
|
|
6
6
|
"src"
|
|
@@ -17,10 +17,10 @@
|
|
|
17
17
|
"url": "git@github.com:opensumi/core.git"
|
|
18
18
|
},
|
|
19
19
|
"dependencies": {
|
|
20
|
-
"@opensumi/ide-connection": "2.27.3-rc-
|
|
21
|
-
"@opensumi/ide-core-common": "2.27.3-rc-
|
|
22
|
-
"@opensumi/ide-core-node": "2.27.3-rc-
|
|
23
|
-
"@opensumi/ide-file-service": "2.27.3-rc-
|
|
20
|
+
"@opensumi/ide-connection": "2.27.3-rc-1711356268.0",
|
|
21
|
+
"@opensumi/ide-core-common": "2.27.3-rc-1711356268.0",
|
|
22
|
+
"@opensumi/ide-core-node": "2.27.3-rc-1711356268.0",
|
|
23
|
+
"@opensumi/ide-file-service": "2.27.3-rc-1711356268.0",
|
|
24
24
|
"event-kit": "^2.5.3",
|
|
25
25
|
"node-pty": "1.0.0",
|
|
26
26
|
"os-locale": "^4.0.0",
|
|
@@ -31,19 +31,19 @@
|
|
|
31
31
|
"xterm-addon-webgl": "0.15.0"
|
|
32
32
|
},
|
|
33
33
|
"devDependencies": {
|
|
34
|
-
"@opensumi/ide-components": "2.27.3-rc-
|
|
35
|
-
"@opensumi/ide-core-browser": "2.27.3-rc-
|
|
36
|
-
"@opensumi/ide-dev-tool": "
|
|
37
|
-
"@opensumi/ide-editor": "2.27.3-rc-
|
|
38
|
-
"@opensumi/ide-main-layout": "2.27.3-rc-
|
|
39
|
-
"@opensumi/ide-overlay": "2.27.3-rc-
|
|
40
|
-
"@opensumi/ide-status-bar": "2.27.3-rc-
|
|
41
|
-
"@opensumi/ide-theme": "2.27.3-rc-
|
|
42
|
-
"@opensumi/ide-variable": "2.27.3-rc-
|
|
43
|
-
"@opensumi/ide-workspace": "2.27.3-rc-
|
|
34
|
+
"@opensumi/ide-components": "2.27.3-rc-1711356268.0",
|
|
35
|
+
"@opensumi/ide-core-browser": "2.27.3-rc-1711356268.0",
|
|
36
|
+
"@opensumi/ide-dev-tool": "2.27.3-rc-1711356268.0",
|
|
37
|
+
"@opensumi/ide-editor": "2.27.3-rc-1711356268.0",
|
|
38
|
+
"@opensumi/ide-main-layout": "2.27.3-rc-1711356268.0",
|
|
39
|
+
"@opensumi/ide-overlay": "2.27.3-rc-1711356268.0",
|
|
40
|
+
"@opensumi/ide-status-bar": "2.27.3-rc-1711356268.0",
|
|
41
|
+
"@opensumi/ide-theme": "2.27.3-rc-1711356268.0",
|
|
42
|
+
"@opensumi/ide-variable": "2.27.3-rc-1711356268.0",
|
|
43
|
+
"@opensumi/ide-workspace": "2.27.3-rc-1711356268.0",
|
|
44
44
|
"@types/event-kit": "^2.4.0",
|
|
45
45
|
"@types/http-proxy": "^1.17.2",
|
|
46
46
|
"http-proxy": "^1.18.0"
|
|
47
47
|
},
|
|
48
|
-
"gitHead": "
|
|
48
|
+
"gitHead": "4cf5f22adf7712aa2d27e2cd4b0b8fbb8543dbeb"
|
|
49
49
|
}
|
|
@@ -16,10 +16,32 @@
|
|
|
16
16
|
justify-content: flex-end;
|
|
17
17
|
|
|
18
18
|
.resizeItem {
|
|
19
|
+
position: relative;
|
|
19
20
|
width: 100%;
|
|
20
21
|
height: 100%;
|
|
21
22
|
overflow: hidden;
|
|
22
|
-
padding: 8px
|
|
23
|
+
padding: 8px 20px 0 10px;
|
|
24
|
+
.closeBtn {
|
|
25
|
+
display: none;
|
|
26
|
+
position: absolute;
|
|
27
|
+
right: 12px;
|
|
28
|
+
top: 10px;
|
|
29
|
+
cursor: pointer;
|
|
30
|
+
border-radius: 4px;
|
|
31
|
+
font-size: 14px;
|
|
32
|
+
width: 16px;
|
|
33
|
+
height: 16px;
|
|
34
|
+
line-height: 16px;
|
|
35
|
+
&:hover {
|
|
36
|
+
background-color: var(--kt-icon-hoverBackground);
|
|
37
|
+
transform: scale(1.1);
|
|
38
|
+
}
|
|
39
|
+
}
|
|
40
|
+
&:hover {
|
|
41
|
+
.closeBtn {
|
|
42
|
+
display: block;
|
|
43
|
+
}
|
|
44
|
+
}
|
|
23
45
|
}
|
|
24
46
|
}
|
|
25
47
|
|
|
@@ -1,6 +1,10 @@
|
|
|
1
|
+
import cls from 'classnames';
|
|
1
2
|
import { observer } from 'mobx-react-lite';
|
|
2
3
|
import React from 'react';
|
|
3
4
|
|
|
5
|
+
import { getIcon, useInjectable } from '@opensumi/ide-core-browser';
|
|
6
|
+
|
|
7
|
+
import { ITerminalGroupViewService } from '../../common/controller';
|
|
4
8
|
import { IWidget, IWidgetGroup } from '../../common/resize';
|
|
5
9
|
|
|
6
10
|
import ResizeDelegate from './resize.delegate';
|
|
@@ -23,6 +27,7 @@ export default observer((props: IResizeViewProps) => {
|
|
|
23
27
|
const { group, shadow } = props;
|
|
24
28
|
const [event, setEvent] = React.useState(false);
|
|
25
29
|
const [wholeWidth, setWholeWidth] = React.useState(Infinity);
|
|
30
|
+
const view = useInjectable<ITerminalGroupViewService>(ITerminalGroupViewService);
|
|
26
31
|
const whole = React.useRef<HTMLDivElement | null>(null);
|
|
27
32
|
|
|
28
33
|
React.useEffect(() => {
|
|
@@ -31,6 +36,10 @@ export default observer((props: IResizeViewProps) => {
|
|
|
31
36
|
}
|
|
32
37
|
});
|
|
33
38
|
|
|
39
|
+
const handleRemoveWidget = React.useCallback((widgetId: string) => {
|
|
40
|
+
view.removeWidget(widgetId);
|
|
41
|
+
}, []);
|
|
42
|
+
|
|
34
43
|
return (
|
|
35
44
|
<div className={styles.resizeWrapper} ref={whole}>
|
|
36
45
|
<div
|
|
@@ -77,6 +86,14 @@ export default observer((props: IResizeViewProps) => {
|
|
|
77
86
|
className={styles.resizeItem}
|
|
78
87
|
>
|
|
79
88
|
{props.draw(widget)}
|
|
89
|
+
{group.widgets.length > 1 && (
|
|
90
|
+
<div
|
|
91
|
+
className={cls(styles.closeBtn, getIcon('close'))}
|
|
92
|
+
onClick={() => {
|
|
93
|
+
handleRemoveWidget(widget.id);
|
|
94
|
+
}}
|
|
95
|
+
/>
|
|
96
|
+
)}
|
|
80
97
|
</div>
|
|
81
98
|
))}
|
|
82
99
|
</div>
|
|
@@ -0,0 +1,53 @@
|
|
|
1
|
+
import os from 'os';
|
|
2
|
+
import path from 'path';
|
|
3
|
+
|
|
4
|
+
import fs from 'fs-extra';
|
|
5
|
+
|
|
6
|
+
// 未来适配 OpenSumi 的时候需要调整
|
|
7
|
+
export const shellIntergrationDirPath = path.join(os.tmpdir(), '.sumi-shell', 'shell-intergration');
|
|
8
|
+
|
|
9
|
+
export const bashIntergrationPath = path.join(shellIntergrationDirPath, 'bash-intergration.bash');
|
|
10
|
+
|
|
11
|
+
/**
|
|
12
|
+
注入的 bash initfile，用于 ShellIntergration 功能的搭建
|
|
13
|
+
后续会针对 ShellIntergation 做整体的架构设计，目前满足基础功能需求
|
|
14
|
+
*/
|
|
15
|
+
export const bashIntergrationContent = String.raw`
|
|
16
|
+
|
|
17
|
+
if [ -r /etc/profile ]; then
|
|
18
|
+
. /etc/profile
|
|
19
|
+
fi
|
|
20
|
+
if [ -r ~/.bashrc ]; then
|
|
21
|
+
. ~/.bashrc
|
|
22
|
+
fi
|
|
23
|
+
if [ -r ~/.bash_profile ]; then
|
|
24
|
+
. ~/.bash_profile
|
|
25
|
+
elif [ -r ~/.bash_login ]; then
|
|
26
|
+
. ~/.bash_login
|
|
27
|
+
elif [ -r ~/.profile ]; then
|
|
28
|
+
. ~/.profile
|
|
29
|
+
fi
|
|
30
|
+
|
|
31
|
+
__is_prompt_start() {
|
|
32
|
+
builtin printf '\e]6973;PS\a'
|
|
33
|
+
}
|
|
34
|
+
|
|
35
|
+
__is_prompt_end() {
|
|
36
|
+
builtin printf '\e]6973;PE\a'
|
|
37
|
+
}
|
|
38
|
+
|
|
39
|
+
__is_update_prompt() {
|
|
40
|
+
if [[ "$__is_custom_PS1" == "" || "$__is_custom_PS1" != "$PS1" ]]; then
|
|
41
|
+
__is_original_PS1=$PS1
|
|
42
|
+
__is_custom_PS1="\[$(__is_prompt_start)\]$__is_original_PS1\[$(__is_prompt_end)\]"
|
|
43
|
+
export PS1="$__is_custom_PS1"
|
|
44
|
+
fi
|
|
45
|
+
}
|
|
46
|
+
|
|
47
|
+
__is_update_prompt
|
|
48
|
+
`;
|
|
49
|
+
|
|
50
|
+
export const initShellIntergrationFile = async () => {
|
|
51
|
+
await fs.mkdirp(shellIntergrationDirPath);
|
|
52
|
+
await fs.writeFile(bashIntergrationPath, bashIntergrationContent);
|
|
53
|
+
};
|
package/src/node/pty.ts
CHANGED
|
@@ -20,6 +20,7 @@ import { IShellLaunchConfig, ITerminalLaunchError } from '../common';
|
|
|
20
20
|
import { IProcessExitEvent, IProcessReadyEvent } from '../common/process';
|
|
21
21
|
import { IPtyProcessProxy, IPtySpawnOptions } from '../common/pty';
|
|
22
22
|
|
|
23
|
+
import { bashIntergrationPath, initShellIntergrationFile } from './easy-shell-intergration';
|
|
23
24
|
import { IPtyServiceManager, PtyServiceManagerToken } from './pty.manager';
|
|
24
25
|
import { findExecutable } from './shell';
|
|
25
26
|
|
|
@@ -182,6 +183,18 @@ export class PtyService extends Disposable {
|
|
|
182
183
|
) as { [key: string]: string };
|
|
183
184
|
}
|
|
184
185
|
|
|
186
|
+
// HACK: 这里的处理逻辑有些黑，后续需要整体去整理下 Shell Intergration，然后整体优化一下
|
|
187
|
+
// 如果是启动 bash，则使用 init file 植入 Intergration 能力
|
|
188
|
+
if (options.executable?.includes('bash')) {
|
|
189
|
+
await initShellIntergrationFile();
|
|
190
|
+
if (!options.args) {
|
|
191
|
+
options.args = [];
|
|
192
|
+
}
|
|
193
|
+
if (Array.isArray(options.args)) {
|
|
194
|
+
options.args.push('--init-file', bashIntergrationPath);
|
|
195
|
+
}
|
|
196
|
+
}
|
|
197
|
+
|
|
185
198
|
this._ptyOptions['env'] = ptyEnv;
|
|
186
199
|
|
|
187
200
|
const results = await Promise.all([this._validateCwd(), this._validateExecutable()]);
|