@theia/terminal 1.25.0-next.8 → 1.26.0-next.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/terminal-linkmatcher-files.d.ts +0 -5
- package/lib/browser/terminal-linkmatcher-files.d.ts.map +1 -1
- package/lib/browser/terminal-linkmatcher-files.js +2 -17
- package/lib/browser/terminal-linkmatcher-files.js.map +1 -1
- package/package.json +8 -8
- package/src/browser/terminal-linkmatcher-files.ts +3 -13
|
@@ -1,5 +1,3 @@
|
|
|
1
|
-
import { ApplicationServer } from '@theia/core/lib/common/application-protocol';
|
|
2
|
-
import { OS } from '@theia/core/lib/common';
|
|
3
1
|
import { OpenerService } from '@theia/core/lib/browser';
|
|
4
2
|
import { Position } from '@theia/editor/lib/browser';
|
|
5
3
|
import { AbstractCmdClickTerminalContribution } from './terminal-linkmatcher';
|
|
@@ -7,11 +5,8 @@ import { TerminalWidgetImpl } from './terminal-widget-impl';
|
|
|
7
5
|
import URI from '@theia/core/lib/common/uri';
|
|
8
6
|
import { FileService } from '@theia/filesystem/lib/browser/file-service';
|
|
9
7
|
export declare class TerminalLinkmatcherFiles extends AbstractCmdClickTerminalContribution {
|
|
10
|
-
protected appServer: ApplicationServer;
|
|
11
8
|
protected openerService: OpenerService;
|
|
12
9
|
protected fileService: FileService;
|
|
13
|
-
protected backendOs: Promise<OS.Type>;
|
|
14
|
-
protected init(): void;
|
|
15
10
|
getRegExp(): Promise<RegExp>;
|
|
16
11
|
getValidate(terminalWidget: TerminalWidgetImpl): (link: string) => Promise<boolean>;
|
|
17
12
|
getHandler(terminalWidget: TerminalWidgetImpl): (event: MouseEvent, link: string) => void;
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"terminal-linkmatcher-files.d.ts","sourceRoot":"","sources":["../../src/browser/terminal-linkmatcher-files.ts"],"names":[],"mappings":"
|
|
1
|
+
{"version":3,"file":"terminal-linkmatcher-files.d.ts","sourceRoot":"","sources":["../../src/browser/terminal-linkmatcher-files.ts"],"names":[],"mappings":"AAkBA,OAAO,EAAE,aAAa,EAAE,MAAM,yBAAyB,CAAC;AACxD,OAAO,EAAE,QAAQ,EAAE,MAAM,2BAA2B,CAAC;AACrD,OAAO,EAAE,oCAAoC,EAAE,MAAM,wBAAwB,CAAC;AAC9E,OAAO,EAAE,kBAAkB,EAAE,MAAM,wBAAwB,CAAC;AAE5D,OAAO,GAAG,MAAM,4BAA4B,CAAC;AAC7C,OAAO,EAAE,WAAW,EAAE,MAAM,4CAA4C,CAAC;AAEzE,qBACa,wBAAyB,SAAQ,oCAAoC;IAEvD,SAAS,CAAC,aAAa,EAAE,aAAa,CAAC;IACzC,SAAS,CAAC,WAAW,EAAE,WAAW,CAAC;IAElD,SAAS,IAAI,OAAO,CAAC,MAAM,CAAC;IAKzB,WAAW,CAAC,cAAc,EAAE,kBAAkB,GAAG,CAAC,IAAI,EAAE,MAAM,KAAK,OAAO,CAAC,OAAO,CAAC;IAkB5F,UAAU,CAAC,cAAc,EAAE,kBAAkB,GAAG,CAAC,KAAK,EAAE,UAAU,EAAE,IAAI,EAAE,MAAM,KAAK,IAAI;cAwBzE,KAAK,CAAC,KAAK,EAAE,MAAM,EAAE,GAAG,EAAE,GAAG,GAAG,OAAO,CAAC,GAAG,GAAG,SAAS,CAAC;cASxD,eAAe,CAAC,IAAI,EAAE,MAAM,GAAG,OAAO,CAAC,QAAQ,CAAC;cA4BhD,WAAW,CAAC,IAAI,EAAE,MAAM,GAAG,OAAO,CAAC,MAAM,GAAG,SAAS,CAAC;CAOzE"}
|
|
@@ -26,19 +26,14 @@ var __metadata = (this && this.__metadata) || function (k, v) {
|
|
|
26
26
|
Object.defineProperty(exports, "__esModule", { value: true });
|
|
27
27
|
exports.TerminalLinkmatcherFiles = void 0;
|
|
28
28
|
const inversify_1 = require("@theia/core/shared/inversify");
|
|
29
|
-
const application_protocol_1 = require("@theia/core/lib/common/application-protocol");
|
|
30
29
|
const common_1 = require("@theia/core/lib/common");
|
|
31
30
|
const browser_1 = require("@theia/core/lib/browser");
|
|
32
31
|
const terminal_linkmatcher_1 = require("./terminal-linkmatcher");
|
|
33
32
|
const core_1 = require("@theia/core");
|
|
34
33
|
const file_service_1 = require("@theia/filesystem/lib/browser/file-service");
|
|
35
34
|
let TerminalLinkmatcherFiles = class TerminalLinkmatcherFiles extends terminal_linkmatcher_1.AbstractCmdClickTerminalContribution {
|
|
36
|
-
init() {
|
|
37
|
-
this.backendOs = this.appServer.getBackendOS();
|
|
38
|
-
}
|
|
39
35
|
async getRegExp() {
|
|
40
|
-
const
|
|
41
|
-
const baseLocalLinkClause = os === common_1.OS.Type.Windows ? winLocalLinkClause : unixLocalLinkClause;
|
|
36
|
+
const baseLocalLinkClause = common_1.OS.backend.isWindows ? winLocalLinkClause : unixLocalLinkClause;
|
|
42
37
|
return new RegExp(`${baseLocalLinkClause}(${lineAndColumnClause})`);
|
|
43
38
|
}
|
|
44
39
|
getValidate(terminalWidget) {
|
|
@@ -101,7 +96,7 @@ let TerminalLinkmatcherFiles = class TerminalLinkmatcherFiles extends terminal_l
|
|
|
101
96
|
if (!matches) {
|
|
102
97
|
return info;
|
|
103
98
|
}
|
|
104
|
-
const lineAndColumnMatchIndex =
|
|
99
|
+
const lineAndColumnMatchIndex = common_1.OS.backend.isWindows ? winLineAndColumnMatchIndex : unixLineAndColumnMatchIndex;
|
|
105
100
|
for (let i = 0; i < lineAndColumnClause.length; i++) {
|
|
106
101
|
const lineMatchIndex = lineAndColumnMatchIndex + (lineAndColumnClauseGroupCount * i);
|
|
107
102
|
const rowNumber = matches[lineMatchIndex];
|
|
@@ -124,10 +119,6 @@ let TerminalLinkmatcherFiles = class TerminalLinkmatcherFiles extends terminal_l
|
|
|
124
119
|
return matches[1];
|
|
125
120
|
}
|
|
126
121
|
};
|
|
127
|
-
__decorate([
|
|
128
|
-
(0, inversify_1.inject)(application_protocol_1.ApplicationServer),
|
|
129
|
-
__metadata("design:type", Object)
|
|
130
|
-
], TerminalLinkmatcherFiles.prototype, "appServer", void 0);
|
|
131
122
|
__decorate([
|
|
132
123
|
(0, inversify_1.inject)(browser_1.OpenerService),
|
|
133
124
|
__metadata("design:type", Object)
|
|
@@ -136,12 +127,6 @@ __decorate([
|
|
|
136
127
|
(0, inversify_1.inject)(file_service_1.FileService),
|
|
137
128
|
__metadata("design:type", file_service_1.FileService)
|
|
138
129
|
], TerminalLinkmatcherFiles.prototype, "fileService", void 0);
|
|
139
|
-
__decorate([
|
|
140
|
-
(0, inversify_1.postConstruct)(),
|
|
141
|
-
__metadata("design:type", Function),
|
|
142
|
-
__metadata("design:paramtypes", []),
|
|
143
|
-
__metadata("design:returntype", void 0)
|
|
144
|
-
], TerminalLinkmatcherFiles.prototype, "init", null);
|
|
145
130
|
TerminalLinkmatcherFiles = __decorate([
|
|
146
131
|
(0, inversify_1.injectable)()
|
|
147
132
|
], TerminalLinkmatcherFiles);
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"terminal-linkmatcher-files.js","sourceRoot":"","sources":["../../src/browser/terminal-linkmatcher-files.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,2EAA2E;AAC3E,gFAAgF;;;;;;;;;;;;AAEhF,
|
|
1
|
+
{"version":3,"file":"terminal-linkmatcher-files.js","sourceRoot":"","sources":["../../src/browser/terminal-linkmatcher-files.ts"],"names":[],"mappings":"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"}
|
package/package.json
CHANGED
|
@@ -1,13 +1,13 @@
|
|
|
1
1
|
{
|
|
2
2
|
"name": "@theia/terminal",
|
|
3
|
-
"version": "1.
|
|
3
|
+
"version": "1.26.0-next.0+92dcf245c49",
|
|
4
4
|
"description": "Theia - Terminal Extension",
|
|
5
5
|
"dependencies": {
|
|
6
|
-
"@theia/core": "1.
|
|
7
|
-
"@theia/editor": "1.
|
|
8
|
-
"@theia/filesystem": "1.
|
|
9
|
-
"@theia/process": "1.
|
|
10
|
-
"@theia/workspace": "1.
|
|
6
|
+
"@theia/core": "1.26.0-next.0+92dcf245c49",
|
|
7
|
+
"@theia/editor": "1.26.0-next.0+92dcf245c49",
|
|
8
|
+
"@theia/filesystem": "1.26.0-next.0+92dcf245c49",
|
|
9
|
+
"@theia/process": "1.26.0-next.0+92dcf245c49",
|
|
10
|
+
"@theia/workspace": "1.26.0-next.0+92dcf245c49",
|
|
11
11
|
"xterm": "^4.16.0",
|
|
12
12
|
"xterm-addon-fit": "^0.5.0",
|
|
13
13
|
"xterm-addon-search": "^0.8.2"
|
|
@@ -46,10 +46,10 @@
|
|
|
46
46
|
"watch": "theiaext watch"
|
|
47
47
|
},
|
|
48
48
|
"devDependencies": {
|
|
49
|
-
"@theia/ext-scripts": "1.
|
|
49
|
+
"@theia/ext-scripts": "1.25.0"
|
|
50
50
|
},
|
|
51
51
|
"nyc": {
|
|
52
52
|
"extends": "../../configs/nyc.json"
|
|
53
53
|
},
|
|
54
|
-
"gitHead": "
|
|
54
|
+
"gitHead": "92dcf245c498afd93e541f598e2540f8685e9287"
|
|
55
55
|
}
|
|
@@ -14,8 +14,7 @@
|
|
|
14
14
|
// SPDX-License-Identifier: EPL-2.0 OR GPL-2.0 WITH Classpath-exception-2.0
|
|
15
15
|
// *****************************************************************************
|
|
16
16
|
|
|
17
|
-
import { injectable, inject
|
|
18
|
-
import { ApplicationServer } from '@theia/core/lib/common/application-protocol';
|
|
17
|
+
import { injectable, inject } from '@theia/core/shared/inversify';
|
|
19
18
|
import { OS } from '@theia/core/lib/common';
|
|
20
19
|
import { OpenerService } from '@theia/core/lib/browser';
|
|
21
20
|
import { Position } from '@theia/editor/lib/browser';
|
|
@@ -28,20 +27,11 @@ import { FileService } from '@theia/filesystem/lib/browser/file-service';
|
|
|
28
27
|
@injectable()
|
|
29
28
|
export class TerminalLinkmatcherFiles extends AbstractCmdClickTerminalContribution {
|
|
30
29
|
|
|
31
|
-
@inject(ApplicationServer) protected appServer: ApplicationServer;
|
|
32
30
|
@inject(OpenerService) protected openerService: OpenerService;
|
|
33
31
|
@inject(FileService) protected fileService: FileService;
|
|
34
32
|
|
|
35
|
-
protected backendOs: Promise<OS.Type>;
|
|
36
|
-
|
|
37
|
-
@postConstruct()
|
|
38
|
-
protected init(): void {
|
|
39
|
-
this.backendOs = this.appServer.getBackendOS();
|
|
40
|
-
}
|
|
41
|
-
|
|
42
33
|
async getRegExp(): Promise<RegExp> {
|
|
43
|
-
const
|
|
44
|
-
const baseLocalLinkClause = os === OS.Type.Windows ? winLocalLinkClause : unixLocalLinkClause;
|
|
34
|
+
const baseLocalLinkClause = OS.backend.isWindows ? winLocalLinkClause : unixLocalLinkClause;
|
|
45
35
|
return new RegExp(`${baseLocalLinkClause}(${lineAndColumnClause})`);
|
|
46
36
|
}
|
|
47
37
|
|
|
@@ -107,7 +97,7 @@ export class TerminalLinkmatcherFiles extends AbstractCmdClickTerminalContributi
|
|
|
107
97
|
return info;
|
|
108
98
|
}
|
|
109
99
|
|
|
110
|
-
const lineAndColumnMatchIndex =
|
|
100
|
+
const lineAndColumnMatchIndex = OS.backend.isWindows ? winLineAndColumnMatchIndex : unixLineAndColumnMatchIndex;
|
|
111
101
|
for (let i = 0; i < lineAndColumnClause.length; i++) {
|
|
112
102
|
const lineMatchIndex = lineAndColumnMatchIndex + (lineAndColumnClauseGroupCount * i);
|
|
113
103
|
const rowNumber = matches[lineMatchIndex];
|