@theia/terminal 1.77.0-next.95 → 1.77.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/base/terminal-service.d.ts +1 -1
- package/lib/browser/base/terminal-service.d.ts.map +1 -1
- package/lib/browser/base/terminal-service.js +1 -4
- package/lib/browser/base/terminal-service.js.map +1 -1
- package/lib/browser/base/terminal-widget.d.ts +2 -2
- package/lib/browser/base/terminal-widget.d.ts.map +1 -1
- package/lib/browser/base/terminal-widget.js +5 -9
- package/lib/browser/base/terminal-widget.js.map +1 -1
- package/lib/browser/index.d.ts +2 -2
- package/lib/browser/index.d.ts.map +1 -1
- package/lib/browser/index.js +2 -5
- package/lib/browser/index.js.map +1 -1
- package/lib/browser/search/terminal-search-container.d.ts +1 -1
- package/lib/browser/search/terminal-search-container.d.ts.map +1 -1
- package/lib/browser/search/terminal-search-container.js +7 -9
- package/lib/browser/search/terminal-search-container.js.map +1 -1
- package/lib/browser/search/terminal-search-widget.d.ts +1 -1
- package/lib/browser/search/terminal-search-widget.d.ts.map +1 -1
- package/lib/browser/search/terminal-search-widget.js +24 -30
- package/lib/browser/search/terminal-search-widget.js.map +1 -1
- package/lib/browser/shell-terminal-profile.d.ts +3 -3
- package/lib/browser/shell-terminal-profile.d.ts.map +1 -1
- package/lib/browser/shell-terminal-profile.js +1 -5
- package/lib/browser/shell-terminal-profile.js.map +1 -1
- package/lib/browser/terminal-command-history.d.ts +1 -1
- package/lib/browser/terminal-command-history.d.ts.map +1 -1
- package/lib/browser/terminal-command-history.js +10 -14
- package/lib/browser/terminal-command-history.js.map +1 -1
- package/lib/browser/terminal-contribution.d.ts +1 -1
- package/lib/browser/terminal-contribution.d.ts.map +1 -1
- package/lib/browser/terminal-contribution.js +3 -5
- package/lib/browser/terminal-contribution.js.map +1 -1
- package/lib/browser/terminal-copy-on-selection-handler.js +9 -15
- package/lib/browser/terminal-copy-on-selection-handler.js.map +1 -1
- package/lib/browser/terminal-creation-handler.d.ts +1 -1
- package/lib/browser/terminal-creation-handler.d.ts.map +1 -1
- package/lib/browser/terminal-creation-handler.js +1 -4
- package/lib/browser/terminal-creation-handler.js.map +1 -1
- package/lib/browser/terminal-file-link-provider.d.ts +3 -3
- package/lib/browser/terminal-file-link-provider.d.ts.map +1 -1
- package/lib/browser/terminal-file-link-provider.js +37 -44
- package/lib/browser/terminal-file-link-provider.js.map +1 -1
- package/lib/browser/terminal-file-link-provider.spec.js +9 -12
- package/lib/browser/terminal-file-link-provider.spec.js.map +1 -1
- package/lib/browser/terminal-file-opening-link-provider.d.ts +2 -2
- package/lib/browser/terminal-file-opening-link-provider.d.ts.map +1 -1
- package/lib/browser/terminal-file-opening-link-provider.js +11 -16
- package/lib/browser/terminal-file-opening-link-provider.js.map +1 -1
- package/lib/browser/terminal-file-uri-link-provider.d.ts +3 -3
- package/lib/browser/terminal-file-uri-link-provider.d.ts.map +1 -1
- package/lib/browser/terminal-file-uri-link-provider.js +13 -17
- package/lib/browser/terminal-file-uri-link-provider.js.map +1 -1
- package/lib/browser/terminal-file-uri-link-provider.spec.js +16 -19
- package/lib/browser/terminal-file-uri-link-provider.spec.js.map +1 -1
- package/lib/browser/terminal-frontend-contribution.d.ts +8 -8
- package/lib/browser/terminal-frontend-contribution.d.ts.map +1 -1
- package/lib/browser/terminal-frontend-contribution.js +194 -221
- package/lib/browser/terminal-frontend-contribution.js.map +1 -1
- package/lib/browser/terminal-frontend-module.js +94 -96
- package/lib/browser/terminal-frontend-module.js.map +1 -1
- package/lib/browser/terminal-link-helpers.js +3 -8
- package/lib/browser/terminal-link-helpers.js.map +1 -1
- package/lib/browser/terminal-link-provider.d.ts +4 -4
- package/lib/browser/terminal-link-provider.d.ts.map +1 -1
- package/lib/browser/terminal-link-provider.js +46 -60
- package/lib/browser/terminal-link-provider.js.map +1 -1
- package/lib/browser/terminal-profile-service.d.ts +1 -1
- package/lib/browser/terminal-profile-service.d.ts.map +1 -1
- package/lib/browser/terminal-profile-service.js +23 -27
- package/lib/browser/terminal-profile-service.js.map +1 -1
- package/lib/browser/terminal-quick-open-service.d.ts +2 -2
- package/lib/browser/terminal-quick-open-service.d.ts.map +1 -1
- package/lib/browser/terminal-quick-open-service.js +30 -38
- package/lib/browser/terminal-quick-open-service.js.map +1 -1
- package/lib/browser/terminal-secondary-window-close-contribution.d.ts +1 -1
- package/lib/browser/terminal-secondary-window-close-contribution.d.ts.map +1 -1
- package/lib/browser/terminal-secondary-window-close-contribution.js +10 -14
- package/lib/browser/terminal-secondary-window-close-contribution.js.map +1 -1
- package/lib/browser/terminal-shell-handler.d.ts +3 -3
- package/lib/browser/terminal-shell-handler.d.ts.map +1 -1
- package/lib/browser/terminal-shell-handler.js +17 -22
- package/lib/browser/terminal-shell-handler.js.map +1 -1
- package/lib/browser/terminal-theme-service.js +15 -20
- package/lib/browser/terminal-theme-service.js.map +1 -1
- package/lib/browser/terminal-theme-service.spec.js +30 -35
- package/lib/browser/terminal-theme-service.spec.js.map +1 -1
- package/lib/browser/terminal-url-link-provider.d.ts +2 -2
- package/lib/browser/terminal-url-link-provider.d.ts.map +1 -1
- package/lib/browser/terminal-url-link-provider.js +11 -15
- package/lib/browser/terminal-url-link-provider.js.map +1 -1
- package/lib/browser/terminal-widget-impl.d.ts +11 -11
- package/lib/browser/terminal-widget-impl.d.ts.map +1 -1
- package/lib/browser/terminal-widget-impl.js +148 -173
- package/lib/browser/terminal-widget-impl.js.map +1 -1
- package/lib/browser-only/browser-only-terminal-frontend-contribution.d.ts +3 -3
- package/lib/browser-only/browser-only-terminal-frontend-contribution.d.ts.map +1 -1
- package/lib/browser-only/browser-only-terminal-frontend-contribution.js +12 -16
- package/lib/browser-only/browser-only-terminal-frontend-contribution.js.map +1 -1
- package/lib/browser-only/browser-only-terminal-frontend-contribution.spec.js +68 -70
- package/lib/browser-only/browser-only-terminal-frontend-contribution.spec.js.map +1 -1
- package/lib/browser-only/terminal-frontend-only-module.js +5 -7
- package/lib/browser-only/terminal-frontend-only-module.js.map +1 -1
- package/lib/common/base-terminal-protocol.js +7 -11
- package/lib/common/base-terminal-protocol.js.map +1 -1
- package/lib/common/shell-terminal-protocol.d.ts +1 -1
- package/lib/common/shell-terminal-protocol.d.ts.map +1 -1
- package/lib/common/shell-terminal-protocol.js +6 -9
- package/lib/common/shell-terminal-protocol.js.map +1 -1
- package/lib/common/shell-type.js +12 -20
- package/lib/common/shell-type.js.map +1 -1
- package/lib/common/shell-type.spec.js +69 -71
- package/lib/common/shell-type.spec.js.map +1 -1
- package/lib/common/terminal-preferences.js +77 -83
- package/lib/common/terminal-preferences.js.map +1 -1
- package/lib/common/terminal-protocol.d.ts +1 -1
- package/lib/common/terminal-protocol.d.ts.map +1 -1
- package/lib/common/terminal-protocol.js +3 -6
- package/lib/common/terminal-protocol.js.map +1 -1
- package/lib/common/terminal-watcher.d.ts +1 -1
- package/lib/common/terminal-watcher.d.ts.map +1 -1
- package/lib/common/terminal-watcher.js +10 -13
- package/lib/common/terminal-watcher.js.map +1 -1
- package/lib/node/base-terminal-server.d.ts +1 -1
- package/lib/node/base-terminal-server.d.ts.map +1 -1
- package/lib/node/base-terminal-server.js +24 -28
- package/lib/node/base-terminal-server.js.map +1 -1
- package/lib/node/buffering-stream.js +5 -11
- package/lib/node/buffering-stream.js.map +1 -1
- package/lib/node/buffering-stream.spec.js +18 -20
- package/lib/node/buffering-stream.spec.js.map +1 -1
- package/lib/node/index.d.ts +1 -1
- package/lib/node/index.d.ts.map +1 -1
- package/lib/node/index.js +1 -4
- package/lib/node/index.js.map +1 -1
- package/lib/node/shell-integration-injector.d.ts +1 -1
- package/lib/node/shell-integration-injector.d.ts.map +1 -1
- package/lib/node/shell-integration-injector.js +19 -24
- package/lib/node/shell-integration-injector.js.map +1 -1
- package/lib/node/shell-integration-injector.spec.js +24 -27
- package/lib/node/shell-integration-injector.spec.js.map +1 -1
- package/lib/node/shell-process.js +28 -34
- package/lib/node/shell-process.js.map +1 -1
- package/lib/node/shell-terminal-server.d.ts +3 -3
- package/lib/node/shell-terminal-server.d.ts.map +1 -1
- package/lib/node/shell-terminal-server.js +39 -44
- package/lib/node/shell-terminal-server.js.map +1 -1
- package/lib/node/shell-terminal-server.spec.js +12 -14
- package/lib/node/shell-terminal-server.spec.js.map +1 -1
- package/lib/node/terminal-backend-contribution.js +17 -22
- package/lib/node/terminal-backend-contribution.js.map +1 -1
- package/lib/node/terminal-backend-contribution.slow-spec.js +10 -12
- package/lib/node/terminal-backend-contribution.slow-spec.js.map +1 -1
- package/lib/node/terminal-backend-module.d.ts +1 -1
- package/lib/node/terminal-backend-module.d.ts.map +1 -1
- package/lib/node/terminal-backend-module.js +36 -39
- package/lib/node/terminal-backend-module.js.map +1 -1
- package/lib/node/terminal-server.d.ts +2 -2
- package/lib/node/terminal-server.d.ts.map +1 -1
- package/lib/node/terminal-server.js +14 -19
- package/lib/node/terminal-server.js.map +1 -1
- package/lib/node/terminal-server.spec.js +5 -8
- package/lib/node/terminal-server.spec.js.map +1 -1
- package/lib/node/test/terminal-test-container.js +17 -21
- package/lib/node/test/terminal-test-container.js.map +1 -1
- package/lib/package.spec.d.ts +1 -0
- package/lib/package.spec.js +1 -1
- package/lib/package.spec.js.map +1 -1
- package/package.json +21 -10
- package/src/browser/base/terminal-service.ts +1 -1
- package/src/browser/base/terminal-widget.ts +2 -2
- package/src/browser/index.ts +2 -2
- package/src/browser/search/terminal-search-container.ts +4 -3
- package/src/browser/search/terminal-search-widget.tsx +3 -2
- package/src/browser/shell-terminal-profile.ts +3 -3
- package/src/browser/terminal-command-history.ts +1 -1
- package/src/browser/terminal-contribution.ts +1 -1
- package/src/browser/terminal-creation-handler.ts +1 -1
- package/src/browser/terminal-file-link-provider.spec.ts +2 -2
- package/src/browser/terminal-file-link-provider.ts +4 -4
- package/src/browser/terminal-file-opening-link-provider.ts +2 -2
- package/src/browser/terminal-file-uri-link-provider.spec.ts +2 -2
- package/src/browser/terminal-file-uri-link-provider.ts +3 -3
- package/src/browser/terminal-frontend-contribution.ts +12 -10
- package/src/browser/terminal-frontend-module.ts +23 -23
- package/src/browser/terminal-link-provider.ts +4 -4
- package/src/browser/terminal-profile-service.ts +2 -2
- package/src/browser/terminal-quick-open-service.ts +3 -3
- package/src/browser/terminal-secondary-window-close-contribution.ts +2 -2
- package/src/browser/terminal-shell-handler.ts +3 -3
- package/src/browser/terminal-theme-service.spec.ts +1 -1
- package/src/browser/terminal-theme-service.ts +1 -1
- package/src/browser/terminal-url-link-provider.ts +2 -2
- package/src/browser/terminal-widget-impl.ts +17 -16
- package/src/browser-only/browser-only-terminal-frontend-contribution.spec.ts +9 -9
- package/src/browser-only/browser-only-terminal-frontend-contribution.ts +3 -3
- package/src/browser-only/terminal-frontend-only-module.ts +2 -2
- package/src/common/shell-terminal-protocol.ts +1 -1
- package/src/common/shell-type.spec.ts +1 -1
- package/src/common/terminal-protocol.ts +1 -1
- package/src/common/terminal-watcher.ts +1 -1
- package/src/node/base-terminal-server.ts +2 -2
- package/src/node/buffering-stream.spec.ts +1 -1
- package/src/node/index.ts +1 -1
- package/src/node/shell-integration-injector.spec.ts +2 -2
- package/src/node/shell-integration-injector.ts +4 -4
- package/src/node/shell-terminal-server.spec.ts +5 -4
- package/src/node/shell-terminal-server.ts +3 -3
- package/src/node/terminal-backend-contribution.slow-spec.ts +3 -3
- package/src/node/terminal-backend-contribution.ts +2 -2
- package/src/node/terminal-backend-module.ts +10 -10
- package/src/node/terminal-server.spec.ts +2 -2
- package/src/node/terminal-server.ts +2 -2
- package/src/node/test/terminal-test-container.ts +1 -1
|
@@ -1,4 +1,3 @@
|
|
|
1
|
-
"use strict";
|
|
2
1
|
// *****************************************************************************
|
|
3
2
|
// Copyright (C) 2017 Ericsson and others.
|
|
4
3
|
//
|
|
@@ -14,14 +13,12 @@
|
|
|
14
13
|
//
|
|
15
14
|
// SPDX-License-Identifier: EPL-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0
|
|
16
15
|
// *****************************************************************************
|
|
17
|
-
|
|
18
|
-
|
|
19
|
-
|
|
20
|
-
|
|
21
|
-
|
|
22
|
-
|
|
23
|
-
const node_1 = require("@theia/process/lib/node");
|
|
24
|
-
const shell_process_1 = require("./shell-process");
|
|
16
|
+
import { __decorate, __param } from "tslib";
|
|
17
|
+
import { inject, injectable, named } from '@theia/core/shared/inversify';
|
|
18
|
+
import { ILogger, DisposableCollection } from '@theia/core/lib/common';
|
|
19
|
+
import { TerminalExitReason } from '../common/base-terminal-protocol.js';
|
|
20
|
+
import { TerminalProcess, ProcessManager, TaskTerminalProcess } from '@theia/process/lib/node';
|
|
21
|
+
import { ShellProcess } from './shell-process.js';
|
|
25
22
|
let BaseTerminalServer = class BaseTerminalServer {
|
|
26
23
|
constructor(processManager, logger) {
|
|
27
24
|
this.processManager = processManager;
|
|
@@ -38,7 +35,7 @@ let BaseTerminalServer = class BaseTerminalServer {
|
|
|
38
35
|
}
|
|
39
36
|
async attach(id) {
|
|
40
37
|
const term = this.processManager.get(id);
|
|
41
|
-
if (term && term instanceof
|
|
38
|
+
if (term && term instanceof TerminalProcess) {
|
|
42
39
|
return term.id;
|
|
43
40
|
}
|
|
44
41
|
else {
|
|
@@ -48,7 +45,7 @@ let BaseTerminalServer = class BaseTerminalServer {
|
|
|
48
45
|
}
|
|
49
46
|
async onAttachAttempted(id) {
|
|
50
47
|
const terminal = this.processManager.get(id);
|
|
51
|
-
if (terminal instanceof
|
|
48
|
+
if (terminal instanceof TaskTerminalProcess) {
|
|
52
49
|
terminal.attachmentAttempted = true;
|
|
53
50
|
if (terminal.exited) {
|
|
54
51
|
// Didn't execute `unregisterProcess` on terminal `exit` event to enable attaching task output to terminal,
|
|
@@ -62,14 +59,14 @@ let BaseTerminalServer = class BaseTerminalServer {
|
|
|
62
59
|
}
|
|
63
60
|
async getProcessId(id) {
|
|
64
61
|
const terminal = this.processManager.get(id);
|
|
65
|
-
if (!(terminal instanceof
|
|
62
|
+
if (!(terminal instanceof TerminalProcess)) {
|
|
66
63
|
throw new Error(`terminal "${id}" does not exist`);
|
|
67
64
|
}
|
|
68
65
|
return terminal.pid;
|
|
69
66
|
}
|
|
70
67
|
async getProcessInfo(id) {
|
|
71
68
|
const terminal = this.processManager.get(id);
|
|
72
|
-
if (!(terminal instanceof
|
|
69
|
+
if (!(terminal instanceof TerminalProcess)) {
|
|
73
70
|
throw new Error(`terminal "${id}" does not exist`);
|
|
74
71
|
}
|
|
75
72
|
return {
|
|
@@ -79,26 +76,26 @@ let BaseTerminalServer = class BaseTerminalServer {
|
|
|
79
76
|
}
|
|
80
77
|
async getCwdURI(id) {
|
|
81
78
|
const terminal = this.processManager.get(id);
|
|
82
|
-
if (!(terminal instanceof
|
|
79
|
+
if (!(terminal instanceof TerminalProcess)) {
|
|
83
80
|
throw new Error(`terminal "${id}" does not exist`);
|
|
84
81
|
}
|
|
85
82
|
return terminal.getCwdURI();
|
|
86
83
|
}
|
|
87
84
|
async close(id) {
|
|
88
85
|
const term = this.processManager.get(id);
|
|
89
|
-
if (term instanceof
|
|
86
|
+
if (term instanceof TerminalProcess) {
|
|
90
87
|
term.kill();
|
|
91
88
|
}
|
|
92
89
|
}
|
|
93
90
|
async getDefaultShell() {
|
|
94
|
-
return
|
|
91
|
+
return ShellProcess.getShellExecutablePath();
|
|
95
92
|
}
|
|
96
93
|
dispose() {
|
|
97
94
|
// noop
|
|
98
95
|
}
|
|
99
96
|
async resize(id, cols, rows) {
|
|
100
97
|
const term = this.processManager.get(id);
|
|
101
|
-
if (term && term instanceof
|
|
98
|
+
if (term && term instanceof TerminalProcess) {
|
|
102
99
|
term.resize(cols, rows);
|
|
103
100
|
}
|
|
104
101
|
else {
|
|
@@ -114,14 +111,14 @@ let BaseTerminalServer = class BaseTerminalServer {
|
|
|
114
111
|
this.client.updateTerminalEnvVariables();
|
|
115
112
|
}
|
|
116
113
|
notifyClientOnExit(term) {
|
|
117
|
-
const toDispose = new
|
|
114
|
+
const toDispose = new DisposableCollection();
|
|
118
115
|
toDispose.push(term.onError(error => {
|
|
119
116
|
this.logger.error(`Terminal pid: ${term.pid} error: ${error}, closing it.`);
|
|
120
117
|
if (this.client !== undefined) {
|
|
121
118
|
this.client.onTerminalError({
|
|
122
119
|
terminalId: term.id,
|
|
123
120
|
error: new Error(`Failed to execute terminal process (${error.code})`),
|
|
124
|
-
attached: term instanceof
|
|
121
|
+
attached: term instanceof TaskTerminalProcess && term.attachmentAttempted
|
|
125
122
|
});
|
|
126
123
|
}
|
|
127
124
|
}));
|
|
@@ -130,9 +127,9 @@ let BaseTerminalServer = class BaseTerminalServer {
|
|
|
130
127
|
this.client.onTerminalExitChanged({
|
|
131
128
|
terminalId: term.id,
|
|
132
129
|
code: event.code,
|
|
133
|
-
reason:
|
|
130
|
+
reason: TerminalExitReason.Process,
|
|
134
131
|
signal: event.signal,
|
|
135
|
-
attached: term instanceof
|
|
132
|
+
attached: term instanceof TaskTerminalProcess && term.attachmentAttempted
|
|
136
133
|
});
|
|
137
134
|
}
|
|
138
135
|
}));
|
|
@@ -147,12 +144,11 @@ let BaseTerminalServer = class BaseTerminalServer {
|
|
|
147
144
|
this.terminalToDispose.set(term.id, toDispose);
|
|
148
145
|
}
|
|
149
146
|
};
|
|
150
|
-
|
|
151
|
-
|
|
152
|
-
(0,
|
|
153
|
-
|
|
154
|
-
|
|
155
|
-
tslib_1.__param(1, (0, inversify_1.named)('terminal:BaseTerminalServer')),
|
|
156
|
-
tslib_1.__metadata("design:paramtypes", [node_1.ProcessManager, Object])
|
|
147
|
+
BaseTerminalServer = __decorate([
|
|
148
|
+
injectable(),
|
|
149
|
+
__param(0, inject(ProcessManager)),
|
|
150
|
+
__param(1, inject(ILogger)),
|
|
151
|
+
__param(1, named('terminal:BaseTerminalServer'))
|
|
157
152
|
], BaseTerminalServer);
|
|
153
|
+
export { BaseTerminalServer };
|
|
158
154
|
//# sourceMappingURL=base-terminal-server.js.map
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"base-terminal-server.js","sourceRoot":"","sources":["../../src/node/base-terminal-server.ts"],"names":[],"mappings":"
|
|
1
|
+
{"version":3,"file":"base-terminal-server.js","sourceRoot":"","sources":["../../src/node/base-terminal-server.ts"],"names":[],"mappings":"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"}
|
|
@@ -1,4 +1,3 @@
|
|
|
1
|
-
"use strict";
|
|
2
1
|
// *****************************************************************************
|
|
3
2
|
// Copyright (C) 2022 Ericsson and others.
|
|
4
3
|
//
|
|
@@ -14,17 +13,15 @@
|
|
|
14
13
|
//
|
|
15
14
|
// SPDX-License-Identifier: EPL-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0
|
|
16
15
|
// *****************************************************************************
|
|
17
|
-
|
|
18
|
-
exports.BufferBufferingStream = exports.StringBufferingStream = exports.BufferingStream = void 0;
|
|
19
|
-
const event_1 = require("@theia/core/lib/common/event");
|
|
16
|
+
import { Emitter } from '@theia/core/lib/common/event';
|
|
20
17
|
/**
|
|
21
18
|
* This component will buffer whatever is pushed to it and emit chunks back
|
|
22
19
|
* every {@link BufferingStreamOptions.emitInterval}. It will also ensure that
|
|
23
20
|
* the emitted chunks never exceed {@link BufferingStreamOptions.maxChunkSize}.
|
|
24
21
|
*/
|
|
25
|
-
class BufferingStream {
|
|
22
|
+
export class BufferingStream {
|
|
26
23
|
constructor(options = {}, concat, slice, length) {
|
|
27
|
-
this.onDataEmitter = new
|
|
24
|
+
this.onDataEmitter = new Emitter();
|
|
28
25
|
this.emitInterval = options.emitInterval ?? 16; // ms
|
|
29
26
|
this.maxChunkSize = options.maxChunkSize ?? (256 * 1024); // bytes
|
|
30
27
|
this.concat = concat;
|
|
@@ -71,17 +68,14 @@ class BufferingStream {
|
|
|
71
68
|
}
|
|
72
69
|
}
|
|
73
70
|
}
|
|
74
|
-
|
|
75
|
-
class StringBufferingStream extends BufferingStream {
|
|
71
|
+
export class StringBufferingStream extends BufferingStream {
|
|
76
72
|
constructor(options = {}) {
|
|
77
73
|
super(options, (left, right) => left.concat(right), (what, start, end) => what.slice(start, end), what => what.length);
|
|
78
74
|
}
|
|
79
75
|
}
|
|
80
|
-
|
|
81
|
-
class BufferBufferingStream extends BufferingStream {
|
|
76
|
+
export class BufferBufferingStream extends BufferingStream {
|
|
82
77
|
constructor(options = {}) {
|
|
83
78
|
super(options, (left, right) => Buffer.concat([left, right]), (what, start, end) => what.slice(start, end), what => what.length);
|
|
84
79
|
}
|
|
85
80
|
}
|
|
86
|
-
exports.BufferBufferingStream = BufferBufferingStream;
|
|
87
81
|
//# sourceMappingURL=buffering-stream.js.map
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"buffering-stream.js","sourceRoot":"","sources":["../../src/node/buffering-stream.ts"],"names":[],"mappings":"
|
|
1
|
+
{"version":3,"file":"buffering-stream.js","sourceRoot":"","sources":["../../src/node/buffering-stream.ts"],"names":[],"mappings":"AAAA,gFAAgF;AAChF,0CAA0C;AAC1C,EAAE;AACF,2EAA2E;AAC3E,mEAAmE;AACnE,wCAAwC;AACxC,EAAE;AACF,4EAA4E;AAC5E,8EAA8E;AAC9E,6EAA6E;AAC7E,yDAAyD;AACzD,uDAAuD;AACvD,EAAE;AACF,gFAAgF;AAChF,gFAAgF;AAEhF,OAAO,EAAE,OAAO,EAAS,MAAM,8BAA8B,CAAC;AAc9D;;;;GAIG;AACH,MAAM,OAAO,eAAe;IAWxB,YAAY,UAAkC,EAAE,EAAE,MAAgC,EAAE,KAAmD,EAAE,MAA2B;QAL1J,kBAAa,GAAG,IAAI,OAAO,EAAK,CAAC;QAMvC,IAAI,CAAC,YAAY,GAAG,OAAO,CAAC,YAAY,IAAI,EAAE,CAAC,CAAC,KAAK;QACrD,IAAI,CAAC,YAAY,GAAG,OAAO,CAAC,YAAY,IAAI,CAAC,GAAG,GAAG,IAAI,CAAC,CAAC,CAAC,QAAQ;QAClE,IAAI,CAAC,MAAM,GAAG,MAAM,CAAC;QACrB,IAAI,CAAC,KAAK,GAAG,KAAK,CAAC;QACnB,IAAI,CAAC,MAAM,GAAG,MAAM,CAAC;IACzB,CAAC;IAED,IAAI,MAAM;QACN,OAAO,IAAI,CAAC,aAAa,CAAC,KAAK,CAAC;IACpC,CAAC;IAED,IAAI,CAAC,KAAQ;QACT,IAAI,IAAI,CAAC,MAAM,EAAE,CAAC;YACd,IAAI,CAAC,MAAM,GAAG,IAAI,CAAC,MAAM,CAAC,IAAI,CAAC,MAAM,EAAE,KAAK,CAAC,CAAC;QAClD,CAAC;aAAM,CAAC;YACJ,IAAI,CAAC,MAAM,GAAG,KAAK,CAAC;YACpB,IAAI,CAAC,OAAO,GAAG,UAAU,CAAC,GAAG,EAAE,CAAC,IAAI,CAAC,iBAAiB,EAAE,EAAE,IAAI,CAAC,YAAY,CAAC,CAAC;QACjF,CAAC;IACL,CAAC;IAED,gFAAgF;IAChF,KAAK;QACD,IAAI,IAAI,CAAC,MAAM,KAAK,SAAS,EAAE,CAAC;YAC5B,YAAY,CAAC,IAAI,CAAC,OAAO,CAAC,CAAC;YAC3B,MAAM,QAAQ,GAAG,IAAI,CAAC,MAAM,CAAC;YAC7B,IAAI,CAAC,MAAM,GAAG,SAAS,CAAC;YACxB,MAAM,WAAW,GAAG,IAAI,CAAC,MAAM,CAAC,QAAQ,CAAC,CAAC;YAC1C,KAAK,IAAI,MAAM,GAAG,CAAC,EAAE,MAAM,GAAG,WAAW,EAAE,MAAM,IAAI,IAAI,CAAC,YAAY,EAAE,CAAC;gBACrE,IAAI,CAAC,aAAa,CAAC,IAAI,CAAC,IAAI,CAAC,KAAK,CAAC,QAAQ,EAAE,MAAM,EAAE,MAAM,GAAG,IAAI,CAAC,YAAY,CAAC,CAAC,CAAC;YACtF,CAAC;QACL,CAAC;IACL,CAAC;IAED,OAAO;QACH,YAAY,CAAC,IAAI,CAAC,OAAO,CAAC,CAAC;QAC3B,IAAI,CAAC,MAAM,GAAG,SAAS,CAAC;QACxB,IAAI,CAAC,aAAa,CAAC,OAAO,EAAE,CAAC;IACjC,CAAC;IAES,iBAAiB;QACvB,IAAI,CAAC,aAAa,CAAC,IAAI,CAAC,IAAI,CAAC,KAAK,CAAC,IAAI,CAAC,MAAO,EAAE,CAAC,EAAE,IAAI,CAAC,YAAY,CAAC,CAAC,CAAC;QACxE,IAAI,IAAI,CAAC,MAAM,CAAC,IAAI,CAAC,MAAO,CAAC,IAAI,IAAI,CAAC,YAAY,EAAE,CAAC;YACjD,IAAI,CAAC,MAAM,GAAG,SAAS,CAAC;QAC5B,CAAC;aAAM,CAAC;YACJ,IAAI,CAAC,MAAM,GAAG,IAAI,CAAC,KAAK,CAAC,IAAI,CAAC,MAAO,EAAE,IAAI,CAAC,YAAY,CAAC,CAAC;YAC1D,IAAI,CAAC,OAAO,GAAG,UAAU,CAAC,GAAG,EAAE,CAAC,IAAI,CAAC,iBAAiB,EAAE,EAAE,IAAI,CAAC,YAAY,CAAC,CAAC;QACjF,CAAC;IACL,CAAC;CACJ;AAED,MAAM,OAAO,qBAAsB,SAAQ,eAAuB;IAC9D,YAAY,UAAkC,EAAE;QAC5C,KAAK,CAAC,OAAO,EAAE,CAAC,IAAI,EAAE,KAAK,EAAE,EAAE,CAAC,IAAI,CAAC,MAAM,CAAC,KAAK,CAAC,EAAE,CAAC,IAAI,EAAE,KAAK,EAAE,GAAG,EAAE,EAAE,CAAC,IAAI,CAAC,KAAK,CAAC,KAAK,EAAE,GAAG,CAAC,EAAE,IAAI,CAAC,EAAE,CAAC,IAAI,CAAC,MAAM,CAAC,CAAC;IAC3H,CAAC;CACJ;AAED,MAAM,OAAO,qBAAsB,SAAQ,eAAuB;IAC9D,YAAY,UAAkC,EAAE;QAC5C,KAAK,CAAC,OAAO,EAAE,CAAC,IAAI,EAAE,KAAK,EAAE,EAAE,CAAC,MAAM,CAAC,MAAM,CAAC,CAAC,IAAI,EAAE,KAAK,CAAC,CAAC,EAAE,CAAC,IAAI,EAAE,KAAK,EAAE,GAAG,EAAE,EAAE,CAAC,IAAI,CAAC,KAAK,CAAC,KAAK,EAAE,GAAG,CAAC,EAAE,IAAI,CAAC,EAAE,CAAC,IAAI,CAAC,MAAM,CAAC,CAAC;IACrI,CAAC;CACJ"}
|
|
@@ -1,4 +1,3 @@
|
|
|
1
|
-
"use strict";
|
|
2
1
|
// *****************************************************************************
|
|
3
2
|
// Copyright (C) 2022 Ericsson and others.
|
|
4
3
|
//
|
|
@@ -14,46 +13,45 @@
|
|
|
14
13
|
//
|
|
15
14
|
// SPDX-License-Identifier: EPL-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0
|
|
16
15
|
// *****************************************************************************
|
|
17
|
-
|
|
18
|
-
|
|
19
|
-
|
|
20
|
-
const buffering_stream_1 = require("./buffering-stream");
|
|
16
|
+
import { wait } from '@theia/core/lib/common/promise-util';
|
|
17
|
+
import { expect } from 'chai';
|
|
18
|
+
import { BufferBufferingStream } from './buffering-stream.js';
|
|
21
19
|
describe('BufferringStream', () => {
|
|
22
20
|
it('should emit whatever data was buffered before the timeout', async () => {
|
|
23
|
-
const buffer = new
|
|
21
|
+
const buffer = new BufferBufferingStream({ emitInterval: 1000 });
|
|
24
22
|
const chunkPromise = waitForChunk(buffer);
|
|
25
23
|
buffer.push(Buffer.from([0]));
|
|
26
|
-
await
|
|
24
|
+
await wait(100);
|
|
27
25
|
buffer.push(Buffer.from([1]));
|
|
28
|
-
await
|
|
26
|
+
await wait(100);
|
|
29
27
|
buffer.push(Buffer.from([2, 3, 4]));
|
|
30
28
|
const chunk = await chunkPromise;
|
|
31
|
-
|
|
29
|
+
expect(chunk).deep.eq(Buffer.from([0, 1, 2, 3, 4]));
|
|
32
30
|
});
|
|
33
31
|
it('should not emit chunks bigger than maxChunkSize', async () => {
|
|
34
|
-
const buffer = new
|
|
32
|
+
const buffer = new BufferBufferingStream({ maxChunkSize: 2 });
|
|
35
33
|
buffer.push(Buffer.from([0, 1, 2, 3, 4, 5]));
|
|
36
|
-
|
|
37
|
-
|
|
38
|
-
|
|
34
|
+
expect(await waitForChunk(buffer)).deep.eq(Buffer.from([0, 1]));
|
|
35
|
+
expect(await waitForChunk(buffer)).deep.eq(Buffer.from([2, 3]));
|
|
36
|
+
expect(await waitForChunk(buffer)).deep.eq(Buffer.from([4, 5]));
|
|
39
37
|
});
|
|
40
38
|
it('should flush with buffer bigger than maxChunkSize', () => {
|
|
41
|
-
const buffer = new
|
|
39
|
+
const buffer = new BufferBufferingStream({ maxChunkSize: 2 });
|
|
42
40
|
const chunks = [];
|
|
43
41
|
buffer.onData(c => chunks.push(c));
|
|
44
42
|
buffer.push(Buffer.from([0, 1, 2, 3, 4, 5]));
|
|
45
43
|
buffer.flush();
|
|
46
|
-
|
|
44
|
+
expect(chunks).deep.eq([Buffer.from([0, 1]), Buffer.from([2, 3]), Buffer.from([4, 5])]);
|
|
47
45
|
});
|
|
48
46
|
it('should flush with empty buffer', () => {
|
|
49
|
-
const buffer = new
|
|
47
|
+
const buffer = new BufferBufferingStream({ maxChunkSize: 2 });
|
|
50
48
|
const chunks = [];
|
|
51
49
|
buffer.onData(c => chunks.push(c));
|
|
52
50
|
buffer.flush();
|
|
53
|
-
|
|
51
|
+
expect(chunks).to.be.empty;
|
|
54
52
|
});
|
|
55
53
|
it('should not let push during a flush affect the result of flush', async () => {
|
|
56
|
-
const buffer = new
|
|
54
|
+
const buffer = new BufferBufferingStream({ maxChunkSize: 2 });
|
|
57
55
|
const chunks = [];
|
|
58
56
|
buffer.onData(c => {
|
|
59
57
|
chunks.push(c);
|
|
@@ -61,8 +59,8 @@ describe('BufferringStream', () => {
|
|
|
61
59
|
});
|
|
62
60
|
buffer.push(Buffer.from([0, 1, 2, 3]));
|
|
63
61
|
buffer.flush();
|
|
64
|
-
|
|
65
|
-
|
|
62
|
+
expect(chunks).deep.eq([Buffer.from([0, 1]), Buffer.from([2, 3])]);
|
|
63
|
+
expect(await waitForChunk(buffer)).deep.eq(Buffer.from([99, 99]));
|
|
66
64
|
});
|
|
67
65
|
function waitForChunk(buffer) {
|
|
68
66
|
return new Promise(resolve => buffer.onData(resolve));
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"buffering-stream.spec.js","sourceRoot":"","sources":["../../src/node/buffering-stream.spec.ts"],"names":[],"mappings":"
|
|
1
|
+
{"version":3,"file":"buffering-stream.spec.js","sourceRoot":"","sources":["../../src/node/buffering-stream.spec.ts"],"names":[],"mappings":"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"}
|
package/lib/node/index.d.ts
CHANGED
|
@@ -1,2 +1,2 @@
|
|
|
1
|
-
export * from './terminal-backend-module';
|
|
1
|
+
export * from './terminal-backend-module.js';
|
|
2
2
|
//# sourceMappingURL=index.d.ts.map
|
package/lib/node/index.d.ts.map
CHANGED
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"index.d.ts","sourceRoot":"","sources":["../../src/node/index.ts"],"names":[],"mappings":"AAgBA,cAAc,
|
|
1
|
+
{"version":3,"file":"index.d.ts","sourceRoot":"","sources":["../../src/node/index.ts"],"names":[],"mappings":"AAgBA,cAAc,8BAA8B,CAAC"}
|
package/lib/node/index.js
CHANGED
|
@@ -1,4 +1,3 @@
|
|
|
1
|
-
"use strict";
|
|
2
1
|
// *****************************************************************************
|
|
3
2
|
// Copyright (C) 2017 TypeFox and others.
|
|
4
3
|
//
|
|
@@ -14,7 +13,5 @@
|
|
|
14
13
|
//
|
|
15
14
|
// SPDX-License-Identifier: EPL-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0
|
|
16
15
|
// *****************************************************************************
|
|
17
|
-
|
|
18
|
-
const tslib_1 = require("tslib");
|
|
19
|
-
tslib_1.__exportStar(require("./terminal-backend-module"), exports);
|
|
16
|
+
export * from './terminal-backend-module.js';
|
|
20
17
|
//# sourceMappingURL=index.js.map
|
package/lib/node/index.js.map
CHANGED
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"index.js","sourceRoot":"","sources":["../../src/node/index.ts"],"names":[],"mappings":"
|
|
1
|
+
{"version":3,"file":"index.js","sourceRoot":"","sources":["../../src/node/index.ts"],"names":[],"mappings":"AAAA,gFAAgF;AAChF,yCAAyC;AACzC,EAAE;AACF,2EAA2E;AAC3E,mEAAmE;AACnE,wCAAwC;AACxC,EAAE;AACF,4EAA4E;AAC5E,8EAA8E;AAC9E,6EAA6E;AAC7E,yDAAyD;AACzD,uDAAuD;AACvD,EAAE;AACF,gFAAgF;AAChF,gFAAgF;AAEhF,cAAc,8BAA8B,CAAC"}
|
|
@@ -1,4 +1,4 @@
|
|
|
1
|
-
import { ShellProcessOptions } from './shell-process';
|
|
1
|
+
import { ShellProcessOptions } from './shell-process.js';
|
|
2
2
|
import { ILogger, MaybePromise } from '@theia/core';
|
|
3
3
|
import { BackendApplicationContribution, BundledResourceProvider } from '@theia/core/lib/node';
|
|
4
4
|
export declare class ShellIntegrationInjector implements BackendApplicationContribution {
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"shell-integration-injector.d.ts","sourceRoot":"","sources":["../../src/node/shell-integration-injector.ts"],"names":[],"mappings":"AAmBA,OAAO,EAAgB,mBAAmB,EAAE,MAAM,
|
|
1
|
+
{"version":3,"file":"shell-integration-injector.d.ts","sourceRoot":"","sources":["../../src/node/shell-integration-injector.ts"],"names":[],"mappings":"AAmBA,OAAO,EAAgB,mBAAmB,EAAE,MAAM,oBAAoB,CAAC;AAEvE,OAAO,EAAE,OAAO,EAAE,YAAY,EAAE,MAAM,aAAa,CAAC;AACpD,OAAO,EAAE,8BAA8B,EAAE,uBAAuB,EAAE,MAAM,sBAAsB,CAAC;AAE/F,qBACa,wBAAyB,YAAW,8BAA8B;IAG3E,SAAS,CAAC,QAAQ,CAAC,MAAM,EAAE,OAAO,CAAC;IAGnC,SAAS,CAAC,QAAQ,CAAC,uBAAuB,EAAE,uBAAuB,CAAC;IAEpE,SAAS,CAAC,QAAQ,CAAC,oBAAoB,wBAAwB;IAE/D,SAAS,CAAC,QAAQ,CAAC,gBAAgB,cAAc;IACjD,SAAS,CAAC,QAAQ,CAAC,4BAA4B,gCAAgC;IAE/E,SAAS,CAAC,QAAQ,CAAC,uBAAuB,mBAAmB;IAC7D,SAAS,CAAC,QAAQ,CAAC,mBAAmB,SAAS;IAC/C,SAAS,CAAC,QAAQ,CAAC,eAAe,aAAa;IAC/C,SAAS,CAAC,QAAQ,CAAC,oBAAoB,mBAAmB;IAC1D,SAAS,CAAC,QAAQ,CAAC,wBAAwB,4BAA4B;IAEvE,oFAAoF;IACpF,SAAS,CAAC,mBAAmB,EAAE,MAAM,GAAG,SAAS,CAAC;IAClD,SAAS,CAAC,wBAAwB,EAAE,OAAO,CAAC,IAAI,CAAC,GAAG,SAAS,CAAC;IAE9D,UAAU,IAAI,YAAY,CAAC,IAAI,CAAC;IAKhC,sBAAsB,CAAC,OAAO,EAAE,mBAAmB,GAAG,mBAAmB;IAqCzE;;;;OAIG;IACH,SAAS,CAAC,sBAAsB,IAAI,OAAO,CAAC,IAAI,CAAC;IAajD,SAAS,CAAC,uBAAuB,CAAC,YAAY,EAAE,MAAM,GAAG,MAAM,GAAG,SAAS;IAe3E,SAAS,CAAC,cAAc,CAAC,IAAI,EAAE,MAAM,GAAG,MAAM,EAAE,GAAG,SAAS,GAAG,MAAM,EAAE,GAAG,SAAS;CAWtF"}
|
|
@@ -1,4 +1,3 @@
|
|
|
1
|
-
"use strict";
|
|
2
1
|
// *****************************************************************************
|
|
3
2
|
// Copyright (C) 2025 EclipseSource GmbH and others.
|
|
4
3
|
//
|
|
@@ -14,16 +13,14 @@
|
|
|
14
13
|
//
|
|
15
14
|
// SPDX-License-Identifier: EPL-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0
|
|
16
15
|
// *****************************************************************************
|
|
17
|
-
|
|
18
|
-
|
|
19
|
-
|
|
20
|
-
|
|
21
|
-
|
|
22
|
-
|
|
23
|
-
|
|
24
|
-
|
|
25
|
-
const core_1 = require("@theia/core");
|
|
26
|
-
const node_1 = require("@theia/core/lib/node");
|
|
16
|
+
import { __decorate } from "tslib";
|
|
17
|
+
import * as path from 'path';
|
|
18
|
+
import * as fs from 'fs';
|
|
19
|
+
import { guessShellTypeFromExecutable } from '../common/shell-type.js';
|
|
20
|
+
import { ShellProcess } from './shell-process.js';
|
|
21
|
+
import { injectable, inject, named } from '@theia/core/shared/inversify';
|
|
22
|
+
import { ILogger } from '@theia/core';
|
|
23
|
+
import { BundledResourceProvider } from '@theia/core/lib/node';
|
|
27
24
|
let ShellIntegrationInjector = class ShellIntegrationInjector {
|
|
28
25
|
constructor() {
|
|
29
26
|
this.INTEGRATION_ROOT_DIR = 'shell-integrations';
|
|
@@ -40,8 +37,8 @@ let ShellIntegrationInjector = class ShellIntegrationInjector {
|
|
|
40
37
|
return this.resolveIntegrationRoot();
|
|
41
38
|
}
|
|
42
39
|
injectShellIntegration(options) {
|
|
43
|
-
const shellExecutable = options.shell ??
|
|
44
|
-
const shellType =
|
|
40
|
+
const shellExecutable = options.shell ?? ShellProcess.getShellExecutablePath();
|
|
41
|
+
const shellType = guessShellTypeFromExecutable(shellExecutable);
|
|
45
42
|
if (shellType === "bash" /* GeneralShellType.Bash */) {
|
|
46
43
|
const scriptPath = this.getShellIntegrationPath(this.BASH_INTEGRATION_SCRIPT_PATH);
|
|
47
44
|
if (!scriptPath) {
|
|
@@ -84,7 +81,7 @@ let ShellIntegrationInjector = class ShellIntegrationInjector {
|
|
|
84
81
|
*/
|
|
85
82
|
resolveIntegrationRoot() {
|
|
86
83
|
return this.resolvingIntegrationRoot ??= (async () => {
|
|
87
|
-
const bundledPath = path.join(
|
|
84
|
+
const bundledPath = path.join(import.meta.dirname, this.INTEGRATION_ROOT_DIR);
|
|
88
85
|
try {
|
|
89
86
|
this.integrationRootPath = await this.bundledResourceProvider.resolveExternalPath(bundledPath);
|
|
90
87
|
}
|
|
@@ -120,17 +117,15 @@ let ShellIntegrationInjector = class ShellIntegrationInjector {
|
|
|
120
117
|
return args.filter(arg => arg !== '-l' && arg !== '--login');
|
|
121
118
|
}
|
|
122
119
|
};
|
|
123
|
-
|
|
124
|
-
|
|
125
|
-
(
|
|
126
|
-
(0, inversify_1.named)('terminal:ShellIntegrationInjector'),
|
|
127
|
-
tslib_1.__metadata("design:type", Object)
|
|
120
|
+
__decorate([
|
|
121
|
+
inject(ILogger),
|
|
122
|
+
named('terminal:ShellIntegrationInjector')
|
|
128
123
|
], ShellIntegrationInjector.prototype, "logger", void 0);
|
|
129
|
-
|
|
130
|
-
|
|
131
|
-
tslib_1.__metadata("design:type", Object)
|
|
124
|
+
__decorate([
|
|
125
|
+
inject(BundledResourceProvider)
|
|
132
126
|
], ShellIntegrationInjector.prototype, "bundledResourceProvider", void 0);
|
|
133
|
-
|
|
134
|
-
|
|
127
|
+
ShellIntegrationInjector = __decorate([
|
|
128
|
+
injectable()
|
|
135
129
|
], ShellIntegrationInjector);
|
|
130
|
+
export { ShellIntegrationInjector };
|
|
136
131
|
//# sourceMappingURL=shell-integration-injector.js.map
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"shell-integration-injector.js","sourceRoot":"","sources":["../../src/node/shell-integration-injector.ts"],"names":[],"mappings":"
|
|
1
|
+
{"version":3,"file":"shell-integration-injector.js","sourceRoot":"","sources":["../../src/node/shell-integration-injector.ts"],"names":[],"mappings":"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"}
|
|
@@ -1,4 +1,3 @@
|
|
|
1
|
-
"use strict";
|
|
2
1
|
// *****************************************************************************
|
|
3
2
|
// Copyright (C) 2026 EclipseSource GmbH and others.
|
|
4
3
|
//
|
|
@@ -14,19 +13,17 @@
|
|
|
14
13
|
//
|
|
15
14
|
// SPDX-License-Identifier: EPL-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0
|
|
16
15
|
// *****************************************************************************
|
|
17
|
-
|
|
18
|
-
|
|
19
|
-
|
|
20
|
-
|
|
21
|
-
|
|
22
|
-
|
|
23
|
-
|
|
24
|
-
|
|
25
|
-
|
|
26
|
-
|
|
27
|
-
|
|
28
|
-
const node_1 = require("@theia/core/lib/node");
|
|
29
|
-
const shell_integration_injector_1 = require("./shell-integration-injector");
|
|
16
|
+
import 'reflect-metadata';
|
|
17
|
+
import { expect } from 'chai';
|
|
18
|
+
import * as fs from 'fs';
|
|
19
|
+
import * as path from 'path';
|
|
20
|
+
import * as temp from 'temp';
|
|
21
|
+
import { Container } from '@theia/core/shared/inversify';
|
|
22
|
+
import { OS } from '@theia/core';
|
|
23
|
+
import { ILogger } from '@theia/core/lib/common/logger';
|
|
24
|
+
import { MockLogger } from '@theia/core/lib/common/test/mock-logger';
|
|
25
|
+
import { BundledResourceProvider } from '@theia/core/lib/node';
|
|
26
|
+
import { ShellIntegrationInjector } from './shell-integration-injector.js';
|
|
30
27
|
describe('ShellIntegrationInjector', () => {
|
|
31
28
|
const track = temp.track();
|
|
32
29
|
/** Stands for the location outside of the application bundle at which the scripts are made available. */
|
|
@@ -39,9 +36,9 @@ describe('ShellIntegrationInjector', () => {
|
|
|
39
36
|
* platform so that the tests cover the same branches everywhere. Restore it per test rather than once for
|
|
40
37
|
* the suite, because `shell-type.spec.ts` installs a root hook that resets it after every test.
|
|
41
38
|
*/
|
|
42
|
-
const originalIsWindows =
|
|
43
|
-
beforeEach(() => Object.defineProperty(
|
|
44
|
-
afterEach(() => Object.defineProperty(
|
|
39
|
+
const originalIsWindows = OS.backend.isWindows;
|
|
40
|
+
beforeEach(() => Object.defineProperty(OS.backend, 'isWindows', { value: false }));
|
|
41
|
+
afterEach(() => Object.defineProperty(OS.backend, 'isWindows', { value: originalIsWindows }));
|
|
45
42
|
beforeEach(async () => {
|
|
46
43
|
externalRoot = track.mkdirSync();
|
|
47
44
|
for (const file of ['bash/bash-integration.bash', 'zsh/zsh-integration.zsh', 'zsh/zdotdir/.zshrc']) {
|
|
@@ -55,32 +52,32 @@ describe('ShellIntegrationInjector', () => {
|
|
|
55
52
|
});
|
|
56
53
|
afterEach(() => track.cleanupSync());
|
|
57
54
|
function createInjector() {
|
|
58
|
-
const container = new
|
|
59
|
-
container.bind(
|
|
60
|
-
container.bind(
|
|
55
|
+
const container = new Container();
|
|
56
|
+
container.bind(ILogger).toConstantValue(new MockLogger());
|
|
57
|
+
container.bind(BundledResourceProvider).toConstantValue({
|
|
61
58
|
resolveExternalPath: async (resourcePath) => {
|
|
62
59
|
requestedPath = resourcePath;
|
|
63
60
|
return externalRoot;
|
|
64
61
|
}
|
|
65
62
|
});
|
|
66
|
-
container.bind(
|
|
67
|
-
return container.get(
|
|
63
|
+
container.bind(ShellIntegrationInjector).toSelf().inSingletonScope();
|
|
64
|
+
return container.get(ShellIntegrationInjector);
|
|
68
65
|
}
|
|
69
66
|
it('resolves the bundled scripts to a location that shells can read', () => {
|
|
70
|
-
|
|
67
|
+
expect(requestedPath).to.equal(path.join(import.meta.dirname, 'shell-integrations'));
|
|
71
68
|
});
|
|
72
69
|
it('passes the resolved bash script to bash', () => {
|
|
73
70
|
const options = injector.injectShellIntegration({ shell: '/bin/bash', args: ['--login'] });
|
|
74
|
-
|
|
71
|
+
expect(options.args).to.deep.equal(['--rcfile', path.join(externalRoot, 'bash', 'bash-integration.bash')]);
|
|
75
72
|
});
|
|
76
73
|
it('points zsh at the resolved script directories', () => {
|
|
77
74
|
const options = injector.injectShellIntegration({ shell: '/bin/zsh' });
|
|
78
|
-
|
|
79
|
-
|
|
75
|
+
expect(options.env?.ZDOTDIR).to.equal(path.join(externalRoot, 'zsh/zdotdir/'));
|
|
76
|
+
expect(options.env?.THEIA_ZSH_DIR).to.equal(path.join(externalRoot, 'zsh'));
|
|
80
77
|
});
|
|
81
78
|
it('leaves the options untouched while the scripts are not available', () => {
|
|
82
79
|
const options = { shell: '/bin/bash', args: ['--login'] };
|
|
83
|
-
|
|
80
|
+
expect(createInjector().injectShellIntegration(options)).to.deep.equal(options);
|
|
84
81
|
});
|
|
85
82
|
});
|
|
86
83
|
//# sourceMappingURL=shell-integration-injector.spec.js.map
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"shell-integration-injector.spec.js","sourceRoot":"","sources":["../../src/node/shell-integration-injector.spec.ts"],"names":[],"mappings":"
|
|
1
|
+
{"version":3,"file":"shell-integration-injector.spec.js","sourceRoot":"","sources":["../../src/node/shell-integration-injector.spec.ts"],"names":[],"mappings":"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"}
|