@theia/markers 1.45.0 → 1.46.0-next.72
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/README.md +33 -33
- package/lib/browser/index.d.ts +2 -2
- package/lib/browser/index.js +29 -29
- package/lib/browser/marker-manager.d.ts +47 -47
- package/lib/browser/marker-manager.js +187 -187
- package/lib/browser/marker-tree-label-provider.d.ts +15 -15
- package/lib/browser/marker-tree-label-provider.js +84 -84
- package/lib/browser/marker-tree-label-provider.spec.d.ts +1 -1
- package/lib/browser/marker-tree-label-provider.spec.js +201 -201
- package/lib/browser/marker-tree-model.d.ts +12 -12
- package/lib/browser/marker-tree-model.js +60 -60
- package/lib/browser/marker-tree.d.ts +42 -42
- package/lib/browser/marker-tree.js +143 -143
- package/lib/browser/problem/problem-composite-tree-node.d.ts +11 -11
- package/lib/browser/problem/problem-composite-tree-node.js +76 -76
- package/lib/browser/problem/problem-composite-tree-node.spec.d.ts +1 -1
- package/lib/browser/problem/problem-composite-tree-node.spec.js +238 -238
- package/lib/browser/problem/problem-container.d.ts +8 -8
- package/lib/browser/problem/problem-container.js +46 -46
- package/lib/browser/problem/problem-contribution.d.ts +51 -51
- package/lib/browser/problem/problem-contribution.js +247 -247
- package/lib/browser/problem/problem-decorations-provider.d.ts +21 -21
- package/lib/browser/problem/problem-decorations-provider.js +95 -95
- package/lib/browser/problem/problem-decorator.d.ts +57 -57
- package/lib/browser/problem/problem-decorator.js +233 -233
- package/lib/browser/problem/problem-frontend-module.d.ts +4 -4
- package/lib/browser/problem/problem-frontend-module.js +55 -55
- package/lib/browser/problem/problem-layout-migrations.d.ts +5 -5
- package/lib/browser/problem/problem-layout-migrations.js +43 -43
- package/lib/browser/problem/problem-manager.d.ts +11 -11
- package/lib/browser/problem/problem-manager.js +53 -53
- package/lib/browser/problem/problem-manager.spec.d.ts +1 -1
- package/lib/browser/problem/problem-manager.spec.js +167 -167
- package/lib/browser/problem/problem-preferences.d.ts +13 -13
- package/lib/browser/problem/problem-preferences.js +56 -56
- package/lib/browser/problem/problem-selection.d.ts +12 -12
- package/lib/browser/problem/problem-selection.js +34 -34
- package/lib/browser/problem/problem-tabbar-decorator.d.ts +42 -42
- package/lib/browser/problem/problem-tabbar-decorator.js +160 -160
- package/lib/browser/problem/problem-tree-model.d.ts +32 -32
- package/lib/browser/problem/problem-tree-model.js +131 -131
- package/lib/browser/problem/problem-tree-model.spec.d.ts +1 -1
- package/lib/browser/problem/problem-tree-model.spec.js +172 -172
- package/lib/browser/problem/problem-utils.d.ts +44 -44
- package/lib/browser/problem/problem-utils.js +84 -84
- package/lib/browser/problem/problem-widget-tab-bar-decorator.d.ts +14 -14
- package/lib/browser/problem/problem-widget-tab-bar-decorator.js +69 -69
- package/lib/browser/problem/problem-widget.d.ts +46 -46
- package/lib/browser/problem/problem-widget.js +235 -235
- package/lib/common/marker.d.ts +16 -16
- package/lib/common/marker.js +31 -31
- package/lib/common/problem-marker.d.ts +9 -9
- package/lib/common/problem-marker.js +27 -27
- package/package.json +6 -6
- package/src/browser/index.ts +18 -18
- package/src/browser/marker-manager.ts +205 -205
- package/src/browser/marker-tree-label-provider.spec.ts +245 -245
- package/src/browser/marker-tree-label-provider.ts +75 -75
- package/src/browser/marker-tree-model.ts +47 -47
- package/src/browser/marker-tree.ts +154 -154
- package/src/browser/problem/problem-composite-tree-node.spec.ts +277 -277
- package/src/browser/problem/problem-composite-tree-node.ts +81 -81
- package/src/browser/problem/problem-container.ts +47 -47
- package/src/browser/problem/problem-contribution.ts +247 -247
- package/src/browser/problem/problem-decorations-provider.ts +72 -72
- package/src/browser/problem/problem-decorator.ts +222 -222
- package/src/browser/problem/problem-frontend-module.ts +64 -64
- package/src/browser/problem/problem-layout-migrations.ts +32 -32
- package/src/browser/problem/problem-manager.spec.ts +216 -216
- package/src/browser/problem/problem-manager.ts +51 -51
- package/src/browser/problem/problem-preferences.ts +64 -64
- package/src/browser/problem/problem-selection.ts +45 -45
- package/src/browser/problem/problem-tabbar-decorator.ts +151 -151
- package/src/browser/problem/problem-tree-model.spec.ts +189 -189
- package/src/browser/problem/problem-tree-model.ts +124 -124
- package/src/browser/problem/problem-utils.ts +90 -90
- package/src/browser/problem/problem-widget-tab-bar-decorator.ts +55 -55
- package/src/browser/problem/problem-widget.tsx +246 -246
- package/src/browser/style/index.css +92 -92
- package/src/common/marker.ts +53 -53
- package/src/common/problem-marker.ts +30 -30
|
@@ -1,277 +1,277 @@
|
|
|
1
|
-
// *****************************************************************************
|
|
2
|
-
// Copyright (C) 2021 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
|
-
import { enableJSDOM } from '@theia/core/lib/browser/test/jsdom';
|
|
18
|
-
let disableJSDOM = enableJSDOM();
|
|
19
|
-
|
|
20
|
-
import { FrontendApplicationConfigProvider } from '@theia/core/lib/browser/frontend-application-config-provider';
|
|
21
|
-
FrontendApplicationConfigProvider.set({});
|
|
22
|
-
|
|
23
|
-
import URI from '@theia/core/lib/common/uri';
|
|
24
|
-
import { expect } from 'chai';
|
|
25
|
-
import { Container } from '@theia/core/shared/inversify';
|
|
26
|
-
import { Diagnostic, Range, DiagnosticSeverity } from '@theia/core/shared/vscode-languageserver-protocol';
|
|
27
|
-
import { Event } from '@theia/core/lib/common/event';
|
|
28
|
-
import { MarkerManager } from '../marker-manager';
|
|
29
|
-
import { MarkerInfoNode, MarkerNode, MarkerOptions, MarkerRootNode } from '../marker-tree';
|
|
30
|
-
import { PROBLEM_OPTIONS } from './problem-container';
|
|
31
|
-
import { ProblemManager } from './problem-manager';
|
|
32
|
-
import { ProblemTree } from './problem-tree-model';
|
|
33
|
-
import { FileService } from '@theia/filesystem/lib/browser/file-service';
|
|
34
|
-
import { ProblemCompositeTreeNode } from './problem-composite-tree-node';
|
|
35
|
-
import { Marker } from '../../common/marker';
|
|
36
|
-
|
|
37
|
-
disableJSDOM();
|
|
38
|
-
|
|
39
|
-
let rootNode: MarkerRootNode;
|
|
40
|
-
|
|
41
|
-
before(() => {
|
|
42
|
-
disableJSDOM = enableJSDOM();
|
|
43
|
-
const testContainer = new Container();
|
|
44
|
-
|
|
45
|
-
testContainer.bind(MarkerManager).toSelf().inSingletonScope();
|
|
46
|
-
testContainer.bind(ProblemManager).toSelf();
|
|
47
|
-
testContainer.bind(MarkerOptions).toConstantValue(PROBLEM_OPTIONS);
|
|
48
|
-
testContainer.bind(FileService).toConstantValue(<FileService>{
|
|
49
|
-
onDidFilesChange: Event.None
|
|
50
|
-
});
|
|
51
|
-
|
|
52
|
-
testContainer.bind(ProblemTree).toSelf().inSingletonScope();
|
|
53
|
-
});
|
|
54
|
-
|
|
55
|
-
beforeEach(() => {
|
|
56
|
-
rootNode = getRootNode('theia-problem-marker-widget');
|
|
57
|
-
});
|
|
58
|
-
|
|
59
|
-
after(() => {
|
|
60
|
-
disableJSDOM();
|
|
61
|
-
});
|
|
62
|
-
|
|
63
|
-
describe('problem-composite-tree-node', () => {
|
|
64
|
-
|
|
65
|
-
describe('#sortMarkersInfo', () => {
|
|
66
|
-
|
|
67
|
-
describe('should sort markersInfo based on the highest severity', () => {
|
|
68
|
-
|
|
69
|
-
function testSeveritySorting(high: DiagnosticSeverity, low: DiagnosticSeverity): void {
|
|
70
|
-
const highMarker = createMockMarker({ start: { line: 0, character: 10 }, end: { line: 0, character: 10 } }, high);
|
|
71
|
-
const lowMarker = createMockMarker({ start: { line: 0, character: 10 }, end: { line: 0, character: 10 } }, low);
|
|
72
|
-
const highNode = createMockMarkerNode(highMarker);
|
|
73
|
-
const lowNode = createMockMarkerNode(lowMarker);
|
|
74
|
-
const highMarkerNode = createMarkerInfo('1', new URI('a'), [highNode]);
|
|
75
|
-
const lowMarkerNode = createMarkerInfo('2', new URI('b'), [lowNode]);
|
|
76
|
-
|
|
77
|
-
const highFirstRoot = getRootNode('highFirstRoot');
|
|
78
|
-
ProblemCompositeTreeNode.addChildren(highFirstRoot, [
|
|
79
|
-
{ node: highMarkerNode, markers: [highMarker] },
|
|
80
|
-
{ node: lowMarkerNode, markers: [lowMarker] },
|
|
81
|
-
]);
|
|
82
|
-
expectCorrectOrdering(highFirstRoot);
|
|
83
|
-
const lowFirstRoot = getRootNode('lowFirstRoot');
|
|
84
|
-
ProblemCompositeTreeNode.addChildren(lowFirstRoot, [
|
|
85
|
-
{ node: lowMarkerNode, markers: [lowMarker] },
|
|
86
|
-
{ node: highMarkerNode, markers: [highMarker] },
|
|
87
|
-
]);
|
|
88
|
-
expectCorrectOrdering(lowFirstRoot);
|
|
89
|
-
|
|
90
|
-
function expectCorrectOrdering(root: MarkerRootNode): void {
|
|
91
|
-
expect(root.children.length).to.equal(2);
|
|
92
|
-
expect(root.children[0]).to.equal(highMarkerNode);
|
|
93
|
-
expect(highMarkerNode.nextSibling).to.equal(lowMarkerNode);
|
|
94
|
-
expect(root.children[1]).to.equal(lowMarkerNode);
|
|
95
|
-
expect(lowMarkerNode.previousSibling).to.equal(highMarkerNode);
|
|
96
|
-
}
|
|
97
|
-
}
|
|
98
|
-
|
|
99
|
-
it('should sort error higher than warnings', () => {
|
|
100
|
-
testSeveritySorting(DiagnosticSeverity.Error, DiagnosticSeverity.Warning);
|
|
101
|
-
});
|
|
102
|
-
|
|
103
|
-
it('should sort errors higher than infos', () => {
|
|
104
|
-
testSeveritySorting(DiagnosticSeverity.Error, DiagnosticSeverity.Information);
|
|
105
|
-
});
|
|
106
|
-
|
|
107
|
-
it('should sort errors higher than hints', () => {
|
|
108
|
-
testSeveritySorting(DiagnosticSeverity.Error, DiagnosticSeverity.Hint);
|
|
109
|
-
});
|
|
110
|
-
|
|
111
|
-
it('should sort warnings higher than infos', () => {
|
|
112
|
-
testSeveritySorting(DiagnosticSeverity.Warning, DiagnosticSeverity.Information);
|
|
113
|
-
});
|
|
114
|
-
|
|
115
|
-
it('should sort warnings higher than hints', () => {
|
|
116
|
-
testSeveritySorting(DiagnosticSeverity.Warning, DiagnosticSeverity.Hint);
|
|
117
|
-
});
|
|
118
|
-
|
|
119
|
-
it('should sort infos higher than hints', () => {
|
|
120
|
-
testSeveritySorting(DiagnosticSeverity.Information, DiagnosticSeverity.Hint);
|
|
121
|
-
});
|
|
122
|
-
});
|
|
123
|
-
|
|
124
|
-
it('should sort markersInfo based on URI if severities are equal', () => {
|
|
125
|
-
const markerA = createMockMarker({ start: { line: 0, character: 10 }, end: { line: 0, character: 10 } }, DiagnosticSeverity.Error);
|
|
126
|
-
const markerB = createMockMarker({ start: { line: 0, character: 10 }, end: { line: 0, character: 10 } }, DiagnosticSeverity.Error);
|
|
127
|
-
const nodeA = createMockMarkerNode(markerA);
|
|
128
|
-
const nodeB = createMockMarkerNode(markerB);
|
|
129
|
-
const markerInfoNodeA = createMarkerInfo('1', new URI('a'), [nodeA]);
|
|
130
|
-
const markerInfoNodeB = createMarkerInfo('2', new URI('b'), [nodeB]);
|
|
131
|
-
ProblemCompositeTreeNode.addChildren(rootNode, [
|
|
132
|
-
{ node: markerInfoNodeA, markers: [markerA] },
|
|
133
|
-
{ node: markerInfoNodeB, markers: [markerB] },
|
|
134
|
-
]);
|
|
135
|
-
|
|
136
|
-
expect(rootNode.children.length).to.equal(2);
|
|
137
|
-
expect(rootNode.children[0]).to.equal(markerInfoNodeA);
|
|
138
|
-
expect(markerInfoNodeA.nextSibling).to.equal(markerInfoNodeB);
|
|
139
|
-
expect(rootNode.children[1]).to.equal(markerInfoNodeB);
|
|
140
|
-
expect(markerInfoNodeB.previousSibling).to.equal(markerInfoNodeA);
|
|
141
|
-
});
|
|
142
|
-
|
|
143
|
-
it('changing marker content should lead to update in ProblemCompositeTree', () => {
|
|
144
|
-
const markerA = createMockMarker({ start: { line: 0, character: 10 }, end: { line: 0, character: 10 } }, DiagnosticSeverity.Error);
|
|
145
|
-
const nodeA = createMockMarkerNode(markerA);
|
|
146
|
-
const markerInfoNodeA = createMarkerInfo('1', new URI('a'), [nodeA]);
|
|
147
|
-
ProblemCompositeTreeNode.addChildren(rootNode, [
|
|
148
|
-
{ node: markerInfoNodeA, markers: [markerA] }
|
|
149
|
-
]);
|
|
150
|
-
|
|
151
|
-
markerA.data.severity = DiagnosticSeverity.Hint;
|
|
152
|
-
ProblemCompositeTreeNode.addChildren(rootNode, [
|
|
153
|
-
{ node: markerInfoNodeA, markers: [markerA] }
|
|
154
|
-
]);
|
|
155
|
-
|
|
156
|
-
expect(rootNode.children.length).to.equal(1);
|
|
157
|
-
expect(rootNode.children[0]).to.equal(markerInfoNodeA);
|
|
158
|
-
});
|
|
159
|
-
|
|
160
|
-
it('changing marker content from error to hint should lead to lower rank', () => {
|
|
161
|
-
const markerA = createMockMarker({ start: { line: 0, character: 10 }, end: { line: 0, character: 10 } }, DiagnosticSeverity.Error);
|
|
162
|
-
const nodeA = createMockMarkerNode(markerA);
|
|
163
|
-
const markerInfoNodeA = createMarkerInfo('1', new URI('a'), [nodeA]);
|
|
164
|
-
ProblemCompositeTreeNode.addChildren(rootNode, [
|
|
165
|
-
{ node: markerInfoNodeA, markers: [markerA] }
|
|
166
|
-
]);
|
|
167
|
-
|
|
168
|
-
const markerB = createMockMarker({ start: { line: 0, character: 10 }, end: { line: 0, character: 10 } }, DiagnosticSeverity.Error);
|
|
169
|
-
const nodeB = createMockMarkerNode(markerB);
|
|
170
|
-
const markerInfoNodeB = createMarkerInfo('2', new URI('b'), [nodeB]);
|
|
171
|
-
ProblemCompositeTreeNode.addChildren(rootNode, [
|
|
172
|
-
{ node: markerInfoNodeB, markers: [markerB] }
|
|
173
|
-
]);
|
|
174
|
-
|
|
175
|
-
markerA.data.severity = DiagnosticSeverity.Hint;
|
|
176
|
-
ProblemCompositeTreeNode.addChildren(rootNode, [
|
|
177
|
-
{ node: markerInfoNodeA, markers: [markerA] }
|
|
178
|
-
]);
|
|
179
|
-
|
|
180
|
-
expect(rootNode.children.length).to.equal(2);
|
|
181
|
-
expect(rootNode.children[0]).to.equal(markerInfoNodeB);
|
|
182
|
-
expect(markerInfoNodeB.nextSibling).to.equal(markerInfoNodeA);
|
|
183
|
-
expect(rootNode.children[1]).to.equal(markerInfoNodeA);
|
|
184
|
-
expect(markerInfoNodeA.previousSibling).to.equal(markerInfoNodeB);
|
|
185
|
-
});
|
|
186
|
-
|
|
187
|
-
it('changing marker content from error to hint should lead to higher rank', () => {
|
|
188
|
-
const markerA = createMockMarker({ start: { line: 0, character: 10 }, end: { line: 0, character: 10 } }, DiagnosticSeverity.Hint);
|
|
189
|
-
const nodeA = createMockMarkerNode(markerA);
|
|
190
|
-
const markerInfoNodeA = createMarkerInfo('1', new URI('a'), [nodeA]);
|
|
191
|
-
ProblemCompositeTreeNode.addChildren(rootNode, [
|
|
192
|
-
{ node: markerInfoNodeA, markers: [markerA] }
|
|
193
|
-
]);
|
|
194
|
-
|
|
195
|
-
const markerB = createMockMarker({ start: { line: 0, character: 10 }, end: { line: 0, character: 10 } }, DiagnosticSeverity.Error);
|
|
196
|
-
const nodeB = createMockMarkerNode(markerB);
|
|
197
|
-
const markerInfoNodeB = createMarkerInfo('2', new URI('b'), [nodeB]);
|
|
198
|
-
ProblemCompositeTreeNode.addChildren(rootNode, [
|
|
199
|
-
{ node: markerInfoNodeB, markers: [markerB] }
|
|
200
|
-
]);
|
|
201
|
-
|
|
202
|
-
markerA.data.severity = DiagnosticSeverity.Error;
|
|
203
|
-
ProblemCompositeTreeNode.addChildren(rootNode, [
|
|
204
|
-
{ node: markerInfoNodeA, markers: [markerA] }
|
|
205
|
-
]);
|
|
206
|
-
|
|
207
|
-
expect(rootNode.children.length).to.equal(2);
|
|
208
|
-
expect(rootNode.children[0]).to.equal(markerInfoNodeA);
|
|
209
|
-
expect(markerInfoNodeA.nextSibling).to.equal(markerInfoNodeB);
|
|
210
|
-
expect(rootNode.children[1]).to.equal(markerInfoNodeB);
|
|
211
|
-
expect(markerInfoNodeB.previousSibling).to.equal(markerInfoNodeA);
|
|
212
|
-
});
|
|
213
|
-
});
|
|
214
|
-
});
|
|
215
|
-
|
|
216
|
-
function createMarkerInfo(id: string, uri: URI, marker: MarkerNode[]): MarkerInfoNode {
|
|
217
|
-
return {
|
|
218
|
-
children: marker ? marker : [],
|
|
219
|
-
expanded: true,
|
|
220
|
-
uri,
|
|
221
|
-
id,
|
|
222
|
-
parent: rootNode,
|
|
223
|
-
selected: false,
|
|
224
|
-
numberOfMarkers: marker ? marker.length : 0
|
|
225
|
-
};
|
|
226
|
-
}
|
|
227
|
-
|
|
228
|
-
/**
|
|
229
|
-
* Create a mock marker node with the given diagnostic marker.
|
|
230
|
-
* @param marker the diagnostic marker.
|
|
231
|
-
*
|
|
232
|
-
* @returns a mock marker node.
|
|
233
|
-
*/
|
|
234
|
-
function createMockMarkerNode(marker: Marker<Diagnostic>): MarkerNode {
|
|
235
|
-
return {
|
|
236
|
-
id: 'id',
|
|
237
|
-
name: 'marker',
|
|
238
|
-
parent: undefined,
|
|
239
|
-
selected: false,
|
|
240
|
-
uri: new URI(''),
|
|
241
|
-
marker
|
|
242
|
-
};
|
|
243
|
-
}
|
|
244
|
-
|
|
245
|
-
/**
|
|
246
|
-
* Create a mock diagnostic marker.
|
|
247
|
-
* @param range the diagnostic range.
|
|
248
|
-
* @param severity the diagnostic severity.
|
|
249
|
-
* @param owner the optional owner of the diagnostic
|
|
250
|
-
*
|
|
251
|
-
* @returns a mock diagnostic marker.
|
|
252
|
-
*/
|
|
253
|
-
function createMockMarker(range: Range, severity: DiagnosticSeverity, owner?: string): Readonly<Marker<Diagnostic>> {
|
|
254
|
-
const data: Diagnostic = {
|
|
255
|
-
range: range,
|
|
256
|
-
severity: severity,
|
|
257
|
-
message: 'message'
|
|
258
|
-
};
|
|
259
|
-
return Object.freeze({
|
|
260
|
-
uri: 'uri',
|
|
261
|
-
kind: 'marker',
|
|
262
|
-
owner: owner ?? 'owner',
|
|
263
|
-
data
|
|
264
|
-
});
|
|
265
|
-
}
|
|
266
|
-
|
|
267
|
-
function getRootNode(id: string): MarkerRootNode {
|
|
268
|
-
return {
|
|
269
|
-
visible: false,
|
|
270
|
-
id: id,
|
|
271
|
-
name: 'MarkerTree',
|
|
272
|
-
kind: 'problem',
|
|
273
|
-
children: [],
|
|
274
|
-
parent: undefined
|
|
275
|
-
};
|
|
276
|
-
}
|
|
277
|
-
|
|
1
|
+
// *****************************************************************************
|
|
2
|
+
// Copyright (C) 2021 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
|
+
import { enableJSDOM } from '@theia/core/lib/browser/test/jsdom';
|
|
18
|
+
let disableJSDOM = enableJSDOM();
|
|
19
|
+
|
|
20
|
+
import { FrontendApplicationConfigProvider } from '@theia/core/lib/browser/frontend-application-config-provider';
|
|
21
|
+
FrontendApplicationConfigProvider.set({});
|
|
22
|
+
|
|
23
|
+
import URI from '@theia/core/lib/common/uri';
|
|
24
|
+
import { expect } from 'chai';
|
|
25
|
+
import { Container } from '@theia/core/shared/inversify';
|
|
26
|
+
import { Diagnostic, Range, DiagnosticSeverity } from '@theia/core/shared/vscode-languageserver-protocol';
|
|
27
|
+
import { Event } from '@theia/core/lib/common/event';
|
|
28
|
+
import { MarkerManager } from '../marker-manager';
|
|
29
|
+
import { MarkerInfoNode, MarkerNode, MarkerOptions, MarkerRootNode } from '../marker-tree';
|
|
30
|
+
import { PROBLEM_OPTIONS } from './problem-container';
|
|
31
|
+
import { ProblemManager } from './problem-manager';
|
|
32
|
+
import { ProblemTree } from './problem-tree-model';
|
|
33
|
+
import { FileService } from '@theia/filesystem/lib/browser/file-service';
|
|
34
|
+
import { ProblemCompositeTreeNode } from './problem-composite-tree-node';
|
|
35
|
+
import { Marker } from '../../common/marker';
|
|
36
|
+
|
|
37
|
+
disableJSDOM();
|
|
38
|
+
|
|
39
|
+
let rootNode: MarkerRootNode;
|
|
40
|
+
|
|
41
|
+
before(() => {
|
|
42
|
+
disableJSDOM = enableJSDOM();
|
|
43
|
+
const testContainer = new Container();
|
|
44
|
+
|
|
45
|
+
testContainer.bind(MarkerManager).toSelf().inSingletonScope();
|
|
46
|
+
testContainer.bind(ProblemManager).toSelf();
|
|
47
|
+
testContainer.bind(MarkerOptions).toConstantValue(PROBLEM_OPTIONS);
|
|
48
|
+
testContainer.bind(FileService).toConstantValue(<FileService>{
|
|
49
|
+
onDidFilesChange: Event.None
|
|
50
|
+
});
|
|
51
|
+
|
|
52
|
+
testContainer.bind(ProblemTree).toSelf().inSingletonScope();
|
|
53
|
+
});
|
|
54
|
+
|
|
55
|
+
beforeEach(() => {
|
|
56
|
+
rootNode = getRootNode('theia-problem-marker-widget');
|
|
57
|
+
});
|
|
58
|
+
|
|
59
|
+
after(() => {
|
|
60
|
+
disableJSDOM();
|
|
61
|
+
});
|
|
62
|
+
|
|
63
|
+
describe('problem-composite-tree-node', () => {
|
|
64
|
+
|
|
65
|
+
describe('#sortMarkersInfo', () => {
|
|
66
|
+
|
|
67
|
+
describe('should sort markersInfo based on the highest severity', () => {
|
|
68
|
+
|
|
69
|
+
function testSeveritySorting(high: DiagnosticSeverity, low: DiagnosticSeverity): void {
|
|
70
|
+
const highMarker = createMockMarker({ start: { line: 0, character: 10 }, end: { line: 0, character: 10 } }, high);
|
|
71
|
+
const lowMarker = createMockMarker({ start: { line: 0, character: 10 }, end: { line: 0, character: 10 } }, low);
|
|
72
|
+
const highNode = createMockMarkerNode(highMarker);
|
|
73
|
+
const lowNode = createMockMarkerNode(lowMarker);
|
|
74
|
+
const highMarkerNode = createMarkerInfo('1', new URI('a'), [highNode]);
|
|
75
|
+
const lowMarkerNode = createMarkerInfo('2', new URI('b'), [lowNode]);
|
|
76
|
+
|
|
77
|
+
const highFirstRoot = getRootNode('highFirstRoot');
|
|
78
|
+
ProblemCompositeTreeNode.addChildren(highFirstRoot, [
|
|
79
|
+
{ node: highMarkerNode, markers: [highMarker] },
|
|
80
|
+
{ node: lowMarkerNode, markers: [lowMarker] },
|
|
81
|
+
]);
|
|
82
|
+
expectCorrectOrdering(highFirstRoot);
|
|
83
|
+
const lowFirstRoot = getRootNode('lowFirstRoot');
|
|
84
|
+
ProblemCompositeTreeNode.addChildren(lowFirstRoot, [
|
|
85
|
+
{ node: lowMarkerNode, markers: [lowMarker] },
|
|
86
|
+
{ node: highMarkerNode, markers: [highMarker] },
|
|
87
|
+
]);
|
|
88
|
+
expectCorrectOrdering(lowFirstRoot);
|
|
89
|
+
|
|
90
|
+
function expectCorrectOrdering(root: MarkerRootNode): void {
|
|
91
|
+
expect(root.children.length).to.equal(2);
|
|
92
|
+
expect(root.children[0]).to.equal(highMarkerNode);
|
|
93
|
+
expect(highMarkerNode.nextSibling).to.equal(lowMarkerNode);
|
|
94
|
+
expect(root.children[1]).to.equal(lowMarkerNode);
|
|
95
|
+
expect(lowMarkerNode.previousSibling).to.equal(highMarkerNode);
|
|
96
|
+
}
|
|
97
|
+
}
|
|
98
|
+
|
|
99
|
+
it('should sort error higher than warnings', () => {
|
|
100
|
+
testSeveritySorting(DiagnosticSeverity.Error, DiagnosticSeverity.Warning);
|
|
101
|
+
});
|
|
102
|
+
|
|
103
|
+
it('should sort errors higher than infos', () => {
|
|
104
|
+
testSeveritySorting(DiagnosticSeverity.Error, DiagnosticSeverity.Information);
|
|
105
|
+
});
|
|
106
|
+
|
|
107
|
+
it('should sort errors higher than hints', () => {
|
|
108
|
+
testSeveritySorting(DiagnosticSeverity.Error, DiagnosticSeverity.Hint);
|
|
109
|
+
});
|
|
110
|
+
|
|
111
|
+
it('should sort warnings higher than infos', () => {
|
|
112
|
+
testSeveritySorting(DiagnosticSeverity.Warning, DiagnosticSeverity.Information);
|
|
113
|
+
});
|
|
114
|
+
|
|
115
|
+
it('should sort warnings higher than hints', () => {
|
|
116
|
+
testSeveritySorting(DiagnosticSeverity.Warning, DiagnosticSeverity.Hint);
|
|
117
|
+
});
|
|
118
|
+
|
|
119
|
+
it('should sort infos higher than hints', () => {
|
|
120
|
+
testSeveritySorting(DiagnosticSeverity.Information, DiagnosticSeverity.Hint);
|
|
121
|
+
});
|
|
122
|
+
});
|
|
123
|
+
|
|
124
|
+
it('should sort markersInfo based on URI if severities are equal', () => {
|
|
125
|
+
const markerA = createMockMarker({ start: { line: 0, character: 10 }, end: { line: 0, character: 10 } }, DiagnosticSeverity.Error);
|
|
126
|
+
const markerB = createMockMarker({ start: { line: 0, character: 10 }, end: { line: 0, character: 10 } }, DiagnosticSeverity.Error);
|
|
127
|
+
const nodeA = createMockMarkerNode(markerA);
|
|
128
|
+
const nodeB = createMockMarkerNode(markerB);
|
|
129
|
+
const markerInfoNodeA = createMarkerInfo('1', new URI('a'), [nodeA]);
|
|
130
|
+
const markerInfoNodeB = createMarkerInfo('2', new URI('b'), [nodeB]);
|
|
131
|
+
ProblemCompositeTreeNode.addChildren(rootNode, [
|
|
132
|
+
{ node: markerInfoNodeA, markers: [markerA] },
|
|
133
|
+
{ node: markerInfoNodeB, markers: [markerB] },
|
|
134
|
+
]);
|
|
135
|
+
|
|
136
|
+
expect(rootNode.children.length).to.equal(2);
|
|
137
|
+
expect(rootNode.children[0]).to.equal(markerInfoNodeA);
|
|
138
|
+
expect(markerInfoNodeA.nextSibling).to.equal(markerInfoNodeB);
|
|
139
|
+
expect(rootNode.children[1]).to.equal(markerInfoNodeB);
|
|
140
|
+
expect(markerInfoNodeB.previousSibling).to.equal(markerInfoNodeA);
|
|
141
|
+
});
|
|
142
|
+
|
|
143
|
+
it('changing marker content should lead to update in ProblemCompositeTree', () => {
|
|
144
|
+
const markerA = createMockMarker({ start: { line: 0, character: 10 }, end: { line: 0, character: 10 } }, DiagnosticSeverity.Error);
|
|
145
|
+
const nodeA = createMockMarkerNode(markerA);
|
|
146
|
+
const markerInfoNodeA = createMarkerInfo('1', new URI('a'), [nodeA]);
|
|
147
|
+
ProblemCompositeTreeNode.addChildren(rootNode, [
|
|
148
|
+
{ node: markerInfoNodeA, markers: [markerA] }
|
|
149
|
+
]);
|
|
150
|
+
|
|
151
|
+
markerA.data.severity = DiagnosticSeverity.Hint;
|
|
152
|
+
ProblemCompositeTreeNode.addChildren(rootNode, [
|
|
153
|
+
{ node: markerInfoNodeA, markers: [markerA] }
|
|
154
|
+
]);
|
|
155
|
+
|
|
156
|
+
expect(rootNode.children.length).to.equal(1);
|
|
157
|
+
expect(rootNode.children[0]).to.equal(markerInfoNodeA);
|
|
158
|
+
});
|
|
159
|
+
|
|
160
|
+
it('changing marker content from error to hint should lead to lower rank', () => {
|
|
161
|
+
const markerA = createMockMarker({ start: { line: 0, character: 10 }, end: { line: 0, character: 10 } }, DiagnosticSeverity.Error);
|
|
162
|
+
const nodeA = createMockMarkerNode(markerA);
|
|
163
|
+
const markerInfoNodeA = createMarkerInfo('1', new URI('a'), [nodeA]);
|
|
164
|
+
ProblemCompositeTreeNode.addChildren(rootNode, [
|
|
165
|
+
{ node: markerInfoNodeA, markers: [markerA] }
|
|
166
|
+
]);
|
|
167
|
+
|
|
168
|
+
const markerB = createMockMarker({ start: { line: 0, character: 10 }, end: { line: 0, character: 10 } }, DiagnosticSeverity.Error);
|
|
169
|
+
const nodeB = createMockMarkerNode(markerB);
|
|
170
|
+
const markerInfoNodeB = createMarkerInfo('2', new URI('b'), [nodeB]);
|
|
171
|
+
ProblemCompositeTreeNode.addChildren(rootNode, [
|
|
172
|
+
{ node: markerInfoNodeB, markers: [markerB] }
|
|
173
|
+
]);
|
|
174
|
+
|
|
175
|
+
markerA.data.severity = DiagnosticSeverity.Hint;
|
|
176
|
+
ProblemCompositeTreeNode.addChildren(rootNode, [
|
|
177
|
+
{ node: markerInfoNodeA, markers: [markerA] }
|
|
178
|
+
]);
|
|
179
|
+
|
|
180
|
+
expect(rootNode.children.length).to.equal(2);
|
|
181
|
+
expect(rootNode.children[0]).to.equal(markerInfoNodeB);
|
|
182
|
+
expect(markerInfoNodeB.nextSibling).to.equal(markerInfoNodeA);
|
|
183
|
+
expect(rootNode.children[1]).to.equal(markerInfoNodeA);
|
|
184
|
+
expect(markerInfoNodeA.previousSibling).to.equal(markerInfoNodeB);
|
|
185
|
+
});
|
|
186
|
+
|
|
187
|
+
it('changing marker content from error to hint should lead to higher rank', () => {
|
|
188
|
+
const markerA = createMockMarker({ start: { line: 0, character: 10 }, end: { line: 0, character: 10 } }, DiagnosticSeverity.Hint);
|
|
189
|
+
const nodeA = createMockMarkerNode(markerA);
|
|
190
|
+
const markerInfoNodeA = createMarkerInfo('1', new URI('a'), [nodeA]);
|
|
191
|
+
ProblemCompositeTreeNode.addChildren(rootNode, [
|
|
192
|
+
{ node: markerInfoNodeA, markers: [markerA] }
|
|
193
|
+
]);
|
|
194
|
+
|
|
195
|
+
const markerB = createMockMarker({ start: { line: 0, character: 10 }, end: { line: 0, character: 10 } }, DiagnosticSeverity.Error);
|
|
196
|
+
const nodeB = createMockMarkerNode(markerB);
|
|
197
|
+
const markerInfoNodeB = createMarkerInfo('2', new URI('b'), [nodeB]);
|
|
198
|
+
ProblemCompositeTreeNode.addChildren(rootNode, [
|
|
199
|
+
{ node: markerInfoNodeB, markers: [markerB] }
|
|
200
|
+
]);
|
|
201
|
+
|
|
202
|
+
markerA.data.severity = DiagnosticSeverity.Error;
|
|
203
|
+
ProblemCompositeTreeNode.addChildren(rootNode, [
|
|
204
|
+
{ node: markerInfoNodeA, markers: [markerA] }
|
|
205
|
+
]);
|
|
206
|
+
|
|
207
|
+
expect(rootNode.children.length).to.equal(2);
|
|
208
|
+
expect(rootNode.children[0]).to.equal(markerInfoNodeA);
|
|
209
|
+
expect(markerInfoNodeA.nextSibling).to.equal(markerInfoNodeB);
|
|
210
|
+
expect(rootNode.children[1]).to.equal(markerInfoNodeB);
|
|
211
|
+
expect(markerInfoNodeB.previousSibling).to.equal(markerInfoNodeA);
|
|
212
|
+
});
|
|
213
|
+
});
|
|
214
|
+
});
|
|
215
|
+
|
|
216
|
+
function createMarkerInfo(id: string, uri: URI, marker: MarkerNode[]): MarkerInfoNode {
|
|
217
|
+
return {
|
|
218
|
+
children: marker ? marker : [],
|
|
219
|
+
expanded: true,
|
|
220
|
+
uri,
|
|
221
|
+
id,
|
|
222
|
+
parent: rootNode,
|
|
223
|
+
selected: false,
|
|
224
|
+
numberOfMarkers: marker ? marker.length : 0
|
|
225
|
+
};
|
|
226
|
+
}
|
|
227
|
+
|
|
228
|
+
/**
|
|
229
|
+
* Create a mock marker node with the given diagnostic marker.
|
|
230
|
+
* @param marker the diagnostic marker.
|
|
231
|
+
*
|
|
232
|
+
* @returns a mock marker node.
|
|
233
|
+
*/
|
|
234
|
+
function createMockMarkerNode(marker: Marker<Diagnostic>): MarkerNode {
|
|
235
|
+
return {
|
|
236
|
+
id: 'id',
|
|
237
|
+
name: 'marker',
|
|
238
|
+
parent: undefined,
|
|
239
|
+
selected: false,
|
|
240
|
+
uri: new URI(''),
|
|
241
|
+
marker
|
|
242
|
+
};
|
|
243
|
+
}
|
|
244
|
+
|
|
245
|
+
/**
|
|
246
|
+
* Create a mock diagnostic marker.
|
|
247
|
+
* @param range the diagnostic range.
|
|
248
|
+
* @param severity the diagnostic severity.
|
|
249
|
+
* @param owner the optional owner of the diagnostic
|
|
250
|
+
*
|
|
251
|
+
* @returns a mock diagnostic marker.
|
|
252
|
+
*/
|
|
253
|
+
function createMockMarker(range: Range, severity: DiagnosticSeverity, owner?: string): Readonly<Marker<Diagnostic>> {
|
|
254
|
+
const data: Diagnostic = {
|
|
255
|
+
range: range,
|
|
256
|
+
severity: severity,
|
|
257
|
+
message: 'message'
|
|
258
|
+
};
|
|
259
|
+
return Object.freeze({
|
|
260
|
+
uri: 'uri',
|
|
261
|
+
kind: 'marker',
|
|
262
|
+
owner: owner ?? 'owner',
|
|
263
|
+
data
|
|
264
|
+
});
|
|
265
|
+
}
|
|
266
|
+
|
|
267
|
+
function getRootNode(id: string): MarkerRootNode {
|
|
268
|
+
return {
|
|
269
|
+
visible: false,
|
|
270
|
+
id: id,
|
|
271
|
+
name: 'MarkerTree',
|
|
272
|
+
kind: 'problem',
|
|
273
|
+
children: [],
|
|
274
|
+
parent: undefined
|
|
275
|
+
};
|
|
276
|
+
}
|
|
277
|
+
|