@theia/task 1.40.1 → 1.41.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/task-configurations.d.ts.map +1 -1
- package/lib/browser/task-configurations.js +1 -1
- package/lib/browser/task-configurations.js.map +1 -1
- package/lib/browser/task-definition-registry.d.ts.map +1 -1
- package/lib/browser/task-definition-registry.js +3 -0
- package/lib/browser/task-definition-registry.js.map +1 -1
- package/lib/browser/task-problem-matcher-registry.d.ts.map +1 -1
- package/lib/browser/task-problem-matcher-registry.js +6 -7
- package/lib/browser/task-problem-matcher-registry.js.map +1 -1
- package/lib/browser/task-problem-pattern-registry.d.ts +1 -1
- package/lib/browser/task-problem-pattern-registry.d.ts.map +1 -1
- package/lib/browser/task-problem-pattern-registry.js +5 -3
- package/lib/browser/task-problem-pattern-registry.js.map +1 -1
- package/lib/browser/task-schema-updater.d.ts.map +1 -1
- package/lib/browser/task-schema-updater.js +1 -1
- package/lib/browser/task-schema-updater.js.map +1 -1
- package/lib/browser/task-service.d.ts.map +1 -1
- package/lib/browser/task-service.js +5 -9
- package/lib/browser/task-service.js.map +1 -1
- package/lib/common/index.d.ts +1 -0
- package/lib/common/index.d.ts.map +1 -1
- package/lib/common/index.js +1 -0
- package/lib/common/index.js.map +1 -1
- package/lib/common/problem-matcher-protocol.d.ts +1 -1
- package/lib/common/problem-matcher-protocol.d.ts.map +1 -1
- package/lib/common/problem-matcher-protocol.js.map +1 -1
- package/lib/common/task-util.d.ts +23 -0
- package/lib/common/task-util.d.ts.map +1 -0
- package/lib/common/task-util.js +47 -0
- package/lib/common/task-util.js.map +1 -0
- package/lib/node/process/process-task.d.ts.map +1 -1
- package/lib/node/process/process-task.js +6 -10
- package/lib/node/process/process-task.js.map +1 -1
- package/lib/node/task-abstract-line-matcher.d.ts.map +1 -1
- package/lib/node/task-abstract-line-matcher.js +3 -8
- package/lib/node/task-abstract-line-matcher.js.map +1 -1
- package/lib/node/task-problem-collector.spec.js +14 -14
- package/lib/node/task-problem-collector.spec.js.map +1 -1
- package/package.json +13 -13
- package/src/browser/task-configurations.ts +3 -2
- package/src/browser/task-definition-registry.ts +3 -0
- package/src/browser/task-problem-matcher-registry.ts +9 -9
- package/src/browser/task-problem-pattern-registry.ts +5 -4
- package/src/browser/task-schema-updater.ts +2 -2
- package/src/browser/task-service.ts +7 -10
- package/src/common/index.ts +1 -0
- package/src/common/problem-matcher-protocol.ts +1 -2
- package/src/common/task-util.ts +43 -0
- package/src/node/process/process-task.ts +7 -10
- package/src/node/task-abstract-line-matcher.ts +4 -9
- package/src/node/task-problem-collector.spec.ts +14 -14
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"task-problem-collector.spec.js","sourceRoot":"","sources":["../../src/node/task-problem-collector.spec.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
|
|
1
|
+
{"version":3,"file":"task-problem-collector.spec.js","sourceRoot":"","sources":["../../src/node/task-problem-collector.spec.ts"],"names":[],"mappings":"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"}
|
package/package.json
CHANGED
|
@@ -1,19 +1,19 @@
|
|
|
1
1
|
{
|
|
2
2
|
"name": "@theia/task",
|
|
3
|
-
"version": "1.
|
|
3
|
+
"version": "1.41.0",
|
|
4
4
|
"description": "Theia - Task extension. This extension adds support for executing raw or terminal processes in the backend.",
|
|
5
5
|
"dependencies": {
|
|
6
|
-
"@theia/core": "1.
|
|
7
|
-
"@theia/editor": "1.
|
|
8
|
-
"@theia/filesystem": "1.
|
|
9
|
-
"@theia/markers": "1.
|
|
10
|
-
"@theia/monaco": "1.
|
|
6
|
+
"@theia/core": "1.41.0",
|
|
7
|
+
"@theia/editor": "1.41.0",
|
|
8
|
+
"@theia/filesystem": "1.41.0",
|
|
9
|
+
"@theia/markers": "1.41.0",
|
|
10
|
+
"@theia/monaco": "1.41.0",
|
|
11
11
|
"@theia/monaco-editor-core": "1.72.3",
|
|
12
|
-
"@theia/process": "1.
|
|
13
|
-
"@theia/terminal": "1.
|
|
14
|
-
"@theia/userstorage": "1.
|
|
15
|
-
"@theia/variable-resolver": "1.
|
|
16
|
-
"@theia/workspace": "1.
|
|
12
|
+
"@theia/process": "1.41.0",
|
|
13
|
+
"@theia/terminal": "1.41.0",
|
|
14
|
+
"@theia/userstorage": "1.41.0",
|
|
15
|
+
"@theia/variable-resolver": "1.41.0",
|
|
16
|
+
"@theia/workspace": "1.41.0",
|
|
17
17
|
"async-mutex": "^0.3.1",
|
|
18
18
|
"jsonc-parser": "^2.2.0",
|
|
19
19
|
"p-debounce": "^2.1.0"
|
|
@@ -52,10 +52,10 @@
|
|
|
52
52
|
"watch": "theiaext watch"
|
|
53
53
|
},
|
|
54
54
|
"devDependencies": {
|
|
55
|
-
"@theia/ext-scripts": "1.
|
|
55
|
+
"@theia/ext-scripts": "1.41.0"
|
|
56
56
|
},
|
|
57
57
|
"nyc": {
|
|
58
58
|
"extends": "../../configs/nyc.json"
|
|
59
59
|
},
|
|
60
|
-
"gitHead": "
|
|
60
|
+
"gitHead": "180103ad086fc0a5e4e5fc01b5fcb43f06019eb1"
|
|
61
61
|
}
|
|
@@ -21,7 +21,8 @@ import {
|
|
|
21
21
|
TaskDefinition,
|
|
22
22
|
TaskOutputPresentation,
|
|
23
23
|
TaskConfigurationScope,
|
|
24
|
-
TaskScope
|
|
24
|
+
TaskScope,
|
|
25
|
+
asVariableName
|
|
25
26
|
} from '../common';
|
|
26
27
|
import { TaskDefinitionRegistry } from './task-definition-registry';
|
|
27
28
|
import { ProvidedTaskConfigurations } from './provided-task-configurations';
|
|
@@ -349,7 +350,7 @@ export class TaskConfigurations implements Disposable {
|
|
|
349
350
|
} else if (task.problemMatcher) {
|
|
350
351
|
problemMatcher.push(task.problemMatcher.name!);
|
|
351
352
|
}
|
|
352
|
-
customization.problemMatcher = problemMatcher.map(
|
|
353
|
+
customization.problemMatcher = problemMatcher.map(asVariableName);
|
|
353
354
|
}
|
|
354
355
|
if (task.group) {
|
|
355
356
|
customization.group = task.group;
|
|
@@ -113,6 +113,9 @@ export class TaskDefinitionRegistry {
|
|
|
113
113
|
if (oneType !== otherType) {
|
|
114
114
|
return false;
|
|
115
115
|
}
|
|
116
|
+
if (one['taskType'] !== other['taskType']) {
|
|
117
|
+
return false;
|
|
118
|
+
}
|
|
116
119
|
const def = this.getDefinition(one);
|
|
117
120
|
if (def) {
|
|
118
121
|
// scope is either a string or an enum value. Anyway...they must exactly match
|
|
@@ -24,16 +24,18 @@ import { Event, Emitter } from '@theia/core/lib/common';
|
|
|
24
24
|
import { Disposable, DisposableCollection } from '@theia/core/lib/common/disposable';
|
|
25
25
|
import {
|
|
26
26
|
ApplyToKind, FileLocationKind, NamedProblemMatcher,
|
|
27
|
-
ProblemPattern, ProblemMatcher, ProblemMatcherContribution, WatchingMatcher
|
|
27
|
+
ProblemPattern, ProblemMatcher, ProblemMatcherContribution, WatchingMatcher,
|
|
28
|
+
fromVariableName
|
|
28
29
|
} from '../common';
|
|
29
30
|
import { ProblemPatternRegistry } from './task-problem-pattern-registry';
|
|
30
31
|
import { Severity } from '@theia/core/lib/common/severity';
|
|
32
|
+
import { Deferred } from '@theia/core/lib/common/promise-util';
|
|
31
33
|
|
|
32
34
|
@injectable()
|
|
33
35
|
export class ProblemMatcherRegistry {
|
|
34
36
|
|
|
35
37
|
private readonly matchers = new Map<string, NamedProblemMatcher>();
|
|
36
|
-
private readyPromise
|
|
38
|
+
private readyPromise = new Deferred<void>();
|
|
37
39
|
|
|
38
40
|
@inject(ProblemPatternRegistry)
|
|
39
41
|
protected readonly problemPatternRegistry: ProblemPatternRegistry;
|
|
@@ -47,13 +49,13 @@ export class ProblemMatcherRegistry {
|
|
|
47
49
|
protected init(): void {
|
|
48
50
|
this.problemPatternRegistry.onReady().then(() => {
|
|
49
51
|
this.fillDefaults();
|
|
50
|
-
this.readyPromise
|
|
52
|
+
this.readyPromise.resolve();
|
|
51
53
|
this.onDidChangeProblemMatcherEmitter.fire(undefined);
|
|
52
54
|
});
|
|
53
55
|
}
|
|
54
56
|
|
|
55
57
|
onReady(): Promise<void> {
|
|
56
|
-
return this.readyPromise;
|
|
58
|
+
return this.readyPromise.promise;
|
|
57
59
|
}
|
|
58
60
|
|
|
59
61
|
/**
|
|
@@ -73,6 +75,7 @@ export class ProblemMatcherRegistry {
|
|
|
73
75
|
this.doRegister(matcher, toDispose).then(() => this.onDidChangeProblemMatcherEmitter.fire(undefined));
|
|
74
76
|
return toDispose;
|
|
75
77
|
}
|
|
78
|
+
|
|
76
79
|
protected async doRegister(matcher: ProblemMatcherContribution, toDispose: DisposableCollection): Promise<void> {
|
|
77
80
|
const problemMatcher = await this.getProblemMatcherFromContribution(matcher);
|
|
78
81
|
if (toDispose.disposed) {
|
|
@@ -88,10 +91,7 @@ export class ProblemMatcherRegistry {
|
|
|
88
91
|
* @return the problem matcher. If the task definition is not found, `undefined` is returned.
|
|
89
92
|
*/
|
|
90
93
|
get(name: string): NamedProblemMatcher | undefined {
|
|
91
|
-
|
|
92
|
-
return this.matchers.get(name.slice(1));
|
|
93
|
-
}
|
|
94
|
-
return this.matchers.get(name);
|
|
94
|
+
return this.matchers.get(fromVariableName(name));
|
|
95
95
|
}
|
|
96
96
|
|
|
97
97
|
/**
|
|
@@ -132,7 +132,7 @@ export class ProblemMatcherRegistry {
|
|
|
132
132
|
if (matcher.pattern) {
|
|
133
133
|
if (typeof matcher.pattern === 'string') {
|
|
134
134
|
await this.problemPatternRegistry.onReady();
|
|
135
|
-
const registeredPattern = this.problemPatternRegistry.get(matcher.pattern);
|
|
135
|
+
const registeredPattern = this.problemPatternRegistry.get(fromVariableName(matcher.pattern));
|
|
136
136
|
if (Array.isArray(registeredPattern)) {
|
|
137
137
|
patterns.push(...registeredPattern);
|
|
138
138
|
} else if (!!registeredPattern) {
|
|
@@ -19,23 +19,24 @@
|
|
|
19
19
|
* Licensed under the MIT License. See License.txt in the project root for license information.
|
|
20
20
|
*--------------------------------------------------------------------------------------------*/
|
|
21
21
|
|
|
22
|
+
import { Disposable, DisposableCollection } from '@theia/core/lib/common/disposable';
|
|
23
|
+
import { Deferred } from '@theia/core/lib/common/promise-util';
|
|
22
24
|
import { injectable, postConstruct } from '@theia/core/shared/inversify';
|
|
23
25
|
import { NamedProblemPattern, ProblemLocationKind, ProblemPattern, ProblemPatternContribution } from '../common';
|
|
24
|
-
import { Disposable, DisposableCollection } from '@theia/core/lib/common/disposable';
|
|
25
26
|
|
|
26
27
|
@injectable()
|
|
27
28
|
export class ProblemPatternRegistry {
|
|
28
29
|
private readonly patterns = new Map<string, NamedProblemPattern | NamedProblemPattern[]>();
|
|
29
|
-
private readyPromise
|
|
30
|
+
private readyPromise = new Deferred<void>();
|
|
30
31
|
|
|
31
32
|
@postConstruct()
|
|
32
33
|
protected init(): void {
|
|
33
34
|
this.fillDefaults();
|
|
34
|
-
this.readyPromise
|
|
35
|
+
this.readyPromise.resolve();
|
|
35
36
|
}
|
|
36
37
|
|
|
37
38
|
onReady(): Promise<void> {
|
|
38
|
-
return this.readyPromise;
|
|
39
|
+
return this.readyPromise.promise;
|
|
39
40
|
}
|
|
40
41
|
|
|
41
42
|
/**
|
|
@@ -30,7 +30,7 @@ import { inputsSchema } from '@theia/variable-resolver/lib/browser/variable-inpu
|
|
|
30
30
|
import URI from '@theia/core/lib/common/uri';
|
|
31
31
|
import { ProblemMatcherRegistry } from './task-problem-matcher-registry';
|
|
32
32
|
import { TaskDefinitionRegistry } from './task-definition-registry';
|
|
33
|
-
import { TaskServer } from '../common';
|
|
33
|
+
import { TaskServer, asVariableName } from '../common';
|
|
34
34
|
import { UserStorageUri } from '@theia/userstorage/lib/browser';
|
|
35
35
|
import { WorkspaceService } from '@theia/workspace/lib/browser';
|
|
36
36
|
import { JSONObject } from '@theia/core/shared/@phosphor/coreutils';
|
|
@@ -213,7 +213,7 @@ export class TaskSchemaUpdater implements JsonSchemaContribution {
|
|
|
213
213
|
|
|
214
214
|
/** Gets the most up-to-date names of problem matchers from the registry and update the task schema */
|
|
215
215
|
private updateProblemMatcherNames(): void {
|
|
216
|
-
const matcherNames = this.problemMatcherRegistry.getAll().map(m =>
|
|
216
|
+
const matcherNames = this.problemMatcherRegistry.getAll().map(m => asVariableName(m.name));
|
|
217
217
|
problemMatcherNames.length = 0;
|
|
218
218
|
problemMatcherNames.push(...matcherNames);
|
|
219
219
|
this.update();
|
|
@@ -48,7 +48,8 @@ import {
|
|
|
48
48
|
TaskInfo,
|
|
49
49
|
TaskOutputPresentation,
|
|
50
50
|
TaskOutputProcessedEvent,
|
|
51
|
-
TaskServer
|
|
51
|
+
TaskServer,
|
|
52
|
+
asVariableName
|
|
52
53
|
} from '../common';
|
|
53
54
|
import { TaskWatcher } from '../common/task-watcher';
|
|
54
55
|
import { ProvidedTaskConfigurations } from './provided-task-configurations';
|
|
@@ -249,7 +250,7 @@ export class TaskService implements TaskConfigurationClient {
|
|
|
249
250
|
}
|
|
250
251
|
}
|
|
251
252
|
}
|
|
252
|
-
const uri =
|
|
253
|
+
const uri = problem.resource.withScheme(problem.resource.scheme);
|
|
253
254
|
const document = this.monacoWorkspace.getTextDocument(uri.toString());
|
|
254
255
|
if (problem.description.applyTo === ApplyToKind.openDocuments && !!document ||
|
|
255
256
|
problem.description.applyTo === ApplyToKind.closedDocuments && !document ||
|
|
@@ -908,13 +909,9 @@ export class TaskService implements TaskConfigurationClient {
|
|
|
908
909
|
async updateTaskConfiguration(token: number, task: TaskConfiguration, update: { [name: string]: any }): Promise<void> {
|
|
909
910
|
if (update.problemMatcher) {
|
|
910
911
|
if (Array.isArray(update.problemMatcher)) {
|
|
911
|
-
update.problemMatcher.forEach((
|
|
912
|
-
|
|
913
|
-
|
|
914
|
-
}
|
|
915
|
-
});
|
|
916
|
-
} else if (!update.problemMatcher.startsWith('$')) {
|
|
917
|
-
update.problemMatcher = `$${update.problemMatcher}`;
|
|
912
|
+
update.problemMatcher.forEach((_name, index) => update.problemMatcher[index] = asVariableName(update.problemMatcher[index]));
|
|
913
|
+
} else {
|
|
914
|
+
update.problemMatcher = asVariableName(update.problemMatcher);
|
|
918
915
|
}
|
|
919
916
|
}
|
|
920
917
|
this.taskConfigurations.updateTaskConfig(token, task, update);
|
|
@@ -1041,7 +1038,7 @@ export class TaskService implements TaskConfigurationClient {
|
|
|
1041
1038
|
({
|
|
1042
1039
|
label: matcher.label,
|
|
1043
1040
|
value: { problemMatchers: [matcher] },
|
|
1044
|
-
description: matcher.name
|
|
1041
|
+
description: asVariableName(matcher.name)
|
|
1045
1042
|
})
|
|
1046
1043
|
));
|
|
1047
1044
|
return items;
|
package/src/common/index.ts
CHANGED
|
@@ -21,10 +21,9 @@
|
|
|
21
21
|
* Licensed under the MIT License. See License.txt in the project root for license information.
|
|
22
22
|
*--------------------------------------------------------------------------------------------*/
|
|
23
23
|
|
|
24
|
+
import { URI } from '@theia/core';
|
|
24
25
|
import { Severity } from '@theia/core/lib/common/severity';
|
|
25
26
|
import { Diagnostic } from '@theia/core/shared/vscode-languageserver-protocol';
|
|
26
|
-
// TODO use URI from `@theia/core` instead
|
|
27
|
-
import { URI } from '@theia/core/shared/vscode-uri';
|
|
28
27
|
|
|
29
28
|
export enum ApplyToKind {
|
|
30
29
|
allDocuments,
|
|
@@ -0,0 +1,43 @@
|
|
|
1
|
+
// *****************************************************************************
|
|
2
|
+
// Copyright (C) 2023 EclipseSource and others.
|
|
3
|
+
//
|
|
4
|
+
// This program and the accompanying materials are made available under the
|
|
5
|
+
// terms of the Eclipse Public License v. 2.0 which is available at
|
|
6
|
+
// http://www.eclipse.org/legal/epl-2.0.
|
|
7
|
+
//
|
|
8
|
+
// This Source Code may also be made available under the following Secondary
|
|
9
|
+
// Licenses when the conditions for such availability set forth in the Eclipse
|
|
10
|
+
// Public License v. 2.0 are satisfied: GNU General Public License, version 2
|
|
11
|
+
// with the GNU Classpath Exception which is available at
|
|
12
|
+
// https://www.gnu.org/software/classpath/license.html.
|
|
13
|
+
//
|
|
14
|
+
// SPDX-License-Identifier: EPL-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0
|
|
15
|
+
// *****************************************************************************
|
|
16
|
+
|
|
17
|
+
/**
|
|
18
|
+
* Converts the given standard name to a variable name starting with '$' if not already present.
|
|
19
|
+
*
|
|
20
|
+
* Variable names are used, for instance, to reference problem matchers, within task configurations.
|
|
21
|
+
*
|
|
22
|
+
* @param name standard name
|
|
23
|
+
* @returns variable name with leading '$' if not already present.
|
|
24
|
+
*
|
|
25
|
+
* @see {@link fromVariableName} for the reverse conversion.
|
|
26
|
+
*/
|
|
27
|
+
export function asVariableName(name: string): string {
|
|
28
|
+
return name.startsWith('$') ? name : `$${name}`;
|
|
29
|
+
}
|
|
30
|
+
|
|
31
|
+
/**
|
|
32
|
+
* Converts a given variable name to a standard name, effectively removing a leading '$' if present.
|
|
33
|
+
*
|
|
34
|
+
* Standard names are used, for instance, in registries to store variable objects
|
|
35
|
+
*
|
|
36
|
+
* @param name variable name
|
|
37
|
+
* @returns variable name without leading '$' if present.
|
|
38
|
+
*
|
|
39
|
+
* @see {@link asVariableName} for the reverse conversion.
|
|
40
|
+
*/
|
|
41
|
+
export function fromVariableName(name: string): string {
|
|
42
|
+
return name.startsWith('$') ? name.slice(1) : name;
|
|
43
|
+
}
|
|
@@ -27,21 +27,18 @@ import { TaskManager } from '../task-manager';
|
|
|
27
27
|
import { ProcessType, ProcessTaskInfo } from '../../common/process/task-protocol';
|
|
28
28
|
import { TaskExitedEvent } from '../../common/task-protocol';
|
|
29
29
|
|
|
30
|
-
// copied from https://github.com/
|
|
31
|
-
|
|
32
|
-
|
|
33
|
-
|
|
34
|
-
const
|
|
35
|
-
const COLOR_END = /\x1b\[0?m/g; // Color
|
|
30
|
+
// copied from https://github.com/microsoft/vscode/blob/1.79.0/src/vs/base/common/strings.ts#L736
|
|
31
|
+
const CSI_SEQUENCE = /(:?\x1b\[|\x9B)[=?>!]?[\d;:]*["$#'* ]?[a-zA-Z@^`{}|~]/g;
|
|
32
|
+
|
|
33
|
+
// Plus additional markers for custom `\x1b]...\x07` instructions.
|
|
34
|
+
const CSI_CUSTOM_SEQUENCE = /\x1b\].*?\x07/g;
|
|
36
35
|
|
|
37
36
|
export function removeAnsiEscapeCodes(str: string): string {
|
|
38
37
|
if (str) {
|
|
39
|
-
str = str.replace(
|
|
40
|
-
str = str.replace(COLOR_START, '');
|
|
41
|
-
str = str.replace(COLOR_END, '');
|
|
38
|
+
str = str.replace(CSI_SEQUENCE, '').replace(CSI_CUSTOM_SEQUENCE, '');
|
|
42
39
|
}
|
|
43
40
|
|
|
44
|
-
return str.
|
|
41
|
+
return str.trimEnd();
|
|
45
42
|
}
|
|
46
43
|
|
|
47
44
|
export const TaskProcessOptions = Symbol('TaskProcessOptions');
|
|
@@ -26,10 +26,9 @@ import {
|
|
|
26
26
|
ProblemMatch, ProblemMatchData, ProblemLocationKind
|
|
27
27
|
} from '../common/problem-matcher-protocol';
|
|
28
28
|
import URI from '@theia/core/lib/common/uri';
|
|
29
|
-
// TODO use only URI from '@theia/core'
|
|
30
|
-
import { URI as vscodeURI } from '@theia/core/shared/vscode-uri';
|
|
31
29
|
import { Severity } from '@theia/core/lib/common/severity';
|
|
32
30
|
import { MAX_SAFE_INTEGER } from '@theia/core/lib/common/numbers';
|
|
31
|
+
import { join } from 'path';
|
|
33
32
|
|
|
34
33
|
const endOfLine: string = EOL;
|
|
35
34
|
|
|
@@ -247,7 +246,7 @@ export abstract class AbstractLineMatcher {
|
|
|
247
246
|
return Severity.toDiagnosticSeverity(result);
|
|
248
247
|
}
|
|
249
248
|
|
|
250
|
-
private getResource(filename: string, matcher: ProblemMatcher):
|
|
249
|
+
private getResource(filename: string, matcher: ProblemMatcher): URI {
|
|
251
250
|
const kind = matcher.fileLocation;
|
|
252
251
|
let fullPath: string | undefined;
|
|
253
252
|
if (kind === FileLocationKind.Absolute) {
|
|
@@ -257,19 +256,15 @@ export abstract class AbstractLineMatcher {
|
|
|
257
256
|
if (relativeFileName.startsWith('./')) {
|
|
258
257
|
relativeFileName = relativeFileName.slice(2);
|
|
259
258
|
}
|
|
260
|
-
fullPath =
|
|
259
|
+
fullPath = join(matcher.filePrefix, relativeFileName);
|
|
261
260
|
}
|
|
262
261
|
if (fullPath === undefined) {
|
|
263
262
|
throw new Error('FileLocationKind is not actionable. Does the matcher have a filePrefix? This should never happen.');
|
|
264
263
|
}
|
|
265
|
-
fullPath = fullPath.replace(/\\/g, '/');
|
|
266
|
-
if (fullPath[0] !== '/') {
|
|
267
|
-
fullPath = '/' + fullPath;
|
|
268
|
-
}
|
|
269
264
|
if (matcher.uriProvider !== undefined) {
|
|
270
265
|
return matcher.uriProvider(fullPath);
|
|
271
266
|
} else {
|
|
272
|
-
return
|
|
267
|
+
return URI.fromFilePath(fullPath);
|
|
273
268
|
}
|
|
274
269
|
}
|
|
275
270
|
|
|
@@ -14,11 +14,11 @@
|
|
|
14
14
|
// SPDX-License-Identifier: EPL-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0
|
|
15
15
|
// *****************************************************************************
|
|
16
16
|
|
|
17
|
-
import {
|
|
17
|
+
import { Severity } from '@theia/core/lib/common/severity';
|
|
18
18
|
import { DiagnosticSeverity } from '@theia/core/shared/vscode-languageserver-protocol';
|
|
19
|
-
import {
|
|
19
|
+
import { expect } from 'chai';
|
|
20
20
|
import { ApplyToKind, FileLocationKind, ProblemLocationKind, ProblemMatch, ProblemMatchData, ProblemMatcher } from '../common/problem-matcher-protocol';
|
|
21
|
-
import {
|
|
21
|
+
import { ProblemCollector } from './task-problem-collector';
|
|
22
22
|
|
|
23
23
|
const startStopMatcher1: ProblemMatcher = {
|
|
24
24
|
owner: 'test1',
|
|
@@ -130,7 +130,7 @@ describe('ProblemCollector', () => {
|
|
|
130
130
|
|
|
131
131
|
expect(allMatches.length).to.eq(3);
|
|
132
132
|
|
|
133
|
-
expect((allMatches[0] as ProblemMatchData).resource!.path).eq('/home/test/hello.go');
|
|
133
|
+
expect((allMatches[0] as ProblemMatchData).resource!.path.toString()).eq('/home/test/hello.go');
|
|
134
134
|
expect((allMatches[0] as ProblemMatchData).marker).deep.equal({
|
|
135
135
|
range: { start: { line: 8, character: 1 }, end: { line: 8, character: 1 } },
|
|
136
136
|
severity: DiagnosticSeverity.Error,
|
|
@@ -138,7 +138,7 @@ describe('ProblemCollector', () => {
|
|
|
138
138
|
message: 'undefined: fmt.Pntln'
|
|
139
139
|
});
|
|
140
140
|
|
|
141
|
-
expect((allMatches[1] as ProblemMatchData).resource!.path).eq('/home/test/hello.go');
|
|
141
|
+
expect((allMatches[1] as ProblemMatchData).resource!.path.toString()).eq('/home/test/hello.go');
|
|
142
142
|
expect((allMatches[1] as ProblemMatchData).marker).deep.equal({
|
|
143
143
|
range: { start: { line: 9, character: 5 }, end: { line: 9, character: 5 } },
|
|
144
144
|
severity: DiagnosticSeverity.Error,
|
|
@@ -146,7 +146,7 @@ describe('ProblemCollector', () => {
|
|
|
146
146
|
message: 'undefined: numb'
|
|
147
147
|
});
|
|
148
148
|
|
|
149
|
-
expect((allMatches[2] as ProblemMatchData).resource!.path).eq('/home/test/hello.go');
|
|
149
|
+
expect((allMatches[2] as ProblemMatchData).resource!.path.toString()).eq('/home/test/hello.go');
|
|
150
150
|
expect((allMatches[2] as ProblemMatchData).marker).deep.equal({
|
|
151
151
|
range: { start: { line: 14, character: 8 }, end: { line: 14, character: 8 } },
|
|
152
152
|
severity: DiagnosticSeverity.Error,
|
|
@@ -176,7 +176,7 @@ describe('ProblemCollector', () => {
|
|
|
176
176
|
|
|
177
177
|
expect(allMatches.length).to.eq(4);
|
|
178
178
|
|
|
179
|
-
expect((allMatches[0] as ProblemMatchData).resource!.path).eq('/home/test/test-dir.js');
|
|
179
|
+
expect((allMatches[0] as ProblemMatchData).resource!.path.toString()).eq('/home/test/test-dir.js');
|
|
180
180
|
expect((allMatches[0] as ProblemMatchData).marker).deep.equal({
|
|
181
181
|
range: { start: { line: 13, character: 20 }, end: { line: 13, character: 20 } },
|
|
182
182
|
severity: DiagnosticSeverity.Warning,
|
|
@@ -185,7 +185,7 @@ describe('ProblemCollector', () => {
|
|
|
185
185
|
code: 'semi'
|
|
186
186
|
});
|
|
187
187
|
|
|
188
|
-
expect((allMatches[1] as ProblemMatchData).resource!.path).eq('/home/test/test-dir.js');
|
|
188
|
+
expect((allMatches[1] as ProblemMatchData).resource!.path.toString()).eq('/home/test/test-dir.js');
|
|
189
189
|
expect((allMatches[1] as ProblemMatchData).marker).deep.equal({
|
|
190
190
|
range: { start: { line: 14, character: 22 }, end: { line: 14, character: 22 } },
|
|
191
191
|
severity: DiagnosticSeverity.Warning,
|
|
@@ -194,7 +194,7 @@ describe('ProblemCollector', () => {
|
|
|
194
194
|
code: 'semi'
|
|
195
195
|
});
|
|
196
196
|
|
|
197
|
-
expect((allMatches[2] as ProblemMatchData).resource!.path).eq('/home/test/test-dir.js');
|
|
197
|
+
expect((allMatches[2] as ProblemMatchData).resource!.path.toString()).eq('/home/test/test-dir.js');
|
|
198
198
|
expect((allMatches[2] as ProblemMatchData).marker).deep.equal({
|
|
199
199
|
range: { start: { line: 102, character: 8 }, end: { line: 102, character: 8 } },
|
|
200
200
|
severity: DiagnosticSeverity.Error,
|
|
@@ -202,7 +202,7 @@ describe('ProblemCollector', () => {
|
|
|
202
202
|
message: 'Parsing error: Unexpected token inte'
|
|
203
203
|
});
|
|
204
204
|
|
|
205
|
-
expect((allMatches[3] as ProblemMatchData).resource!.path).eq('/home/test/more-test.js');
|
|
205
|
+
expect((allMatches[3] as ProblemMatchData).resource!.path.toString()).eq('/home/test/more-test.js');
|
|
206
206
|
expect((allMatches[3] as ProblemMatchData).marker).deep.equal({
|
|
207
207
|
range: { start: { line: 12, character: 8 }, end: { line: 12, character: 8 } },
|
|
208
208
|
severity: DiagnosticSeverity.Error,
|
|
@@ -232,7 +232,7 @@ describe('ProblemCollector', () => {
|
|
|
232
232
|
|
|
233
233
|
expect(allMatches.length).to.eq(4);
|
|
234
234
|
|
|
235
|
-
expect((allMatches[0] as ProblemMatchData).resource?.path).eq('/home/test/test-dir.js');
|
|
235
|
+
expect((allMatches[0] as ProblemMatchData).resource?.path.toString()).eq('/home/test/test-dir.js');
|
|
236
236
|
expect((allMatches[0] as ProblemMatchData).marker).deep.equal({
|
|
237
237
|
range: { start: { line: 0, character: 0 }, end: { line: 0, character: 0 } },
|
|
238
238
|
severity: DiagnosticSeverity.Warning,
|
|
@@ -241,7 +241,7 @@ describe('ProblemCollector', () => {
|
|
|
241
241
|
code: 'semi'
|
|
242
242
|
});
|
|
243
243
|
|
|
244
|
-
expect((allMatches[1] as ProblemMatchData).resource?.path).eq('/home/test/test-dir.js');
|
|
244
|
+
expect((allMatches[1] as ProblemMatchData).resource?.path.toString()).eq('/home/test/test-dir.js');
|
|
245
245
|
expect((allMatches[1] as ProblemMatchData).marker).deep.equal({
|
|
246
246
|
range: { start: { line: 0, character: 0 }, end: { line: 0, character: 0 } },
|
|
247
247
|
severity: DiagnosticSeverity.Warning,
|
|
@@ -250,7 +250,7 @@ describe('ProblemCollector', () => {
|
|
|
250
250
|
code: 'semi'
|
|
251
251
|
});
|
|
252
252
|
|
|
253
|
-
expect((allMatches[2] as ProblemMatchData).resource?.path).eq('/home/test/test-dir.js');
|
|
253
|
+
expect((allMatches[2] as ProblemMatchData).resource?.path.toString()).eq('/home/test/test-dir.js');
|
|
254
254
|
expect((allMatches[2] as ProblemMatchData).marker).deep.equal({
|
|
255
255
|
range: { start: { line: 0, character: 0 }, end: { line: 0, character: 0 } },
|
|
256
256
|
severity: DiagnosticSeverity.Error,
|
|
@@ -258,7 +258,7 @@ describe('ProblemCollector', () => {
|
|
|
258
258
|
message: 'Parsing error: Unexpected token inte'
|
|
259
259
|
});
|
|
260
260
|
|
|
261
|
-
expect((allMatches[3] as ProblemMatchData).resource?.path).eq('/home/test/more-test.js');
|
|
261
|
+
expect((allMatches[3] as ProblemMatchData).resource?.path.toString()).eq('/home/test/more-test.js');
|
|
262
262
|
expect((allMatches[3] as ProblemMatchData).marker).deep.equal({
|
|
263
263
|
range: { start: { line: 0, character: 0 }, end: { line: 0, character: 0 } },
|
|
264
264
|
severity: DiagnosticSeverity.Error,
|