@theia/terminal 1.45.1 → 1.46.0-next.137
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-widget.d.ts +10 -0
- package/lib/browser/base/terminal-widget.d.ts.map +1 -1
- package/lib/browser/base/terminal-widget.js.map +1 -1
- package/lib/browser/index.js +2 -11
- package/lib/browser/index.js.map +1 -1
- package/lib/browser/search/terminal-search-widget.js +8 -16
- package/lib/browser/search/terminal-search-widget.js.map +1 -1
- package/lib/browser/terminal-copy-on-selection-handler.js +6 -14
- package/lib/browser/terminal-copy-on-selection-handler.js.map +1 -1
- package/lib/browser/terminal-file-link-provider.d.ts +10 -0
- package/lib/browser/terminal-file-link-provider.d.ts.map +1 -1
- package/lib/browser/terminal-file-link-provider.js +82 -23
- package/lib/browser/terminal-file-link-provider.js.map +1 -1
- package/lib/browser/terminal-frontend-contribution.d.ts +2 -0
- package/lib/browser/terminal-frontend-contribution.d.ts.map +1 -1
- package/lib/browser/terminal-frontend-contribution.js +72 -49
- package/lib/browser/terminal-frontend-contribution.js.map +1 -1
- package/lib/browser/terminal-frontend-module.d.ts.map +1 -1
- package/lib/browser/terminal-frontend-module.js +2 -0
- package/lib/browser/terminal-frontend-module.js.map +1 -1
- package/lib/browser/terminal-link-provider.js +19 -27
- package/lib/browser/terminal-link-provider.js.map +1 -1
- package/lib/browser/terminal-preferences.d.ts.map +1 -1
- package/lib/browser/terminal-preferences.js +2 -1
- package/lib/browser/terminal-preferences.js.map +1 -1
- package/lib/browser/terminal-profile-service.js +4 -12
- package/lib/browser/terminal-profile-service.js.map +1 -1
- package/lib/browser/terminal-quick-open-service.js +13 -21
- package/lib/browser/terminal-quick-open-service.js.map +1 -1
- package/lib/browser/terminal-theme-service.d.ts.map +1 -1
- package/lib/browser/terminal-theme-service.js +12 -16
- package/lib/browser/terminal-theme-service.js.map +1 -1
- package/lib/browser/terminal-url-link-provider.js +4 -12
- package/lib/browser/terminal-url-link-provider.js.map +1 -1
- package/lib/browser/terminal-widget-impl.d.ts +9 -12
- package/lib/browser/terminal-widget-impl.d.ts.map +1 -1
- package/lib/browser/terminal-widget-impl.js +111 -105
- package/lib/browser/terminal-widget-impl.js.map +1 -1
- package/lib/common/terminal-watcher.js +2 -7
- package/lib/common/terminal-watcher.js.map +1 -1
- package/lib/node/base-terminal-server.js +6 -17
- package/lib/node/base-terminal-server.js.map +1 -1
- package/lib/node/index.js +2 -11
- package/lib/node/index.js.map +1 -1
- package/lib/node/shell-process.js +10 -21
- package/lib/node/shell-process.js.map +1 -1
- package/lib/node/shell-terminal-server.js +9 -20
- package/lib/node/shell-terminal-server.js.map +1 -1
- package/lib/node/terminal-backend-contribution.js +6 -14
- package/lib/node/terminal-backend-contribution.js.map +1 -1
- package/lib/node/terminal-server.js +8 -19
- package/lib/node/terminal-server.js.map +1 -1
- package/package.json +14 -12
- package/src/browser/base/terminal-widget.ts +13 -0
- package/src/browser/terminal-file-link-provider.ts +66 -7
- package/src/browser/terminal-frontend-contribution.ts +38 -3
- package/src/browser/terminal-frontend-module.ts +3 -1
- package/src/browser/terminal-preferences.ts +2 -1
- package/src/browser/terminal-theme-service.ts +6 -2
- package/src/browser/terminal-widget-impl.ts +94 -62
- package/src/node/shell-process.ts +1 -1
|
@@ -14,28 +14,17 @@
|
|
|
14
14
|
//
|
|
15
15
|
// SPDX-License-Identifier: EPL-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0
|
|
16
16
|
// *****************************************************************************
|
|
17
|
-
var __decorate = (this && this.__decorate) || function (decorators, target, key, desc) {
|
|
18
|
-
var c = arguments.length, r = c < 3 ? target : desc === null ? desc = Object.getOwnPropertyDescriptor(target, key) : desc, d;
|
|
19
|
-
if (typeof Reflect === "object" && typeof Reflect.decorate === "function") r = Reflect.decorate(decorators, target, key, desc);
|
|
20
|
-
else for (var i = decorators.length - 1; i >= 0; i--) if (d = decorators[i]) r = (c < 3 ? d(r) : c > 3 ? d(target, key, r) : d(target, key)) || r;
|
|
21
|
-
return c > 3 && r && Object.defineProperty(target, key, r), r;
|
|
22
|
-
};
|
|
23
|
-
var __metadata = (this && this.__metadata) || function (k, v) {
|
|
24
|
-
if (typeof Reflect === "object" && typeof Reflect.metadata === "function") return Reflect.metadata(k, v);
|
|
25
|
-
};
|
|
26
|
-
var __param = (this && this.__param) || function (paramIndex, decorator) {
|
|
27
|
-
return function (target, key) { decorator(target, key, paramIndex); }
|
|
28
|
-
};
|
|
29
17
|
var ShellProcess_1;
|
|
30
18
|
Object.defineProperty(exports, "__esModule", { value: true });
|
|
31
19
|
exports.ShellProcess = exports.getRootPath = exports.ShellProcessOptions = exports.ShellProcessFactory = void 0;
|
|
20
|
+
const tslib_1 = require("tslib");
|
|
32
21
|
const inversify_1 = require("@theia/core/shared/inversify");
|
|
33
22
|
const os = require("os");
|
|
34
23
|
const logger_1 = require("@theia/core/lib/common/logger");
|
|
35
24
|
const node_1 = require("@theia/process/lib/node");
|
|
36
25
|
const common_1 = require("@theia/core/lib/common");
|
|
37
26
|
const uri_1 = require("@theia/core/lib/common/uri");
|
|
38
|
-
const file_uri_1 = require("@theia/core/lib/
|
|
27
|
+
const file_uri_1 = require("@theia/core/lib/common/file-uri");
|
|
39
28
|
const environment_utils_1 = require("@theia/core/lib/node/environment-utils");
|
|
40
29
|
const utils_1 = require("@theia/process/lib/node/utils");
|
|
41
30
|
exports.ShellProcessFactory = Symbol('ShellProcessFactory');
|
|
@@ -93,15 +82,15 @@ let ShellProcess = ShellProcess_1 = class ShellProcess extends node_1.TerminalPr
|
|
|
93
82
|
};
|
|
94
83
|
ShellProcess.defaultCols = 80;
|
|
95
84
|
ShellProcess.defaultRows = 24;
|
|
96
|
-
ShellProcess = ShellProcess_1 = __decorate([
|
|
85
|
+
ShellProcess = ShellProcess_1 = (0, tslib_1.__decorate)([
|
|
97
86
|
(0, inversify_1.injectable)(),
|
|
98
|
-
__param(0, (0, inversify_1.inject)(exports.ShellProcessOptions)),
|
|
99
|
-
__param(1, (0, inversify_1.inject)(node_1.ProcessManager)),
|
|
100
|
-
__param(2, (0, inversify_1.inject)(node_1.MultiRingBuffer)),
|
|
101
|
-
__param(3, (0, inversify_1.inject)(logger_1.ILogger)),
|
|
102
|
-
__param(3, (0, inversify_1.named)('terminal')),
|
|
103
|
-
__param(4, (0, inversify_1.inject)(environment_utils_1.EnvironmentUtils)),
|
|
104
|
-
__metadata("design:paramtypes", [Object, node_1.ProcessManager,
|
|
87
|
+
(0, tslib_1.__param)(0, (0, inversify_1.inject)(exports.ShellProcessOptions)),
|
|
88
|
+
(0, tslib_1.__param)(1, (0, inversify_1.inject)(node_1.ProcessManager)),
|
|
89
|
+
(0, tslib_1.__param)(2, (0, inversify_1.inject)(node_1.MultiRingBuffer)),
|
|
90
|
+
(0, tslib_1.__param)(3, (0, inversify_1.inject)(logger_1.ILogger)),
|
|
91
|
+
(0, tslib_1.__param)(3, (0, inversify_1.named)('terminal')),
|
|
92
|
+
(0, tslib_1.__param)(4, (0, inversify_1.inject)(environment_utils_1.EnvironmentUtils)),
|
|
93
|
+
(0, tslib_1.__metadata)("design:paramtypes", [Object, node_1.ProcessManager,
|
|
105
94
|
node_1.MultiRingBuffer, Object, environment_utils_1.EnvironmentUtils])
|
|
106
95
|
], ShellProcess);
|
|
107
96
|
exports.ShellProcess = ShellProcess;
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"shell-process.js","sourceRoot":"","sources":["../../src/node/shell-process.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
|
|
1
|
+
{"version":3,"file":"shell-process.js","sourceRoot":"","sources":["../../src/node/shell-process.ts"],"names":[],"mappings":"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"}
|
|
@@ -14,20 +14,9 @@
|
|
|
14
14
|
//
|
|
15
15
|
// SPDX-License-Identifier: EPL-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0
|
|
16
16
|
// *****************************************************************************
|
|
17
|
-
var __decorate = (this && this.__decorate) || function (decorators, target, key, desc) {
|
|
18
|
-
var c = arguments.length, r = c < 3 ? target : desc === null ? desc = Object.getOwnPropertyDescriptor(target, key) : desc, d;
|
|
19
|
-
if (typeof Reflect === "object" && typeof Reflect.decorate === "function") r = Reflect.decorate(decorators, target, key, desc);
|
|
20
|
-
else for (var i = decorators.length - 1; i >= 0; i--) if (d = decorators[i]) r = (c < 3 ? d(r) : c > 3 ? d(target, key, r) : d(target, key)) || r;
|
|
21
|
-
return c > 3 && r && Object.defineProperty(target, key, r), r;
|
|
22
|
-
};
|
|
23
|
-
var __metadata = (this && this.__metadata) || function (k, v) {
|
|
24
|
-
if (typeof Reflect === "object" && typeof Reflect.metadata === "function") return Reflect.metadata(k, v);
|
|
25
|
-
};
|
|
26
|
-
var __param = (this && this.__param) || function (paramIndex, decorator) {
|
|
27
|
-
return function (target, key) { decorator(target, key, paramIndex); }
|
|
28
|
-
};
|
|
29
17
|
Object.defineProperty(exports, "__esModule", { value: true });
|
|
30
18
|
exports.ShellTerminalServer = void 0;
|
|
19
|
+
const tslib_1 = require("tslib");
|
|
31
20
|
const inversify_1 = require("@theia/core/shared/inversify");
|
|
32
21
|
const logger_1 = require("@theia/core/lib/common/logger");
|
|
33
22
|
const environment_utils_1 = require("@theia/core/lib/node/environment-utils");
|
|
@@ -197,17 +186,17 @@ let ShellTerminalServer = class ShellTerminalServer extends base_terminal_server
|
|
|
197
186
|
return result;
|
|
198
187
|
}
|
|
199
188
|
};
|
|
200
|
-
__decorate([
|
|
189
|
+
(0, tslib_1.__decorate)([
|
|
201
190
|
(0, inversify_1.inject)(environment_utils_1.EnvironmentUtils),
|
|
202
|
-
__metadata("design:type", environment_utils_1.EnvironmentUtils)
|
|
191
|
+
(0, tslib_1.__metadata)("design:type", environment_utils_1.EnvironmentUtils)
|
|
203
192
|
], ShellTerminalServer.prototype, "environmentUtils", void 0);
|
|
204
|
-
ShellTerminalServer = __decorate([
|
|
193
|
+
ShellTerminalServer = (0, tslib_1.__decorate)([
|
|
205
194
|
(0, inversify_1.injectable)(),
|
|
206
|
-
__param(0, (0, inversify_1.inject)(shell_process_1.ShellProcessFactory)),
|
|
207
|
-
__param(1, (0, inversify_1.inject)(node_1.ProcessManager)),
|
|
208
|
-
__param(2, (0, inversify_1.inject)(logger_1.ILogger)),
|
|
209
|
-
__param(2, (0, inversify_1.named)('terminal')),
|
|
210
|
-
__metadata("design:paramtypes", [Function, node_1.ProcessManager, Object])
|
|
195
|
+
(0, tslib_1.__param)(0, (0, inversify_1.inject)(shell_process_1.ShellProcessFactory)),
|
|
196
|
+
(0, tslib_1.__param)(1, (0, inversify_1.inject)(node_1.ProcessManager)),
|
|
197
|
+
(0, tslib_1.__param)(2, (0, inversify_1.inject)(logger_1.ILogger)),
|
|
198
|
+
(0, tslib_1.__param)(2, (0, inversify_1.named)('terminal')),
|
|
199
|
+
(0, tslib_1.__metadata)("design:paramtypes", [Function, node_1.ProcessManager, Object])
|
|
211
200
|
], ShellTerminalServer);
|
|
212
201
|
exports.ShellTerminalServer = ShellTerminalServer;
|
|
213
202
|
//# sourceMappingURL=shell-terminal-server.js.map
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"shell-terminal-server.js","sourceRoot":"","sources":["../../src/node/shell-terminal-server.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
|
|
1
|
+
{"version":3,"file":"shell-terminal-server.js","sourceRoot":"","sources":["../../src/node/shell-terminal-server.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,4DAAyE;AACzE,0DAAwD;AACxD,8EAA0E;AAC1E,iEAA4D;AAC5D,mDAAmE;AACnE,kDAA0E;AAC1E,kDAAsD;AACtD,oCAAoC;AACpC,+EAI6C;AAC7C,sCAAkC;AAClC,oEAAiE;AAUjE,IAAa,mBAAmB,GAAhC,MAAa,mBAAoB,SAAQ,yCAAkB;IAKvD,YACoD,YAAiC,EACzD,cAA8B,EAClB,MAAe;QACnD,KAAK,CAAC,cAAc,EAAE,MAAM,CAAC,CAAC;QAHkB,iBAAY,GAAZ,YAAY,CAAqB;QAH5E,gBAAW,GAAsE,IAAI,yBAAW,CAAC,CAAC,CAAC,CAAC;IAO7G,CAAC;IAED,KAAK,CAAC,MAAM,CAAC,OAAoC;QAC7C,IAAI;YACA,IAAI,OAAO,CAAC,SAAS,KAAK,IAAI,EAAE;gBAC5B,OAAO,CAAC,GAAG,GAAG,IAAI,CAAC,gBAAgB,CAAC,eAAe,CAAC,OAAO,CAAC,GAAG,CAAC,CAAC;gBACjE,IAAI,CAAC,yBAAyB,CAAC,UAAG,CAAC,YAAY,CAAC,IAAA,2BAAW,EAAC,OAAO,CAAC,OAAO,CAAC,CAAC,EAAE,OAAO,CAAC,GAAG,CAAC,CAAC;aAC/F;YACD,MAAM,IAAI,GAAG,IAAI,CAAC,YAAY,CAAC,OAAO,CAAC,CAAC;YACxC,IAAI,CAAC,UAAU,CAAC,IAAI,CAAC,CAAC;YACtB,OAAO,IAAI,CAAC,EAAE,CAAC;SAClB;QAAC,OAAO,KAAK,EAAE;YACZ,IAAI,CAAC,MAAM,CAAC,KAAK,CAAC,+BAA+B,EAAE,KAAK,CAAC,CAAC;YAC1D,OAAO,CAAC,CAAC,CAAC;SACb;IACL,CAAC;IAED,sKAAsK;IAC9J,eAAe,CAAC,OAAe,EAAE,IAAc;QACnD,OAAO,IAAI,OAAO,CAAC,CAAC,OAAO,EAAE,MAAM,EAAE,EAAE;YACnC,IAAI,MAAM,GAAG,EAAE,CAAC;YAChB,MAAM,KAAK,GAAG,EAAE,CAAC,KAAK,CAAC,OAAO,EAAE,IAAI,CAAC,CAAC;YACtC,IAAI,KAAK,CAAC,GAAG,EAAE;gBACX,KAAK,CAAC,MAAM,CAAC,EAAE,CAAC,MAAM,EAAE,CAAC,IAAY,EAAE,EAAE;oBACrC,MAAM,IAAI,IAAI,CAAC,QAAQ,EAAE,CAAC;gBAC9B,CAAC,CAAC,CAAC;aACN;YACD,KAAK,CAAC,EAAE,CAAC,OAAO,EAAE,GAAG,CAAC,EAAE;gBACpB,MAAM,CAAC,GAAG,CAAC,CAAC;YAChB,CAAC,CAAC,CAAC;YACH,KAAK,CAAC,EAAE,CAAC,OAAO,EAAE,IAAI,CAAC,EAAE;gBACrB,OAAO,CAAC,MAAM,CAAC,CAAC;YACpB,CAAC,CAAC,CAAC;QACP,CAAC,CAAC,CAAC;IACP,CAAC;IAEM,iBAAiB,CAAC,SAA6B;QAClD,IAAI,SAAS,EAAE;YACX,qEAAqE;YACrE,IAAI,cAAS,EAAE;gBACX,OAAO,IAAI,CAAC,eAAe,CAAC,MAAM,EAAE,CAAC,SAAS,EAAE,KAAK,EAAE,iBAAiB,CAAC,CAAC,CAAC,IAAI,CAAC,MAAM,CAAC,EAAE;oBACrF,MAAM,IAAI,GAAG,MAAM,CAAC,KAAK,CAAC,MAAM,CAAC,CAAC;oBAClC,OAAO,IAAI,CAAC,IAAI,CAAC,CAAC,CAAC,EAAE,CAAC,QAAQ,CAAC,CAAC,CAAC,KAAK,SAAS,CAAC,CAAC;gBACrD,CAAC,EAAE,KAAK,CAAC,EAAE,CAAC,IAAI,CAAC,CAAC;aACrB;iBAAM;gBACH,OAAO,IAAI,CAAC,eAAe,CAAC,gBAAgB,EAAE,CAAC,KAAK,EAAE,MAAM,CAAC,SAAS,CAAC,CAAC,CAAC,CAAC,IAAI,CAAC,MAAM,CAAC,EAAE;oBACpF,MAAM,CAAC,GAAG,MAAM,CAAC,IAAI,EAAE,CAAC;oBACxB,IAAI,CAAC,CAAC,MAAM,KAAK,CAAC,IAAI,CAAC,CAAC,OAAO,CAAC,OAAO,CAAC,IAAI,CAAC,EAAE,EAAE,iBAAiB;wBAC9D,OAAO,KAAK,CAAC;qBAChB;yBAAM;wBACH,OAAO,IAAI,CAAC;qBACf;gBACL,CAAC,EAAE,KAAK,CAAC,EAAE,CAAC,IAAI,CAAC,CAAC;aACrB;SACJ;QACD,yBAAyB;QACzB,OAAO,OAAO,CAAC,OAAO,CAAC,IAAI,CAAC,CAAC;IACjC,CAAC;IAED,yBAAyB,CAAC,MAAW,EAAE,GAAqC;QACxE,IAAI,0BAES,CAAC;QACd,IAAI,cAAS,EAAE;YACX,0BAA0B,GAAG,EAAE,CAAC;YAChC,MAAM,CAAC,IAAI,CAAC,GAAG,CAAC,CAAC,OAAO,CAAC,CAAC,CAAC,EAAE,CAAC,0BAA2B,CAAC,CAAC,CAAC,WAAW,EAAE,CAAC,GAAG,CAAC,CAAC,CAAC;SACnF;QACD,IAAI,CAAC,WAAW,CAAC,OAAO,CAAC,CAAC,QAAQ,EAAE,CAAC,mBAAmB,EAAE,OAAO,CAAC,EAAE,EAAE;YAClE,IAAI,OAAO,KAAK,qCAAW,IAAI,IAAI,CAAC,cAAc,CAAC,MAAM,EAAE,OAAO,CAAC,EAAE;gBACjE,QAAQ,CAAC,gBAAgB,CAAC,OAAO,CAAC,CAAC,OAAO,EAAE,QAAQ,EAAE,EAAE;oBACpD,MAAM,cAAc,GAAG,cAAS,CAAC,CAAC,CAAC,0BAA2B,CAAC,QAAQ,CAAC,WAAW,EAAE,CAAC,IAAI,QAAQ,CAAC,CAAC,CAAC,QAAQ,CAAC;oBAC9G,QAAQ,OAAO,CAAC,IAAI,EAAE;wBAClB,KAAK,wDAA8B,CAAC,MAAM;4BACtC,GAAG,CAAC,cAAc,CAAC,GAAG,CAAC,GAAG,CAAC,cAAc,CAAC,IAAI,EAAE,CAAC,GAAG,OAAO,CAAC,KAAK,CAAC;4BAClE,MAAM;wBACV,KAAK,wDAA8B,CAAC,OAAO;4BACvC,GAAG,CAAC,cAAc,CAAC,GAAG,OAAO,CAAC,KAAK,GAAG,CAAC,GAAG,CAAC,cAAc,CAAC,IAAI,EAAE,CAAC,CAAC;4BAClE,MAAM;wBACV,KAAK,wDAA8B,CAAC,OAAO;4BACvC,GAAG,CAAC,cAAc,CAAC,GAAG,OAAO,CAAC,KAAK,CAAC;4BACpC,MAAM;qBACb;gBACL,CAAC,CAAC,CAAC;aACN;QACL,CAAC,CAAC,CAAC;IACP,CAAC;IAED,cAAc,CAAC,MAAW,EAAE,OAAe;QACvC,OAAO,IAAI,UAAG,CAAC,OAAO,CAAC,CAAC,eAAe,CAAC,MAAM,CAAC,CAAC;IACpD,CAAC;IAED;;;iGAG6F;IAC7F,4JAA4J;IAE5J,aAAa,CAAC,mBAA2B,EAAE,OAAe,EAAE,UAAmB,EAC3E,UAAqD;QACrD,IAAI,CAAC,eAAe,CAAC,mBAAmB,EAAE,OAAO,EAAE,UAAU,EAAE,UAAU,CAAC,CAAC;QAC3E,IAAI,CAAC,iBAAiB,EAAE,CAAC;IAC7B,CAAC;IAEO,eAAe,CAAC,mBAA2B,EAAE,OAAe,EAAE,UAAmB,EACrF,UAAqD;QACrD,IAAI,CAAC,WAAW,CAAC,GAAG,CAAC,CAAC,mBAAmB,EAAE,OAAO,CAAC,EAAE;YACjD,UAAU,EAAE,UAAU;YACtB,WAAW,EAAE,UAAU,CAAC,WAAW;YACnC,gBAAgB,EAAE,IAAI,GAAG,CAAC,UAAU,CAAC,QAAQ,CAAC;SACjD,CAAC,CAAC;IACP,CAAC;IAED,gBAAgB,CAAC,SAAiB;QAC9B,MAAM,eAAe,GAAuD,IAAI,CAAC,KAAK,CAAC,SAAS,CAAC,CAAC;QAClG,eAAe,CAAC,OAAO,CAAC,CAAC,CAAC,EAAE,WAAC,OAAA,IAAI,CAAC,eAAe,CAAC,CAAC,CAAC,mBAAmB,EAAE,MAAA,CAAC,CAAC,OAAO,mCAAI,qCAAW,EAAE,IAAI,EAAE,CAAC,CAAC,UAAU,CAAC,CAAA,EAAA,CAAC,CAAC;IAE5H,CAAC;IAED,gBAAgB,CAAC,mBAA2B;QACxC,IAAI,CAAC,WAAW,CAAC,MAAM,CAAC,CAAC,mBAAmB,CAAC,CAAC,CAAC;QAC/C,IAAI,CAAC,iBAAiB,EAAE,CAAC;IAC7B,CAAC;IAEO,iBAAiB;QACrB,IAAI,CAAC,kBAAkB,EAAE,CAAC;IAC9B,CAAC;IAES,kBAAkB;QACxB,MAAM,eAAe,GAAuD,EAAE,CAAC;QAC/E,IAAI,CAAC,WAAW,CAAC,OAAO,CAAC,CAAC,UAAU,EAAE,CAAC,mBAAmB,EAAE,OAAO,CAAC,EAAE,EAAE;YACpE,IAAI,UAAU,CAAC,UAAU,EAAE;gBACvB,eAAe,CAAC,IAAI,CAAC;oBACjB,mBAAmB;oBACnB,OAAO;oBACP,UAAU,EAAE;wBACR,WAAW,EAAE,UAAU,CAAC,WAAW;wBACnC,QAAQ,EAAE,CAAC,GAAG,IAAI,CAAC,WAAW,CAAC,GAAG,CAAC,CAAC,mBAAmB,EAAE,OAAO,CAAC,CAAE,CAAC,gBAAgB,CAAC,OAAO,EAAE,CAAC;qBAClG;iBACJ,CAAC,CAAC;aACN;QACL,CAAC,CAAC,CAAC;QACH,IAAI,IAAI,CAAC,MAAM,EAAE;YACb,MAAM,eAAe,GAAG,IAAI,CAAC,SAAS,CAAC,eAAe,CAAC,CAAC;YACxD,IAAI,CAAC,MAAM,CAAC,yBAAyB,CAAC,eAAe,CAAC,CAAC;SAC1D;IACL,CAAC;IAED,KAAK,CAAC,0CAA0C,CAAC,EAAU;QACvD,MAAM,QAAQ,GAAG,IAAI,CAAC,cAAc,CAAC,GAAG,CAAC,EAAE,CAAC,CAAC;QAC7C,IAAI,CAAC,CAAC,QAAQ,YAAY,sBAAe,CAAC,EAAE;YACxC,MAAM,IAAI,KAAK,CAAC,aAAa,EAAE,kBAAkB,CAAC,CAAC;SACtD;QACD,MAAM,MAAM,GAAG,IAAI,GAAG,EAAmD,CAAC;QAC1E,IAAI,CAAC,WAAW,CAAC,OAAO,CAAC,CAAC,KAAK,EAAE,GAAG,EAAE,EAAE;YACpC,MAAM,IAAI,GAAG,MAAM,CAAC,GAAG,CAAC,GAAG,CAAC,CAAC,CAAC,CAAC,IAAI,EAAE,CAAC;YACtC,IAAI,CAAC,IAAI,CAAC,KAAK,CAAC,WAAW,CAAC,CAAC;YAC7B,MAAM,CAAC,GAAG,CAAC,GAAG,CAAC,CAAC,CAAC,EAAE,IAAI,CAAC,CAAC;QAC7B,CAAC,CAAC,CAAC;QACH,OAAO,MAAM,CAAC;IAClB,CAAC;IAED,KAAK,CAAC,oBAAoB;QACtB,MAAM,MAAM,GAA2E,EAAE,CAAC;QAE1F,IAAI,CAAC,WAAW,CAAC,OAAO,CAAC,CAAC,KAAK,EAAE,CAAC,mBAAmB,EAAE,OAAO,CAAC,EAAE,EAAE;YAC/D,MAAM,CAAC,IAAI,CAAC,CAAC,mBAAmB,EAAE,OAAO,EAAE,KAAK,CAAC,UAAU,EAAE,EAAE,WAAW,EAAE,KAAK,CAAC,WAAW,EAAE,QAAQ,EAAE,CAAC,GAAG,KAAK,CAAC,gBAAgB,CAAC,OAAO,EAAE,CAAC,EAAE,CAAC,CAAC,CAAC;QACvJ,CAAC,CAAC,CAAC;QAEH,OAAO,MAAM,CAAC;IAClB,CAAC;CACJ,CAAA;AAnL6B;IAAzB,IAAA,kBAAM,EAAC,oCAAgB,CAAC;2CAA6B,oCAAgB;6DAAC;AAD9D,mBAAmB;IAD/B,IAAA,sBAAU,GAAE;IAOJ,wBAAA,IAAA,kBAAM,EAAC,mCAAmB,CAAC,CAAA;IAC3B,wBAAA,IAAA,kBAAM,EAAC,qBAAc,CAAC,CAAA;IACtB,wBAAA,IAAA,kBAAM,EAAC,gBAAO,CAAC,CAAA;IAAE,wBAAA,IAAA,iBAAK,EAAC,UAAU,CAAC,CAAA;4DADK,qBAAc;GAPjD,mBAAmB,CAoL/B;AApLY,kDAAmB"}
|
|
@@ -14,17 +14,9 @@
|
|
|
14
14
|
//
|
|
15
15
|
// SPDX-License-Identifier: EPL-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0
|
|
16
16
|
// *****************************************************************************
|
|
17
|
-
var __decorate = (this && this.__decorate) || function (decorators, target, key, desc) {
|
|
18
|
-
var c = arguments.length, r = c < 3 ? target : desc === null ? desc = Object.getOwnPropertyDescriptor(target, key) : desc, d;
|
|
19
|
-
if (typeof Reflect === "object" && typeof Reflect.decorate === "function") r = Reflect.decorate(decorators, target, key, desc);
|
|
20
|
-
else for (var i = decorators.length - 1; i >= 0; i--) if (d = decorators[i]) r = (c < 3 ? d(r) : c > 3 ? d(target, key, r) : d(target, key)) || r;
|
|
21
|
-
return c > 3 && r && Object.defineProperty(target, key, r), r;
|
|
22
|
-
};
|
|
23
|
-
var __metadata = (this && this.__metadata) || function (k, v) {
|
|
24
|
-
if (typeof Reflect === "object" && typeof Reflect.metadata === "function") return Reflect.metadata(k, v);
|
|
25
|
-
};
|
|
26
17
|
Object.defineProperty(exports, "__esModule", { value: true });
|
|
27
18
|
exports.TerminalBackendContribution = void 0;
|
|
19
|
+
const tslib_1 = require("tslib");
|
|
28
20
|
const inversify_1 = require("@theia/core/shared/inversify");
|
|
29
21
|
const common_1 = require("@theia/core/lib/common");
|
|
30
22
|
const node_1 = require("@theia/process/lib/node");
|
|
@@ -60,16 +52,16 @@ let TerminalBackendContribution = class TerminalBackendContribution {
|
|
|
60
52
|
});
|
|
61
53
|
}
|
|
62
54
|
};
|
|
63
|
-
__decorate([
|
|
55
|
+
(0, tslib_1.__decorate)([
|
|
64
56
|
(0, inversify_1.inject)(node_1.ProcessManager),
|
|
65
|
-
__metadata("design:type", node_1.ProcessManager)
|
|
57
|
+
(0, tslib_1.__metadata)("design:type", node_1.ProcessManager)
|
|
66
58
|
], TerminalBackendContribution.prototype, "processManager", void 0);
|
|
67
|
-
__decorate([
|
|
59
|
+
(0, tslib_1.__decorate)([
|
|
68
60
|
(0, inversify_1.inject)(common_1.ILogger),
|
|
69
61
|
(0, inversify_1.named)('terminal'),
|
|
70
|
-
__metadata("design:type", Object)
|
|
62
|
+
(0, tslib_1.__metadata)("design:type", Object)
|
|
71
63
|
], TerminalBackendContribution.prototype, "logger", void 0);
|
|
72
|
-
TerminalBackendContribution = __decorate([
|
|
64
|
+
TerminalBackendContribution = (0, tslib_1.__decorate)([
|
|
73
65
|
(0, inversify_1.injectable)()
|
|
74
66
|
], TerminalBackendContribution);
|
|
75
67
|
exports.TerminalBackendContribution = TerminalBackendContribution;
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"terminal-backend-contribution.js","sourceRoot":"","sources":["../../src/node/terminal-backend-contribution.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
|
|
1
|
+
{"version":3,"file":"terminal-backend-contribution.js","sourceRoot":"","sources":["../../src/node/terminal-backend-contribution.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,4DAAyE;AACzE,mDAAiD;AACjD,kDAA0E;AAC1E,mEAA4D;AAE5D,yDAA2D;AAG3D,IAAa,2BAA2B,GAAxC,MAAa,2BAA2B;IAAxC;QACuB,YAAO,GAAG,IAAI,WAAW,CAAC,OAAO,CAAC,CAAC;IAkC1D,CAAC;IA1BG,SAAS,CAAC,OAAyB;QAC/B,OAAO,CAAC,sBAAsB,CAAC,GAAG,iCAAa,MAAM,EAAE,CAAC,MAAsB,EAAE,OAAO,EAAE,EAAE;YACvF,MAAM,EAAE,GAAG,QAAQ,CAAC,MAAM,CAAC,EAAE,EAAE,EAAE,CAAC,CAAC;YACnC,MAAM,WAAW,GAAG,IAAI,CAAC,cAAc,CAAC,GAAG,CAAC,EAAE,CAAC,CAAC;YAChD,IAAI,WAAW,YAAY,sBAAe,EAAE;gBACxC,MAAM,MAAM,GAAG,WAAW,CAAC,kBAAkB,EAAE,CAAC;gBAChD,kDAAkD;gBAClD,8DAA8D;gBAC9D,OAAO,CAAC,SAAS,CAAC,CAAC,CAAC,EAAE;oBAClB,WAAW,CAAC,KAAK,CAAC,CAAC,EAAE,CAAC,UAAU,EAAE,CAAC,CAAC;gBACxC,CAAC,CAAC,CAAC;gBAEH,MAAM,MAAM,GAAG,IAAI,wCAAqB,EAAE,CAAC;gBAC3C,MAAM,CAAC,MAAM,CAAC,KAAK,CAAC,EAAE;oBAClB,OAAO,CAAC,cAAc,EAAE,CAAC,WAAW,CAAC,KAAK,CAAC,CAAC,MAAM,EAAE,CAAC;gBACzD,CAAC,CAAC,CAAC;gBACH,MAAM,CAAC,EAAE,CAAC,MAAM,EAAE,KAAK,CAAC,EAAE;oBACtB,MAAM,CAAC,IAAI,CAAC,KAAK,CAAC,CAAC;gBACvB,CAAC,CAAC,CAAC;gBACH,OAAO,CAAC,OAAO,CAAC,GAAG,EAAE;oBACjB,MAAM,CAAC,OAAO,EAAE,CAAC;oBACjB,MAAM,CAAC,OAAO,EAAE,CAAC;gBACrB,CAAC,CAAC,CAAC;aACN;QACL,CAAC,CAAC,CAAC;IACP,CAAC;CACJ,CAAA;AA/BG;IADC,IAAA,kBAAM,EAAC,qBAAc,CAAC;2CACY,qBAAc;mEAAC;AAGlD;IADC,IAAA,kBAAM,EAAC,gBAAO,CAAC;IAAE,IAAA,iBAAK,EAAC,UAAU,CAAC;;2DACA;AAP1B,2BAA2B;IADvC,IAAA,sBAAU,GAAE;GACA,2BAA2B,CAmCvC;AAnCY,kEAA2B"}
|
|
@@ -14,20 +14,9 @@
|
|
|
14
14
|
//
|
|
15
15
|
// SPDX-License-Identifier: EPL-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0
|
|
16
16
|
// *****************************************************************************
|
|
17
|
-
var __decorate = (this && this.__decorate) || function (decorators, target, key, desc) {
|
|
18
|
-
var c = arguments.length, r = c < 3 ? target : desc === null ? desc = Object.getOwnPropertyDescriptor(target, key) : desc, d;
|
|
19
|
-
if (typeof Reflect === "object" && typeof Reflect.decorate === "function") r = Reflect.decorate(decorators, target, key, desc);
|
|
20
|
-
else for (var i = decorators.length - 1; i >= 0; i--) if (d = decorators[i]) r = (c < 3 ? d(r) : c > 3 ? d(target, key, r) : d(target, key)) || r;
|
|
21
|
-
return c > 3 && r && Object.defineProperty(target, key, r), r;
|
|
22
|
-
};
|
|
23
|
-
var __metadata = (this && this.__metadata) || function (k, v) {
|
|
24
|
-
if (typeof Reflect === "object" && typeof Reflect.metadata === "function") return Reflect.metadata(k, v);
|
|
25
|
-
};
|
|
26
|
-
var __param = (this && this.__param) || function (paramIndex, decorator) {
|
|
27
|
-
return function (target, key) { decorator(target, key, paramIndex); }
|
|
28
|
-
};
|
|
29
17
|
Object.defineProperty(exports, "__esModule", { value: true });
|
|
30
18
|
exports.TerminalServer = void 0;
|
|
19
|
+
const tslib_1 = require("tslib");
|
|
31
20
|
const inversify_1 = require("@theia/core/shared/inversify");
|
|
32
21
|
const logger_1 = require("@theia/core/lib/common/logger");
|
|
33
22
|
const base_terminal_server_1 = require("./base-terminal-server");
|
|
@@ -50,16 +39,16 @@ let TerminalServer = class TerminalServer extends base_terminal_server_1.BaseTer
|
|
|
50
39
|
});
|
|
51
40
|
}
|
|
52
41
|
};
|
|
53
|
-
__decorate([
|
|
42
|
+
(0, tslib_1.__decorate)([
|
|
54
43
|
(0, inversify_1.inject)(node_1.TerminalProcessFactory),
|
|
55
|
-
__metadata("design:type", Function)
|
|
44
|
+
(0, tslib_1.__metadata)("design:type", Function)
|
|
56
45
|
], TerminalServer.prototype, "terminalFactory", void 0);
|
|
57
|
-
TerminalServer = __decorate([
|
|
46
|
+
TerminalServer = (0, tslib_1.__decorate)([
|
|
58
47
|
(0, inversify_1.injectable)(),
|
|
59
|
-
__param(0, (0, inversify_1.inject)(node_1.ProcessManager)),
|
|
60
|
-
__param(1, (0, inversify_1.inject)(logger_1.ILogger)),
|
|
61
|
-
__param(1, (0, inversify_1.named)('terminal')),
|
|
62
|
-
__metadata("design:paramtypes", [node_1.ProcessManager, Object])
|
|
48
|
+
(0, tslib_1.__param)(0, (0, inversify_1.inject)(node_1.ProcessManager)),
|
|
49
|
+
(0, tslib_1.__param)(1, (0, inversify_1.inject)(logger_1.ILogger)),
|
|
50
|
+
(0, tslib_1.__param)(1, (0, inversify_1.named)('terminal')),
|
|
51
|
+
(0, tslib_1.__metadata)("design:paramtypes", [node_1.ProcessManager, Object])
|
|
63
52
|
], TerminalServer);
|
|
64
53
|
exports.TerminalServer = TerminalServer;
|
|
65
54
|
//# sourceMappingURL=terminal-server.js.map
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"terminal-server.js","sourceRoot":"","sources":["../../src/node/terminal-server.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
|
|
1
|
+
{"version":3,"file":"terminal-server.js","sourceRoot":"","sources":["../../src/node/terminal-server.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,4DAAyE;AACzE,0DAAwD;AAKxD,iEAA4D;AAC5D,kDAAiF;AAGjF,IAAa,cAAc,GAA3B,MAAa,cAAe,SAAQ,yCAAkB;IAIlD,YAC4B,cAA8B,EAClB,MAAe;QAEnD,KAAK,CAAC,cAAc,EAAE,MAAM,CAAC,CAAC;IAClC,CAAC;IAED,MAAM,CAAC,OAA+B;QAClC,OAAO,IAAI,OAAO,CAAS,CAAC,OAAO,EAAE,MAAM,EAAE,EAAE;YAC3C,MAAM,IAAI,GAAG,IAAI,CAAC,eAAe,CAAC,OAAO,CAAC,CAAC;YAC3C,IAAI,CAAC,OAAO,CAAC,CAAC,CAAC,EAAE;gBACb,IAAI,CAAC,UAAU,CAAC,IAAI,CAAC,CAAC;gBACtB,OAAO,CAAC,IAAI,CAAC,EAAE,CAAC,CAAC;YACrB,CAAC,CAAC,CAAC;YACH,IAAI,CAAC,OAAO,CAAC,KAAK,CAAC,EAAE;gBACjB,IAAI,CAAC,MAAM,CAAC,KAAK,CAAC,+BAA+B,EAAE,KAAK,CAAC,CAAC;gBAC1D,OAAO,CAAC,CAAC,CAAC,CAAC,CAAC;YAChB,CAAC,CAAC,CAAC;QACP,CAAC,CAAC,CAAC;IAEP,CAAC;CACJ,CAAA;AAvBmC;IAA/B,IAAA,kBAAM,EAAC,6BAAsB,CAAC;;uDAA4D;AAFlF,cAAc;IAD1B,IAAA,sBAAU,GAAE;IAMJ,wBAAA,IAAA,kBAAM,EAAC,qBAAc,CAAC,CAAA;IACtB,wBAAA,IAAA,kBAAM,EAAC,gBAAO,CAAC,CAAA;IAAE,wBAAA,IAAA,iBAAK,EAAC,UAAU,CAAC,CAAA;kDADK,qBAAc;GALjD,cAAc,CAyB1B;AAzBY,wCAAc"}
|
package/package.json
CHANGED
|
@@ -1,17 +1,19 @@
|
|
|
1
1
|
{
|
|
2
2
|
"name": "@theia/terminal",
|
|
3
|
-
"version": "1.
|
|
3
|
+
"version": "1.46.0-next.137+bce99c299",
|
|
4
4
|
"description": "Theia - Terminal Extension",
|
|
5
5
|
"dependencies": {
|
|
6
|
-
"@theia/core": "1.
|
|
7
|
-
"@theia/editor": "1.
|
|
8
|
-
"@theia/
|
|
9
|
-
"@theia/
|
|
10
|
-
"@theia/
|
|
11
|
-
"@theia/
|
|
12
|
-
"
|
|
13
|
-
"
|
|
14
|
-
"xterm
|
|
6
|
+
"@theia/core": "1.46.0-next.137+bce99c299",
|
|
7
|
+
"@theia/editor": "1.46.0-next.137+bce99c299",
|
|
8
|
+
"@theia/file-search": "1.46.0-next.137+bce99c299",
|
|
9
|
+
"@theia/filesystem": "1.46.0-next.137+bce99c299",
|
|
10
|
+
"@theia/process": "1.46.0-next.137+bce99c299",
|
|
11
|
+
"@theia/variable-resolver": "1.46.0-next.137+bce99c299",
|
|
12
|
+
"@theia/workspace": "1.46.0-next.137+bce99c299",
|
|
13
|
+
"tslib": "^2.6.2",
|
|
14
|
+
"xterm": "^5.3.0",
|
|
15
|
+
"xterm-addon-fit": "^0.8.0",
|
|
16
|
+
"xterm-addon-search": "^0.13.0"
|
|
15
17
|
},
|
|
16
18
|
"publishConfig": {
|
|
17
19
|
"access": "public"
|
|
@@ -48,10 +50,10 @@
|
|
|
48
50
|
"watch": "theiaext watch"
|
|
49
51
|
},
|
|
50
52
|
"devDependencies": {
|
|
51
|
-
"@theia/ext-scripts": "1.
|
|
53
|
+
"@theia/ext-scripts": "1.48.0"
|
|
52
54
|
},
|
|
53
55
|
"nyc": {
|
|
54
56
|
"extends": "../../configs/nyc.json"
|
|
55
57
|
},
|
|
56
|
-
"gitHead": "
|
|
58
|
+
"gitHead": "bce99c299d7a01573330482ce26563eb6b00a6e9"
|
|
57
59
|
}
|
|
@@ -48,6 +48,15 @@ export interface TerminalSplitLocation {
|
|
|
48
48
|
readonly parentTerminal: string;
|
|
49
49
|
}
|
|
50
50
|
|
|
51
|
+
export interface TerminalBuffer {
|
|
52
|
+
readonly length: number;
|
|
53
|
+
/**
|
|
54
|
+
* @param start zero based index of the first line to return
|
|
55
|
+
* @param length the max number or lines to return
|
|
56
|
+
*/
|
|
57
|
+
getLines(start: number, length: number): string[];
|
|
58
|
+
}
|
|
59
|
+
|
|
51
60
|
/**
|
|
52
61
|
* Terminal UI widget.
|
|
53
62
|
*/
|
|
@@ -118,6 +127,10 @@ export abstract class TerminalWidget extends BaseWidget {
|
|
|
118
127
|
/** Event that fires when the terminal input data */
|
|
119
128
|
abstract onData: Event<string>;
|
|
120
129
|
|
|
130
|
+
abstract onOutput: Event<string>;
|
|
131
|
+
|
|
132
|
+
abstract buffer: TerminalBuffer;
|
|
133
|
+
|
|
121
134
|
abstract scrollLineUp(): void;
|
|
122
135
|
|
|
123
136
|
abstract scrollLineDown(): void;
|
|
@@ -23,12 +23,15 @@ import { FileService } from '@theia/filesystem/lib/browser/file-service';
|
|
|
23
23
|
import { TerminalWidget } from './base/terminal-widget';
|
|
24
24
|
import { TerminalLink, TerminalLinkProvider } from './terminal-link-provider';
|
|
25
25
|
import { TerminalWidgetImpl } from './terminal-widget-impl';
|
|
26
|
-
|
|
26
|
+
import { FileSearchService } from '@theia/file-search/lib/common/file-search-service';
|
|
27
|
+
import { WorkspaceService } from '@theia/workspace/lib/browser';
|
|
27
28
|
@injectable()
|
|
28
29
|
export class FileLinkProvider implements TerminalLinkProvider {
|
|
29
30
|
|
|
30
31
|
@inject(OpenerService) protected readonly openerService: OpenerService;
|
|
31
32
|
@inject(FileService) protected fileService: FileService;
|
|
33
|
+
@inject(FileSearchService) protected searchService: FileSearchService;
|
|
34
|
+
@inject(WorkspaceService) protected readonly workspaceService: WorkspaceService;
|
|
32
35
|
|
|
33
36
|
async provideLinks(line: string, terminal: TerminalWidget): Promise<TerminalLink[]> {
|
|
34
37
|
const links: TerminalLink[] = [];
|
|
@@ -42,11 +45,48 @@ export class FileLinkProvider implements TerminalLinkProvider {
|
|
|
42
45
|
length: match.length,
|
|
43
46
|
handle: () => this.open(match, terminal)
|
|
44
47
|
});
|
|
48
|
+
} else {
|
|
49
|
+
const searchTerm = await this.extractPath(match);
|
|
50
|
+
const fileUri = await this.isValidWorkspaceFile(searchTerm, terminal);
|
|
51
|
+
if (fileUri) {
|
|
52
|
+
const position = await this.extractPosition(match);
|
|
53
|
+
links.push({
|
|
54
|
+
startIndex: regExp.lastIndex - match.length,
|
|
55
|
+
length: match.length,
|
|
56
|
+
handle: () => this.openURI(fileUri, position)
|
|
57
|
+
});
|
|
58
|
+
}
|
|
45
59
|
}
|
|
46
60
|
}
|
|
47
61
|
return links;
|
|
48
62
|
}
|
|
49
63
|
|
|
64
|
+
protected async isValidWorkspaceFile(searchTerm: string | undefined, terminal: TerminalWidget): Promise<URI | undefined> {
|
|
65
|
+
if (!searchTerm) {
|
|
66
|
+
return undefined;
|
|
67
|
+
}
|
|
68
|
+
const cwd = await this.getCwd(terminal);
|
|
69
|
+
// remove any leading ./, ../ etc. as they can't be searched
|
|
70
|
+
searchTerm = searchTerm.replace(/^(\.+[\\/])+/, '');
|
|
71
|
+
const workspaceRoots = this.workspaceService.tryGetRoots().map(root => root.resource.toString());
|
|
72
|
+
// try and find a matching file in the workspace
|
|
73
|
+
const files = (await this.searchService.find(searchTerm, {
|
|
74
|
+
rootUris: [cwd.toString(), ...workspaceRoots],
|
|
75
|
+
fuzzyMatch: true,
|
|
76
|
+
limit: 1
|
|
77
|
+
}));
|
|
78
|
+
// checks if the string end in a separator + searchTerm
|
|
79
|
+
const regex = new RegExp(`[\\\\|\\/]${searchTerm}$`);
|
|
80
|
+
if (files.length && regex.test(files[0])) {
|
|
81
|
+
const fileUri = new URI(files[0]);
|
|
82
|
+
const valid = await this.isValidFileURI(fileUri);
|
|
83
|
+
if (valid) {
|
|
84
|
+
return fileUri;
|
|
85
|
+
}
|
|
86
|
+
|
|
87
|
+
}
|
|
88
|
+
}
|
|
89
|
+
|
|
50
90
|
protected async createRegExp(): Promise<RegExp> {
|
|
51
91
|
const baseLocalLinkClause = OS.backend.isWindows ? winLocalLinkClause : unixLocalLinkClause;
|
|
52
92
|
return new RegExp(`${baseLocalLinkClause}(${lineAndColumnClause})`, 'g');
|
|
@@ -57,10 +97,7 @@ export class FileLinkProvider implements TerminalLinkProvider {
|
|
|
57
97
|
const toOpen = await this.toURI(match, await this.getCwd(terminal));
|
|
58
98
|
if (toOpen) {
|
|
59
99
|
// TODO: would be better to ask the opener service, but it returns positively even for unknown files.
|
|
60
|
-
|
|
61
|
-
const stat = await this.fileService.resolve(toOpen);
|
|
62
|
-
return !stat.isDirectory;
|
|
63
|
-
} catch { }
|
|
100
|
+
return this.isValidFileURI(toOpen);
|
|
64
101
|
}
|
|
65
102
|
} catch (err) {
|
|
66
103
|
console.trace('Error validating ' + match, err);
|
|
@@ -68,6 +105,14 @@ export class FileLinkProvider implements TerminalLinkProvider {
|
|
|
68
105
|
return false;
|
|
69
106
|
}
|
|
70
107
|
|
|
108
|
+
protected async isValidFileURI(uri: URI): Promise<boolean> {
|
|
109
|
+
try {
|
|
110
|
+
const stat = await this.fileService.resolve(uri);
|
|
111
|
+
return !stat.isDirectory;
|
|
112
|
+
} catch { }
|
|
113
|
+
return false;
|
|
114
|
+
}
|
|
115
|
+
|
|
71
116
|
protected async toURI(match: string, cwd: URI): Promise<URI | undefined> {
|
|
72
117
|
const path = await this.extractPath(match);
|
|
73
118
|
if (!path) {
|
|
@@ -97,8 +142,11 @@ export class FileLinkProvider implements TerminalLinkProvider {
|
|
|
97
142
|
if (!toOpen) {
|
|
98
143
|
return;
|
|
99
144
|
}
|
|
100
|
-
|
|
101
145
|
const position = await this.extractPosition(match);
|
|
146
|
+
return this.openURI(toOpen, position);
|
|
147
|
+
}
|
|
148
|
+
|
|
149
|
+
async openURI(toOpen: URI, position: Position): Promise<void> {
|
|
102
150
|
let options = {};
|
|
103
151
|
if (position) {
|
|
104
152
|
options = { selection: { start: position } };
|
|
@@ -108,7 +156,7 @@ export class FileLinkProvider implements TerminalLinkProvider {
|
|
|
108
156
|
const opener = await this.openerService.getOpener(toOpen, options);
|
|
109
157
|
opener.open(toOpen, options);
|
|
110
158
|
} catch (err) {
|
|
111
|
-
console.error('Cannot open link ' +
|
|
159
|
+
console.error('Cannot open link ' + toOpen, err);
|
|
112
160
|
}
|
|
113
161
|
}
|
|
114
162
|
|
|
@@ -153,6 +201,17 @@ export class FileDiffPostLinkProvider extends FileLinkProvider {
|
|
|
153
201
|
}
|
|
154
202
|
}
|
|
155
203
|
|
|
204
|
+
@injectable()
|
|
205
|
+
export class LocalFileLinkProvider extends FileLinkProvider {
|
|
206
|
+
override async createRegExp(): Promise<RegExp> {
|
|
207
|
+
// match links that might not start with a separator, e.g. 'foo.bar'
|
|
208
|
+
const baseLocalLinkClause = OS.backend.isWindows ?
|
|
209
|
+
'((' + winPathPrefix + '|(' + winExcludedPathCharactersClause + ')+)(' + winPathSeparatorClause + '(' + winExcludedPathCharactersClause + ')+)*)'
|
|
210
|
+
: '((' + pathPrefix + '|(' + excludedPathCharactersClause + ')+)(' + pathSeparatorClause + '(' + excludedPathCharactersClause + ')+)*)';
|
|
211
|
+
return new RegExp(`${baseLocalLinkClause}(${lineAndColumnClause})`, 'g');
|
|
212
|
+
}
|
|
213
|
+
}
|
|
214
|
+
|
|
156
215
|
// The following regular expressions are taken from:
|
|
157
216
|
// https://github.com/microsoft/vscode/blob/b118105bf28d773fbbce683f7230d058be2f89a7/src/vs/workbench/contrib/terminal/browser/links/terminalLocalLinkDetector.ts#L34-L58
|
|
158
217
|
|
|
@@ -27,12 +27,13 @@ import {
|
|
|
27
27
|
Emitter,
|
|
28
28
|
Event,
|
|
29
29
|
ViewColumn,
|
|
30
|
-
OS
|
|
30
|
+
OS,
|
|
31
|
+
CompoundMenuNodeRole
|
|
31
32
|
} from '@theia/core/lib/common';
|
|
32
33
|
import {
|
|
33
34
|
ApplicationShell, KeybindingContribution, KeyCode, Key, WidgetManager, PreferenceService,
|
|
34
35
|
KeybindingRegistry, LabelProvider, WidgetOpenerOptions, StorageService, QuickInputService,
|
|
35
|
-
codicon, CommonCommands, FrontendApplicationContribution, OnWillStopAction, Dialog, ConfirmDialog, FrontendApplication, PreferenceScope, Widget
|
|
36
|
+
codicon, CommonCommands, FrontendApplicationContribution, OnWillStopAction, Dialog, ConfirmDialog, FrontendApplication, PreferenceScope, Widget, SHELL_TABBAR_CONTEXT_MENU
|
|
36
37
|
} from '@theia/core/lib/browser';
|
|
37
38
|
import { TabBarToolbarContribution, TabBarToolbarRegistry } from '@theia/core/lib/browser/shell/tab-bar-toolbar';
|
|
38
39
|
import { TERMINAL_WIDGET_FACTORY_ID, TerminalWidgetFactoryOptions, TerminalWidgetImpl } from './terminal-widget-impl';
|
|
@@ -55,6 +56,7 @@ import { nls } from '@theia/core/lib/common/nls';
|
|
|
55
56
|
import { Profiles, TerminalPreferences } from './terminal-preferences';
|
|
56
57
|
import { ShellTerminalProfile } from './shell-terminal-profile';
|
|
57
58
|
import { VariableResolverService } from '@theia/variable-resolver/lib/browser';
|
|
59
|
+
import { Color } from '@theia/core/lib/common/color';
|
|
58
60
|
|
|
59
61
|
export namespace TerminalMenus {
|
|
60
62
|
export const TERMINAL = [...MAIN_MENU_BAR, '7_terminal'];
|
|
@@ -67,6 +69,9 @@ export namespace TerminalMenus {
|
|
|
67
69
|
export const TERMINAL_OPEN_EDITORS_CONTEXT_MENU = ['open-editors-context-menu', 'navigation'];
|
|
68
70
|
|
|
69
71
|
export const TERMINAL_CONTEXT_MENU = ['terminal-context-menu'];
|
|
72
|
+
export const TERMINAL_CONTRIBUTIONS = [...TERMINAL_CONTEXT_MENU, '5_terminal_contributions'];
|
|
73
|
+
|
|
74
|
+
export const TERMINAL_TITLE_CONTRIBUTIONS = [...SHELL_TABBAR_CONTEXT_MENU, 'terminal_title_contributions'];
|
|
70
75
|
}
|
|
71
76
|
|
|
72
77
|
export namespace TerminalCommands {
|
|
@@ -731,6 +736,15 @@ export class TerminalFrontendContribution implements FrontendApplicationContribu
|
|
|
731
736
|
menus.registerMenuAction([...TerminalMenus.TERMINAL_CONTEXT_MENU, '_4'], {
|
|
732
737
|
commandId: TerminalCommands.KILL_TERMINAL.id
|
|
733
738
|
});
|
|
739
|
+
|
|
740
|
+
menus.registerSubmenu(TerminalMenus.TERMINAL_CONTRIBUTIONS, '', {
|
|
741
|
+
role: CompoundMenuNodeRole.Group
|
|
742
|
+
});
|
|
743
|
+
|
|
744
|
+
menus.registerSubmenu(TerminalMenus.TERMINAL_TITLE_CONTRIBUTIONS, '', {
|
|
745
|
+
role: CompoundMenuNodeRole.Group,
|
|
746
|
+
when: 'isTerminalTab'
|
|
747
|
+
});
|
|
734
748
|
}
|
|
735
749
|
|
|
736
750
|
registerToolbarItems(toolbar: TabBarToolbarRegistry): void {
|
|
@@ -990,7 +1004,7 @@ export class TerminalFrontendContribution implements FrontendApplicationContribu
|
|
|
990
1004
|
if (!terminalProfile) {
|
|
991
1005
|
profile = this.profileService.defaultProfile;
|
|
992
1006
|
if (!profile) {
|
|
993
|
-
throw new Error('There are
|
|
1007
|
+
throw new Error('There are no profiles registered');
|
|
994
1008
|
}
|
|
995
1009
|
}
|
|
996
1010
|
|
|
@@ -1074,6 +1088,27 @@ export class TerminalFrontendContribution implements FrontendApplicationContribu
|
|
|
1074
1088
|
},
|
|
1075
1089
|
description: 'The selection background color of the terminal.'
|
|
1076
1090
|
});
|
|
1091
|
+
colors.register({
|
|
1092
|
+
id: 'terminal.inactiveSelectionBackground',
|
|
1093
|
+
defaults: {
|
|
1094
|
+
light: Color.transparent('terminal.selectionBackground', 0.5),
|
|
1095
|
+
dark: Color.transparent('terminal.selectionBackground', 0.5),
|
|
1096
|
+
hcDark: Color.transparent('terminal.selectionBackground', 0.7),
|
|
1097
|
+
hcLight: Color.transparent('terminal.selectionBackground', 0.5),
|
|
1098
|
+
},
|
|
1099
|
+
description: 'The selection background color of the terminal when it does not have focus.'
|
|
1100
|
+
});
|
|
1101
|
+
colors.register({
|
|
1102
|
+
id: 'terminal.selectionForeground',
|
|
1103
|
+
defaults: {
|
|
1104
|
+
light: undefined,
|
|
1105
|
+
dark: undefined,
|
|
1106
|
+
hcDark: '#000000',
|
|
1107
|
+
hcLight: '#ffffff'
|
|
1108
|
+
},
|
|
1109
|
+
// eslint-disable-next-line max-len
|
|
1110
|
+
description: 'The selection foreground color of the terminal. When this is null the selection foreground will be retained and have the minimum contrast ratio feature applied.'
|
|
1111
|
+
});
|
|
1077
1112
|
colors.register({
|
|
1078
1113
|
id: 'terminal.border',
|
|
1079
1114
|
defaults: {
|
|
@@ -41,7 +41,7 @@ import { TerminalThemeService } from './terminal-theme-service';
|
|
|
41
41
|
import { QuickAccessContribution } from '@theia/core/lib/browser/quick-input/quick-access';
|
|
42
42
|
import { createXtermLinkFactory, TerminalLinkProvider, TerminalLinkProviderContribution, XtermLinkFactory } from './terminal-link-provider';
|
|
43
43
|
import { UrlLinkProvider } from './terminal-url-link-provider';
|
|
44
|
-
import { FileDiffPostLinkProvider, FileDiffPreLinkProvider, FileLinkProvider } from './terminal-file-link-provider';
|
|
44
|
+
import { FileDiffPostLinkProvider, FileDiffPreLinkProvider, FileLinkProvider, LocalFileLinkProvider } from './terminal-file-link-provider';
|
|
45
45
|
import {
|
|
46
46
|
ContributedTerminalProfileStore, DefaultProfileStore, DefaultTerminalProfileService,
|
|
47
47
|
TerminalProfileService, TerminalProfileStore, UserTerminalProfileStore
|
|
@@ -123,6 +123,8 @@ export default new ContainerModule(bind => {
|
|
|
123
123
|
bind(TerminalLinkProvider).toService(FileDiffPreLinkProvider);
|
|
124
124
|
bind(FileDiffPostLinkProvider).toSelf().inSingletonScope();
|
|
125
125
|
bind(TerminalLinkProvider).toService(FileDiffPostLinkProvider);
|
|
126
|
+
bind(LocalFileLinkProvider).toSelf().inSingletonScope();
|
|
127
|
+
bind(TerminalLinkProvider).toService(LocalFileLinkProvider);
|
|
126
128
|
|
|
127
129
|
bind(ContributedTerminalProfileStore).to(DefaultProfileStore).inSingletonScope();
|
|
128
130
|
bind(UserTerminalProfileStore).to(DefaultProfileStore).inSingletonScope();
|
|
@@ -134,7 +134,8 @@ export const TerminalConfigSchema: PreferenceSchema = {
|
|
|
134
134
|
description: nls.localize('theia/terminal/rendererType', 'Controls how the terminal is rendered.'),
|
|
135
135
|
type: 'string',
|
|
136
136
|
enum: ['canvas', 'dom'],
|
|
137
|
-
default: 'canvas'
|
|
137
|
+
default: 'canvas',
|
|
138
|
+
deprecationMessage: nls.localize('theia/terminal/rendererTypeDeprecationMessage', 'The renderer type is no longer supported as an option.')
|
|
138
139
|
},
|
|
139
140
|
'terminal.integrated.copyOnSelection': {
|
|
140
141
|
description: nls.localizeByDefault('Controls whether text selected in the terminal will be copied to the clipboard.'),
|
|
@@ -187,14 +187,18 @@ export class TerminalThemeService {
|
|
|
187
187
|
const backgroundColor = this.colorRegistry.getCurrentColor('terminal.background') || this.colorRegistry.getCurrentColor('panel.background');
|
|
188
188
|
const cursorColor = this.colorRegistry.getCurrentColor('terminalCursor.foreground') || foregroundColor;
|
|
189
189
|
const cursorAccentColor = this.colorRegistry.getCurrentColor('terminalCursor.background') || backgroundColor;
|
|
190
|
-
const
|
|
190
|
+
const selectionBackgroundColor = this.colorRegistry.getCurrentColor('terminal.selectionBackground');
|
|
191
|
+
const selectionInactiveBackground = this.colorRegistry.getCurrentColor('terminal.inactiveSelectionBackground');
|
|
192
|
+
const selectionForegroundColor = this.colorRegistry.getCurrentColor('terminal.selectionForeground');
|
|
191
193
|
|
|
192
194
|
const theme: ITheme = {
|
|
193
195
|
background: backgroundColor,
|
|
194
196
|
foreground: foregroundColor,
|
|
195
197
|
cursor: cursorColor,
|
|
196
198
|
cursorAccent: cursorAccentColor,
|
|
197
|
-
|
|
199
|
+
selectionBackground: selectionBackgroundColor,
|
|
200
|
+
selectionInactiveBackground: selectionInactiveBackground,
|
|
201
|
+
selectionForeground: selectionForegroundColor
|
|
198
202
|
};
|
|
199
203
|
// eslint-disable-next-line guard-for-in
|
|
200
204
|
for (const id in terminalAnsiColorMap) {
|