@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.
Files changed (81) hide show
  1. package/README.md +33 -33
  2. package/lib/browser/index.d.ts +2 -2
  3. package/lib/browser/index.js +29 -29
  4. package/lib/browser/marker-manager.d.ts +47 -47
  5. package/lib/browser/marker-manager.js +187 -187
  6. package/lib/browser/marker-tree-label-provider.d.ts +15 -15
  7. package/lib/browser/marker-tree-label-provider.js +84 -84
  8. package/lib/browser/marker-tree-label-provider.spec.d.ts +1 -1
  9. package/lib/browser/marker-tree-label-provider.spec.js +201 -201
  10. package/lib/browser/marker-tree-model.d.ts +12 -12
  11. package/lib/browser/marker-tree-model.js +60 -60
  12. package/lib/browser/marker-tree.d.ts +42 -42
  13. package/lib/browser/marker-tree.js +143 -143
  14. package/lib/browser/problem/problem-composite-tree-node.d.ts +11 -11
  15. package/lib/browser/problem/problem-composite-tree-node.js +76 -76
  16. package/lib/browser/problem/problem-composite-tree-node.spec.d.ts +1 -1
  17. package/lib/browser/problem/problem-composite-tree-node.spec.js +238 -238
  18. package/lib/browser/problem/problem-container.d.ts +8 -8
  19. package/lib/browser/problem/problem-container.js +46 -46
  20. package/lib/browser/problem/problem-contribution.d.ts +51 -51
  21. package/lib/browser/problem/problem-contribution.js +247 -247
  22. package/lib/browser/problem/problem-decorations-provider.d.ts +21 -21
  23. package/lib/browser/problem/problem-decorations-provider.js +95 -95
  24. package/lib/browser/problem/problem-decorator.d.ts +57 -57
  25. package/lib/browser/problem/problem-decorator.js +233 -233
  26. package/lib/browser/problem/problem-frontend-module.d.ts +4 -4
  27. package/lib/browser/problem/problem-frontend-module.js +55 -55
  28. package/lib/browser/problem/problem-layout-migrations.d.ts +5 -5
  29. package/lib/browser/problem/problem-layout-migrations.js +43 -43
  30. package/lib/browser/problem/problem-manager.d.ts +11 -11
  31. package/lib/browser/problem/problem-manager.js +53 -53
  32. package/lib/browser/problem/problem-manager.spec.d.ts +1 -1
  33. package/lib/browser/problem/problem-manager.spec.js +167 -167
  34. package/lib/browser/problem/problem-preferences.d.ts +13 -13
  35. package/lib/browser/problem/problem-preferences.js +56 -56
  36. package/lib/browser/problem/problem-selection.d.ts +12 -12
  37. package/lib/browser/problem/problem-selection.js +34 -34
  38. package/lib/browser/problem/problem-tabbar-decorator.d.ts +42 -42
  39. package/lib/browser/problem/problem-tabbar-decorator.js +160 -160
  40. package/lib/browser/problem/problem-tree-model.d.ts +32 -32
  41. package/lib/browser/problem/problem-tree-model.js +131 -131
  42. package/lib/browser/problem/problem-tree-model.spec.d.ts +1 -1
  43. package/lib/browser/problem/problem-tree-model.spec.js +172 -172
  44. package/lib/browser/problem/problem-utils.d.ts +44 -44
  45. package/lib/browser/problem/problem-utils.js +84 -84
  46. package/lib/browser/problem/problem-widget-tab-bar-decorator.d.ts +14 -14
  47. package/lib/browser/problem/problem-widget-tab-bar-decorator.js +69 -69
  48. package/lib/browser/problem/problem-widget.d.ts +46 -46
  49. package/lib/browser/problem/problem-widget.js +235 -235
  50. package/lib/common/marker.d.ts +16 -16
  51. package/lib/common/marker.js +31 -31
  52. package/lib/common/problem-marker.d.ts +9 -9
  53. package/lib/common/problem-marker.js +27 -27
  54. package/package.json +6 -6
  55. package/src/browser/index.ts +18 -18
  56. package/src/browser/marker-manager.ts +205 -205
  57. package/src/browser/marker-tree-label-provider.spec.ts +245 -245
  58. package/src/browser/marker-tree-label-provider.ts +75 -75
  59. package/src/browser/marker-tree-model.ts +47 -47
  60. package/src/browser/marker-tree.ts +154 -154
  61. package/src/browser/problem/problem-composite-tree-node.spec.ts +277 -277
  62. package/src/browser/problem/problem-composite-tree-node.ts +81 -81
  63. package/src/browser/problem/problem-container.ts +47 -47
  64. package/src/browser/problem/problem-contribution.ts +247 -247
  65. package/src/browser/problem/problem-decorations-provider.ts +72 -72
  66. package/src/browser/problem/problem-decorator.ts +222 -222
  67. package/src/browser/problem/problem-frontend-module.ts +64 -64
  68. package/src/browser/problem/problem-layout-migrations.ts +32 -32
  69. package/src/browser/problem/problem-manager.spec.ts +216 -216
  70. package/src/browser/problem/problem-manager.ts +51 -51
  71. package/src/browser/problem/problem-preferences.ts +64 -64
  72. package/src/browser/problem/problem-selection.ts +45 -45
  73. package/src/browser/problem/problem-tabbar-decorator.ts +151 -151
  74. package/src/browser/problem/problem-tree-model.spec.ts +189 -189
  75. package/src/browser/problem/problem-tree-model.ts +124 -124
  76. package/src/browser/problem/problem-utils.ts +90 -90
  77. package/src/browser/problem/problem-widget-tab-bar-decorator.ts +55 -55
  78. package/src/browser/problem/problem-widget.tsx +246 -246
  79. package/src/browser/style/index.css +92 -92
  80. package/src/common/marker.ts +53 -53
  81. package/src/common/problem-marker.ts +30 -30
@@ -1,77 +1,77 @@
1
- "use strict";
2
- // *****************************************************************************
3
- // Copyright (C) 2021 EclipseSource and others.
4
- //
5
- // This program and the accompanying materials are made available under the
6
- // terms of the Eclipse Public License v. 2.0 which is available at
7
- // http://www.eclipse.org/legal/epl-2.0.
8
- //
9
- // This Source Code may also be made available under the following Secondary
10
- // Licenses when the conditions for such availability set forth in the Eclipse
11
- // Public License v. 2.0 are satisfied: GNU General Public License, version 2
12
- // with the GNU Classpath Exception which is available at
13
- // https://www.gnu.org/software/classpath/license.html.
14
- //
15
- // SPDX-License-Identifier: EPL-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0
16
- // *****************************************************************************
17
- Object.defineProperty(exports, "__esModule", { value: true });
18
- exports.ProblemCompositeTreeNode = void 0;
19
- const tree_1 = require("@theia/core/lib/browser/tree/tree");
20
- const problem_utils_1 = require("./problem-utils");
21
- var ProblemCompositeTreeNode;
22
- (function (ProblemCompositeTreeNode) {
23
- function setSeverity(parent, markers) {
24
- let maxSeverity;
25
- markers.forEach(marker => {
26
- if (problem_utils_1.ProblemUtils.severityCompare(marker.data.severity, maxSeverity) < 0) {
27
- maxSeverity = marker.data.severity;
28
- }
29
- });
30
- parent.severity = maxSeverity;
31
- }
32
- ProblemCompositeTreeNode.setSeverity = setSeverity;
33
- ;
34
- function addChildren(parent, insertChildren) {
35
- for (const { node, markers } of insertChildren) {
36
- ProblemCompositeTreeNode.setSeverity(node, markers);
37
- }
38
- const sortedInsertChildren = insertChildren.sort((a, b) => (problem_utils_1.ProblemUtils.severityCompare(a.node.severity, b.node.severity) || compareURI(a.node.uri, b.node.uri)));
39
- let startIndex = 0;
40
- const children = parent.children;
41
- for (const { node } of sortedInsertChildren) {
42
- const index = children.findIndex(value => value.id === node.id);
43
- if (index !== -1) {
44
- tree_1.CompositeTreeNode.removeChild(parent, node);
45
- }
46
- if (children.length === 0) {
47
- children.push(node);
48
- startIndex = 1;
49
- tree_1.CompositeTreeNode.setParent(node, 0, parent);
50
- }
51
- else {
52
- let inserted = false;
53
- for (let i = startIndex; i < children.length; i++) {
54
- // sort by severity, equal severity => sort by URI
55
- if (problem_utils_1.ProblemUtils.severityCompare(node.severity, children[i].severity) < 0
56
- || (problem_utils_1.ProblemUtils.severityCompare(node.severity, children[i].severity) === 0 && compareURI(node.uri, children[i].uri) < 0)) {
57
- children.splice(i, 0, node);
58
- inserted = true;
59
- startIndex = i + 1;
60
- tree_1.CompositeTreeNode.setParent(node, i, parent);
61
- break;
62
- }
63
- ;
64
- }
65
- if (inserted === false) {
66
- children.push(node);
67
- startIndex = children.length;
68
- tree_1.CompositeTreeNode.setParent(node, children.length - 1, parent);
69
- }
70
- }
71
- }
72
- }
73
- ProblemCompositeTreeNode.addChildren = addChildren;
74
- const compareURI = (uri1, uri2) => uri1.toString().localeCompare(uri2.toString(), undefined, { sensitivity: 'base' });
75
- ;
76
- })(ProblemCompositeTreeNode = exports.ProblemCompositeTreeNode || (exports.ProblemCompositeTreeNode = {}));
1
+ "use strict";
2
+ // *****************************************************************************
3
+ // Copyright (C) 2021 EclipseSource and others.
4
+ //
5
+ // This program and the accompanying materials are made available under the
6
+ // terms of the Eclipse Public License v. 2.0 which is available at
7
+ // http://www.eclipse.org/legal/epl-2.0.
8
+ //
9
+ // This Source Code may also be made available under the following Secondary
10
+ // Licenses when the conditions for such availability set forth in the Eclipse
11
+ // Public License v. 2.0 are satisfied: GNU General Public License, version 2
12
+ // with the GNU Classpath Exception which is available at
13
+ // https://www.gnu.org/software/classpath/license.html.
14
+ //
15
+ // SPDX-License-Identifier: EPL-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0
16
+ // *****************************************************************************
17
+ Object.defineProperty(exports, "__esModule", { value: true });
18
+ exports.ProblemCompositeTreeNode = void 0;
19
+ const tree_1 = require("@theia/core/lib/browser/tree/tree");
20
+ const problem_utils_1 = require("./problem-utils");
21
+ var ProblemCompositeTreeNode;
22
+ (function (ProblemCompositeTreeNode) {
23
+ function setSeverity(parent, markers) {
24
+ let maxSeverity;
25
+ markers.forEach(marker => {
26
+ if (problem_utils_1.ProblemUtils.severityCompare(marker.data.severity, maxSeverity) < 0) {
27
+ maxSeverity = marker.data.severity;
28
+ }
29
+ });
30
+ parent.severity = maxSeverity;
31
+ }
32
+ ProblemCompositeTreeNode.setSeverity = setSeverity;
33
+ ;
34
+ function addChildren(parent, insertChildren) {
35
+ for (const { node, markers } of insertChildren) {
36
+ ProblemCompositeTreeNode.setSeverity(node, markers);
37
+ }
38
+ const sortedInsertChildren = insertChildren.sort((a, b) => (problem_utils_1.ProblemUtils.severityCompare(a.node.severity, b.node.severity) || compareURI(a.node.uri, b.node.uri)));
39
+ let startIndex = 0;
40
+ const children = parent.children;
41
+ for (const { node } of sortedInsertChildren) {
42
+ const index = children.findIndex(value => value.id === node.id);
43
+ if (index !== -1) {
44
+ tree_1.CompositeTreeNode.removeChild(parent, node);
45
+ }
46
+ if (children.length === 0) {
47
+ children.push(node);
48
+ startIndex = 1;
49
+ tree_1.CompositeTreeNode.setParent(node, 0, parent);
50
+ }
51
+ else {
52
+ let inserted = false;
53
+ for (let i = startIndex; i < children.length; i++) {
54
+ // sort by severity, equal severity => sort by URI
55
+ if (problem_utils_1.ProblemUtils.severityCompare(node.severity, children[i].severity) < 0
56
+ || (problem_utils_1.ProblemUtils.severityCompare(node.severity, children[i].severity) === 0 && compareURI(node.uri, children[i].uri) < 0)) {
57
+ children.splice(i, 0, node);
58
+ inserted = true;
59
+ startIndex = i + 1;
60
+ tree_1.CompositeTreeNode.setParent(node, i, parent);
61
+ break;
62
+ }
63
+ ;
64
+ }
65
+ if (inserted === false) {
66
+ children.push(node);
67
+ startIndex = children.length;
68
+ tree_1.CompositeTreeNode.setParent(node, children.length - 1, parent);
69
+ }
70
+ }
71
+ }
72
+ }
73
+ ProblemCompositeTreeNode.addChildren = addChildren;
74
+ const compareURI = (uri1, uri2) => uri1.toString().localeCompare(uri2.toString(), undefined, { sensitivity: 'base' });
75
+ ;
76
+ })(ProblemCompositeTreeNode = exports.ProblemCompositeTreeNode || (exports.ProblemCompositeTreeNode = {}));
77
77
  //# sourceMappingURL=problem-composite-tree-node.js.map
@@ -1,2 +1,2 @@
1
- export {};
1
+ export {};
2
2
  //# sourceMappingURL=problem-composite-tree-node.spec.d.ts.map
@@ -1,239 +1,239 @@
1
- "use strict";
2
- // *****************************************************************************
3
- // Copyright (C) 2021 EclipseSource and others.
4
- //
5
- // This program and the accompanying materials are made available under the
6
- // terms of the Eclipse Public License v. 2.0 which is available at
7
- // http://www.eclipse.org/legal/epl-2.0.
8
- //
9
- // This Source Code may also be made available under the following Secondary
10
- // Licenses when the conditions for such availability set forth in the Eclipse
11
- // Public License v. 2.0 are satisfied: GNU General Public License, version 2
12
- // with the GNU Classpath Exception which is available at
13
- // https://www.gnu.org/software/classpath/license.html.
14
- //
15
- // SPDX-License-Identifier: EPL-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0
16
- // *****************************************************************************
17
- Object.defineProperty(exports, "__esModule", { value: true });
18
- const jsdom_1 = require("@theia/core/lib/browser/test/jsdom");
19
- let disableJSDOM = (0, jsdom_1.enableJSDOM)();
20
- const frontend_application_config_provider_1 = require("@theia/core/lib/browser/frontend-application-config-provider");
21
- frontend_application_config_provider_1.FrontendApplicationConfigProvider.set({});
22
- const uri_1 = require("@theia/core/lib/common/uri");
23
- const chai_1 = require("chai");
24
- const inversify_1 = require("@theia/core/shared/inversify");
25
- const vscode_languageserver_protocol_1 = require("@theia/core/shared/vscode-languageserver-protocol");
26
- const event_1 = require("@theia/core/lib/common/event");
27
- const marker_manager_1 = require("../marker-manager");
28
- const marker_tree_1 = require("../marker-tree");
29
- const problem_container_1 = require("./problem-container");
30
- const problem_manager_1 = require("./problem-manager");
31
- const problem_tree_model_1 = require("./problem-tree-model");
32
- const file_service_1 = require("@theia/filesystem/lib/browser/file-service");
33
- const problem_composite_tree_node_1 = require("./problem-composite-tree-node");
34
- disableJSDOM();
35
- let rootNode;
36
- before(() => {
37
- disableJSDOM = (0, jsdom_1.enableJSDOM)();
38
- const testContainer = new inversify_1.Container();
39
- testContainer.bind(marker_manager_1.MarkerManager).toSelf().inSingletonScope();
40
- testContainer.bind(problem_manager_1.ProblemManager).toSelf();
41
- testContainer.bind(marker_tree_1.MarkerOptions).toConstantValue(problem_container_1.PROBLEM_OPTIONS);
42
- testContainer.bind(file_service_1.FileService).toConstantValue({
43
- onDidFilesChange: event_1.Event.None
44
- });
45
- testContainer.bind(problem_tree_model_1.ProblemTree).toSelf().inSingletonScope();
46
- });
47
- beforeEach(() => {
48
- rootNode = getRootNode('theia-problem-marker-widget');
49
- });
50
- after(() => {
51
- disableJSDOM();
52
- });
53
- describe('problem-composite-tree-node', () => {
54
- describe('#sortMarkersInfo', () => {
55
- describe('should sort markersInfo based on the highest severity', () => {
56
- function testSeveritySorting(high, low) {
57
- const highMarker = createMockMarker({ start: { line: 0, character: 10 }, end: { line: 0, character: 10 } }, high);
58
- const lowMarker = createMockMarker({ start: { line: 0, character: 10 }, end: { line: 0, character: 10 } }, low);
59
- const highNode = createMockMarkerNode(highMarker);
60
- const lowNode = createMockMarkerNode(lowMarker);
61
- const highMarkerNode = createMarkerInfo('1', new uri_1.default('a'), [highNode]);
62
- const lowMarkerNode = createMarkerInfo('2', new uri_1.default('b'), [lowNode]);
63
- const highFirstRoot = getRootNode('highFirstRoot');
64
- problem_composite_tree_node_1.ProblemCompositeTreeNode.addChildren(highFirstRoot, [
65
- { node: highMarkerNode, markers: [highMarker] },
66
- { node: lowMarkerNode, markers: [lowMarker] },
67
- ]);
68
- expectCorrectOrdering(highFirstRoot);
69
- const lowFirstRoot = getRootNode('lowFirstRoot');
70
- problem_composite_tree_node_1.ProblemCompositeTreeNode.addChildren(lowFirstRoot, [
71
- { node: lowMarkerNode, markers: [lowMarker] },
72
- { node: highMarkerNode, markers: [highMarker] },
73
- ]);
74
- expectCorrectOrdering(lowFirstRoot);
75
- function expectCorrectOrdering(root) {
76
- (0, chai_1.expect)(root.children.length).to.equal(2);
77
- (0, chai_1.expect)(root.children[0]).to.equal(highMarkerNode);
78
- (0, chai_1.expect)(highMarkerNode.nextSibling).to.equal(lowMarkerNode);
79
- (0, chai_1.expect)(root.children[1]).to.equal(lowMarkerNode);
80
- (0, chai_1.expect)(lowMarkerNode.previousSibling).to.equal(highMarkerNode);
81
- }
82
- }
83
- it('should sort error higher than warnings', () => {
84
- testSeveritySorting(vscode_languageserver_protocol_1.DiagnosticSeverity.Error, vscode_languageserver_protocol_1.DiagnosticSeverity.Warning);
85
- });
86
- it('should sort errors higher than infos', () => {
87
- testSeveritySorting(vscode_languageserver_protocol_1.DiagnosticSeverity.Error, vscode_languageserver_protocol_1.DiagnosticSeverity.Information);
88
- });
89
- it('should sort errors higher than hints', () => {
90
- testSeveritySorting(vscode_languageserver_protocol_1.DiagnosticSeverity.Error, vscode_languageserver_protocol_1.DiagnosticSeverity.Hint);
91
- });
92
- it('should sort warnings higher than infos', () => {
93
- testSeveritySorting(vscode_languageserver_protocol_1.DiagnosticSeverity.Warning, vscode_languageserver_protocol_1.DiagnosticSeverity.Information);
94
- });
95
- it('should sort warnings higher than hints', () => {
96
- testSeveritySorting(vscode_languageserver_protocol_1.DiagnosticSeverity.Warning, vscode_languageserver_protocol_1.DiagnosticSeverity.Hint);
97
- });
98
- it('should sort infos higher than hints', () => {
99
- testSeveritySorting(vscode_languageserver_protocol_1.DiagnosticSeverity.Information, vscode_languageserver_protocol_1.DiagnosticSeverity.Hint);
100
- });
101
- });
102
- it('should sort markersInfo based on URI if severities are equal', () => {
103
- const markerA = createMockMarker({ start: { line: 0, character: 10 }, end: { line: 0, character: 10 } }, vscode_languageserver_protocol_1.DiagnosticSeverity.Error);
104
- const markerB = createMockMarker({ start: { line: 0, character: 10 }, end: { line: 0, character: 10 } }, vscode_languageserver_protocol_1.DiagnosticSeverity.Error);
105
- const nodeA = createMockMarkerNode(markerA);
106
- const nodeB = createMockMarkerNode(markerB);
107
- const markerInfoNodeA = createMarkerInfo('1', new uri_1.default('a'), [nodeA]);
108
- const markerInfoNodeB = createMarkerInfo('2', new uri_1.default('b'), [nodeB]);
109
- problem_composite_tree_node_1.ProblemCompositeTreeNode.addChildren(rootNode, [
110
- { node: markerInfoNodeA, markers: [markerA] },
111
- { node: markerInfoNodeB, markers: [markerB] },
112
- ]);
113
- (0, chai_1.expect)(rootNode.children.length).to.equal(2);
114
- (0, chai_1.expect)(rootNode.children[0]).to.equal(markerInfoNodeA);
115
- (0, chai_1.expect)(markerInfoNodeA.nextSibling).to.equal(markerInfoNodeB);
116
- (0, chai_1.expect)(rootNode.children[1]).to.equal(markerInfoNodeB);
117
- (0, chai_1.expect)(markerInfoNodeB.previousSibling).to.equal(markerInfoNodeA);
118
- });
119
- it('changing marker content should lead to update in ProblemCompositeTree', () => {
120
- const markerA = createMockMarker({ start: { line: 0, character: 10 }, end: { line: 0, character: 10 } }, vscode_languageserver_protocol_1.DiagnosticSeverity.Error);
121
- const nodeA = createMockMarkerNode(markerA);
122
- const markerInfoNodeA = createMarkerInfo('1', new uri_1.default('a'), [nodeA]);
123
- problem_composite_tree_node_1.ProblemCompositeTreeNode.addChildren(rootNode, [
124
- { node: markerInfoNodeA, markers: [markerA] }
125
- ]);
126
- markerA.data.severity = vscode_languageserver_protocol_1.DiagnosticSeverity.Hint;
127
- problem_composite_tree_node_1.ProblemCompositeTreeNode.addChildren(rootNode, [
128
- { node: markerInfoNodeA, markers: [markerA] }
129
- ]);
130
- (0, chai_1.expect)(rootNode.children.length).to.equal(1);
131
- (0, chai_1.expect)(rootNode.children[0]).to.equal(markerInfoNodeA);
132
- });
133
- it('changing marker content from error to hint should lead to lower rank', () => {
134
- const markerA = createMockMarker({ start: { line: 0, character: 10 }, end: { line: 0, character: 10 } }, vscode_languageserver_protocol_1.DiagnosticSeverity.Error);
135
- const nodeA = createMockMarkerNode(markerA);
136
- const markerInfoNodeA = createMarkerInfo('1', new uri_1.default('a'), [nodeA]);
137
- problem_composite_tree_node_1.ProblemCompositeTreeNode.addChildren(rootNode, [
138
- { node: markerInfoNodeA, markers: [markerA] }
139
- ]);
140
- const markerB = createMockMarker({ start: { line: 0, character: 10 }, end: { line: 0, character: 10 } }, vscode_languageserver_protocol_1.DiagnosticSeverity.Error);
141
- const nodeB = createMockMarkerNode(markerB);
142
- const markerInfoNodeB = createMarkerInfo('2', new uri_1.default('b'), [nodeB]);
143
- problem_composite_tree_node_1.ProblemCompositeTreeNode.addChildren(rootNode, [
144
- { node: markerInfoNodeB, markers: [markerB] }
145
- ]);
146
- markerA.data.severity = vscode_languageserver_protocol_1.DiagnosticSeverity.Hint;
147
- problem_composite_tree_node_1.ProblemCompositeTreeNode.addChildren(rootNode, [
148
- { node: markerInfoNodeA, markers: [markerA] }
149
- ]);
150
- (0, chai_1.expect)(rootNode.children.length).to.equal(2);
151
- (0, chai_1.expect)(rootNode.children[0]).to.equal(markerInfoNodeB);
152
- (0, chai_1.expect)(markerInfoNodeB.nextSibling).to.equal(markerInfoNodeA);
153
- (0, chai_1.expect)(rootNode.children[1]).to.equal(markerInfoNodeA);
154
- (0, chai_1.expect)(markerInfoNodeA.previousSibling).to.equal(markerInfoNodeB);
155
- });
156
- it('changing marker content from error to hint should lead to higher rank', () => {
157
- const markerA = createMockMarker({ start: { line: 0, character: 10 }, end: { line: 0, character: 10 } }, vscode_languageserver_protocol_1.DiagnosticSeverity.Hint);
158
- const nodeA = createMockMarkerNode(markerA);
159
- const markerInfoNodeA = createMarkerInfo('1', new uri_1.default('a'), [nodeA]);
160
- problem_composite_tree_node_1.ProblemCompositeTreeNode.addChildren(rootNode, [
161
- { node: markerInfoNodeA, markers: [markerA] }
162
- ]);
163
- const markerB = createMockMarker({ start: { line: 0, character: 10 }, end: { line: 0, character: 10 } }, vscode_languageserver_protocol_1.DiagnosticSeverity.Error);
164
- const nodeB = createMockMarkerNode(markerB);
165
- const markerInfoNodeB = createMarkerInfo('2', new uri_1.default('b'), [nodeB]);
166
- problem_composite_tree_node_1.ProblemCompositeTreeNode.addChildren(rootNode, [
167
- { node: markerInfoNodeB, markers: [markerB] }
168
- ]);
169
- markerA.data.severity = vscode_languageserver_protocol_1.DiagnosticSeverity.Error;
170
- problem_composite_tree_node_1.ProblemCompositeTreeNode.addChildren(rootNode, [
171
- { node: markerInfoNodeA, markers: [markerA] }
172
- ]);
173
- (0, chai_1.expect)(rootNode.children.length).to.equal(2);
174
- (0, chai_1.expect)(rootNode.children[0]).to.equal(markerInfoNodeA);
175
- (0, chai_1.expect)(markerInfoNodeA.nextSibling).to.equal(markerInfoNodeB);
176
- (0, chai_1.expect)(rootNode.children[1]).to.equal(markerInfoNodeB);
177
- (0, chai_1.expect)(markerInfoNodeB.previousSibling).to.equal(markerInfoNodeA);
178
- });
179
- });
180
- });
181
- function createMarkerInfo(id, uri, marker) {
182
- return {
183
- children: marker ? marker : [],
184
- expanded: true,
185
- uri,
186
- id,
187
- parent: rootNode,
188
- selected: false,
189
- numberOfMarkers: marker ? marker.length : 0
190
- };
191
- }
192
- /**
193
- * Create a mock marker node with the given diagnostic marker.
194
- * @param marker the diagnostic marker.
195
- *
196
- * @returns a mock marker node.
197
- */
198
- function createMockMarkerNode(marker) {
199
- return {
200
- id: 'id',
201
- name: 'marker',
202
- parent: undefined,
203
- selected: false,
204
- uri: new uri_1.default(''),
205
- marker
206
- };
207
- }
208
- /**
209
- * Create a mock diagnostic marker.
210
- * @param range the diagnostic range.
211
- * @param severity the diagnostic severity.
212
- * @param owner the optional owner of the diagnostic
213
- *
214
- * @returns a mock diagnostic marker.
215
- */
216
- function createMockMarker(range, severity, owner) {
217
- const data = {
218
- range: range,
219
- severity: severity,
220
- message: 'message'
221
- };
222
- return Object.freeze({
223
- uri: 'uri',
224
- kind: 'marker',
225
- owner: owner !== null && owner !== void 0 ? owner : 'owner',
226
- data
227
- });
228
- }
229
- function getRootNode(id) {
230
- return {
231
- visible: false,
232
- id: id,
233
- name: 'MarkerTree',
234
- kind: 'problem',
235
- children: [],
236
- parent: undefined
237
- };
238
- }
1
+ "use strict";
2
+ // *****************************************************************************
3
+ // Copyright (C) 2021 EclipseSource and others.
4
+ //
5
+ // This program and the accompanying materials are made available under the
6
+ // terms of the Eclipse Public License v. 2.0 which is available at
7
+ // http://www.eclipse.org/legal/epl-2.0.
8
+ //
9
+ // This Source Code may also be made available under the following Secondary
10
+ // Licenses when the conditions for such availability set forth in the Eclipse
11
+ // Public License v. 2.0 are satisfied: GNU General Public License, version 2
12
+ // with the GNU Classpath Exception which is available at
13
+ // https://www.gnu.org/software/classpath/license.html.
14
+ //
15
+ // SPDX-License-Identifier: EPL-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0
16
+ // *****************************************************************************
17
+ Object.defineProperty(exports, "__esModule", { value: true });
18
+ const jsdom_1 = require("@theia/core/lib/browser/test/jsdom");
19
+ let disableJSDOM = (0, jsdom_1.enableJSDOM)();
20
+ const frontend_application_config_provider_1 = require("@theia/core/lib/browser/frontend-application-config-provider");
21
+ frontend_application_config_provider_1.FrontendApplicationConfigProvider.set({});
22
+ const uri_1 = require("@theia/core/lib/common/uri");
23
+ const chai_1 = require("chai");
24
+ const inversify_1 = require("@theia/core/shared/inversify");
25
+ const vscode_languageserver_protocol_1 = require("@theia/core/shared/vscode-languageserver-protocol");
26
+ const event_1 = require("@theia/core/lib/common/event");
27
+ const marker_manager_1 = require("../marker-manager");
28
+ const marker_tree_1 = require("../marker-tree");
29
+ const problem_container_1 = require("./problem-container");
30
+ const problem_manager_1 = require("./problem-manager");
31
+ const problem_tree_model_1 = require("./problem-tree-model");
32
+ const file_service_1 = require("@theia/filesystem/lib/browser/file-service");
33
+ const problem_composite_tree_node_1 = require("./problem-composite-tree-node");
34
+ disableJSDOM();
35
+ let rootNode;
36
+ before(() => {
37
+ disableJSDOM = (0, jsdom_1.enableJSDOM)();
38
+ const testContainer = new inversify_1.Container();
39
+ testContainer.bind(marker_manager_1.MarkerManager).toSelf().inSingletonScope();
40
+ testContainer.bind(problem_manager_1.ProblemManager).toSelf();
41
+ testContainer.bind(marker_tree_1.MarkerOptions).toConstantValue(problem_container_1.PROBLEM_OPTIONS);
42
+ testContainer.bind(file_service_1.FileService).toConstantValue({
43
+ onDidFilesChange: event_1.Event.None
44
+ });
45
+ testContainer.bind(problem_tree_model_1.ProblemTree).toSelf().inSingletonScope();
46
+ });
47
+ beforeEach(() => {
48
+ rootNode = getRootNode('theia-problem-marker-widget');
49
+ });
50
+ after(() => {
51
+ disableJSDOM();
52
+ });
53
+ describe('problem-composite-tree-node', () => {
54
+ describe('#sortMarkersInfo', () => {
55
+ describe('should sort markersInfo based on the highest severity', () => {
56
+ function testSeveritySorting(high, low) {
57
+ const highMarker = createMockMarker({ start: { line: 0, character: 10 }, end: { line: 0, character: 10 } }, high);
58
+ const lowMarker = createMockMarker({ start: { line: 0, character: 10 }, end: { line: 0, character: 10 } }, low);
59
+ const highNode = createMockMarkerNode(highMarker);
60
+ const lowNode = createMockMarkerNode(lowMarker);
61
+ const highMarkerNode = createMarkerInfo('1', new uri_1.default('a'), [highNode]);
62
+ const lowMarkerNode = createMarkerInfo('2', new uri_1.default('b'), [lowNode]);
63
+ const highFirstRoot = getRootNode('highFirstRoot');
64
+ problem_composite_tree_node_1.ProblemCompositeTreeNode.addChildren(highFirstRoot, [
65
+ { node: highMarkerNode, markers: [highMarker] },
66
+ { node: lowMarkerNode, markers: [lowMarker] },
67
+ ]);
68
+ expectCorrectOrdering(highFirstRoot);
69
+ const lowFirstRoot = getRootNode('lowFirstRoot');
70
+ problem_composite_tree_node_1.ProblemCompositeTreeNode.addChildren(lowFirstRoot, [
71
+ { node: lowMarkerNode, markers: [lowMarker] },
72
+ { node: highMarkerNode, markers: [highMarker] },
73
+ ]);
74
+ expectCorrectOrdering(lowFirstRoot);
75
+ function expectCorrectOrdering(root) {
76
+ (0, chai_1.expect)(root.children.length).to.equal(2);
77
+ (0, chai_1.expect)(root.children[0]).to.equal(highMarkerNode);
78
+ (0, chai_1.expect)(highMarkerNode.nextSibling).to.equal(lowMarkerNode);
79
+ (0, chai_1.expect)(root.children[1]).to.equal(lowMarkerNode);
80
+ (0, chai_1.expect)(lowMarkerNode.previousSibling).to.equal(highMarkerNode);
81
+ }
82
+ }
83
+ it('should sort error higher than warnings', () => {
84
+ testSeveritySorting(vscode_languageserver_protocol_1.DiagnosticSeverity.Error, vscode_languageserver_protocol_1.DiagnosticSeverity.Warning);
85
+ });
86
+ it('should sort errors higher than infos', () => {
87
+ testSeveritySorting(vscode_languageserver_protocol_1.DiagnosticSeverity.Error, vscode_languageserver_protocol_1.DiagnosticSeverity.Information);
88
+ });
89
+ it('should sort errors higher than hints', () => {
90
+ testSeveritySorting(vscode_languageserver_protocol_1.DiagnosticSeverity.Error, vscode_languageserver_protocol_1.DiagnosticSeverity.Hint);
91
+ });
92
+ it('should sort warnings higher than infos', () => {
93
+ testSeveritySorting(vscode_languageserver_protocol_1.DiagnosticSeverity.Warning, vscode_languageserver_protocol_1.DiagnosticSeverity.Information);
94
+ });
95
+ it('should sort warnings higher than hints', () => {
96
+ testSeveritySorting(vscode_languageserver_protocol_1.DiagnosticSeverity.Warning, vscode_languageserver_protocol_1.DiagnosticSeverity.Hint);
97
+ });
98
+ it('should sort infos higher than hints', () => {
99
+ testSeveritySorting(vscode_languageserver_protocol_1.DiagnosticSeverity.Information, vscode_languageserver_protocol_1.DiagnosticSeverity.Hint);
100
+ });
101
+ });
102
+ it('should sort markersInfo based on URI if severities are equal', () => {
103
+ const markerA = createMockMarker({ start: { line: 0, character: 10 }, end: { line: 0, character: 10 } }, vscode_languageserver_protocol_1.DiagnosticSeverity.Error);
104
+ const markerB = createMockMarker({ start: { line: 0, character: 10 }, end: { line: 0, character: 10 } }, vscode_languageserver_protocol_1.DiagnosticSeverity.Error);
105
+ const nodeA = createMockMarkerNode(markerA);
106
+ const nodeB = createMockMarkerNode(markerB);
107
+ const markerInfoNodeA = createMarkerInfo('1', new uri_1.default('a'), [nodeA]);
108
+ const markerInfoNodeB = createMarkerInfo('2', new uri_1.default('b'), [nodeB]);
109
+ problem_composite_tree_node_1.ProblemCompositeTreeNode.addChildren(rootNode, [
110
+ { node: markerInfoNodeA, markers: [markerA] },
111
+ { node: markerInfoNodeB, markers: [markerB] },
112
+ ]);
113
+ (0, chai_1.expect)(rootNode.children.length).to.equal(2);
114
+ (0, chai_1.expect)(rootNode.children[0]).to.equal(markerInfoNodeA);
115
+ (0, chai_1.expect)(markerInfoNodeA.nextSibling).to.equal(markerInfoNodeB);
116
+ (0, chai_1.expect)(rootNode.children[1]).to.equal(markerInfoNodeB);
117
+ (0, chai_1.expect)(markerInfoNodeB.previousSibling).to.equal(markerInfoNodeA);
118
+ });
119
+ it('changing marker content should lead to update in ProblemCompositeTree', () => {
120
+ const markerA = createMockMarker({ start: { line: 0, character: 10 }, end: { line: 0, character: 10 } }, vscode_languageserver_protocol_1.DiagnosticSeverity.Error);
121
+ const nodeA = createMockMarkerNode(markerA);
122
+ const markerInfoNodeA = createMarkerInfo('1', new uri_1.default('a'), [nodeA]);
123
+ problem_composite_tree_node_1.ProblemCompositeTreeNode.addChildren(rootNode, [
124
+ { node: markerInfoNodeA, markers: [markerA] }
125
+ ]);
126
+ markerA.data.severity = vscode_languageserver_protocol_1.DiagnosticSeverity.Hint;
127
+ problem_composite_tree_node_1.ProblemCompositeTreeNode.addChildren(rootNode, [
128
+ { node: markerInfoNodeA, markers: [markerA] }
129
+ ]);
130
+ (0, chai_1.expect)(rootNode.children.length).to.equal(1);
131
+ (0, chai_1.expect)(rootNode.children[0]).to.equal(markerInfoNodeA);
132
+ });
133
+ it('changing marker content from error to hint should lead to lower rank', () => {
134
+ const markerA = createMockMarker({ start: { line: 0, character: 10 }, end: { line: 0, character: 10 } }, vscode_languageserver_protocol_1.DiagnosticSeverity.Error);
135
+ const nodeA = createMockMarkerNode(markerA);
136
+ const markerInfoNodeA = createMarkerInfo('1', new uri_1.default('a'), [nodeA]);
137
+ problem_composite_tree_node_1.ProblemCompositeTreeNode.addChildren(rootNode, [
138
+ { node: markerInfoNodeA, markers: [markerA] }
139
+ ]);
140
+ const markerB = createMockMarker({ start: { line: 0, character: 10 }, end: { line: 0, character: 10 } }, vscode_languageserver_protocol_1.DiagnosticSeverity.Error);
141
+ const nodeB = createMockMarkerNode(markerB);
142
+ const markerInfoNodeB = createMarkerInfo('2', new uri_1.default('b'), [nodeB]);
143
+ problem_composite_tree_node_1.ProblemCompositeTreeNode.addChildren(rootNode, [
144
+ { node: markerInfoNodeB, markers: [markerB] }
145
+ ]);
146
+ markerA.data.severity = vscode_languageserver_protocol_1.DiagnosticSeverity.Hint;
147
+ problem_composite_tree_node_1.ProblemCompositeTreeNode.addChildren(rootNode, [
148
+ { node: markerInfoNodeA, markers: [markerA] }
149
+ ]);
150
+ (0, chai_1.expect)(rootNode.children.length).to.equal(2);
151
+ (0, chai_1.expect)(rootNode.children[0]).to.equal(markerInfoNodeB);
152
+ (0, chai_1.expect)(markerInfoNodeB.nextSibling).to.equal(markerInfoNodeA);
153
+ (0, chai_1.expect)(rootNode.children[1]).to.equal(markerInfoNodeA);
154
+ (0, chai_1.expect)(markerInfoNodeA.previousSibling).to.equal(markerInfoNodeB);
155
+ });
156
+ it('changing marker content from error to hint should lead to higher rank', () => {
157
+ const markerA = createMockMarker({ start: { line: 0, character: 10 }, end: { line: 0, character: 10 } }, vscode_languageserver_protocol_1.DiagnosticSeverity.Hint);
158
+ const nodeA = createMockMarkerNode(markerA);
159
+ const markerInfoNodeA = createMarkerInfo('1', new uri_1.default('a'), [nodeA]);
160
+ problem_composite_tree_node_1.ProblemCompositeTreeNode.addChildren(rootNode, [
161
+ { node: markerInfoNodeA, markers: [markerA] }
162
+ ]);
163
+ const markerB = createMockMarker({ start: { line: 0, character: 10 }, end: { line: 0, character: 10 } }, vscode_languageserver_protocol_1.DiagnosticSeverity.Error);
164
+ const nodeB = createMockMarkerNode(markerB);
165
+ const markerInfoNodeB = createMarkerInfo('2', new uri_1.default('b'), [nodeB]);
166
+ problem_composite_tree_node_1.ProblemCompositeTreeNode.addChildren(rootNode, [
167
+ { node: markerInfoNodeB, markers: [markerB] }
168
+ ]);
169
+ markerA.data.severity = vscode_languageserver_protocol_1.DiagnosticSeverity.Error;
170
+ problem_composite_tree_node_1.ProblemCompositeTreeNode.addChildren(rootNode, [
171
+ { node: markerInfoNodeA, markers: [markerA] }
172
+ ]);
173
+ (0, chai_1.expect)(rootNode.children.length).to.equal(2);
174
+ (0, chai_1.expect)(rootNode.children[0]).to.equal(markerInfoNodeA);
175
+ (0, chai_1.expect)(markerInfoNodeA.nextSibling).to.equal(markerInfoNodeB);
176
+ (0, chai_1.expect)(rootNode.children[1]).to.equal(markerInfoNodeB);
177
+ (0, chai_1.expect)(markerInfoNodeB.previousSibling).to.equal(markerInfoNodeA);
178
+ });
179
+ });
180
+ });
181
+ function createMarkerInfo(id, uri, marker) {
182
+ return {
183
+ children: marker ? marker : [],
184
+ expanded: true,
185
+ uri,
186
+ id,
187
+ parent: rootNode,
188
+ selected: false,
189
+ numberOfMarkers: marker ? marker.length : 0
190
+ };
191
+ }
192
+ /**
193
+ * Create a mock marker node with the given diagnostic marker.
194
+ * @param marker the diagnostic marker.
195
+ *
196
+ * @returns a mock marker node.
197
+ */
198
+ function createMockMarkerNode(marker) {
199
+ return {
200
+ id: 'id',
201
+ name: 'marker',
202
+ parent: undefined,
203
+ selected: false,
204
+ uri: new uri_1.default(''),
205
+ marker
206
+ };
207
+ }
208
+ /**
209
+ * Create a mock diagnostic marker.
210
+ * @param range the diagnostic range.
211
+ * @param severity the diagnostic severity.
212
+ * @param owner the optional owner of the diagnostic
213
+ *
214
+ * @returns a mock diagnostic marker.
215
+ */
216
+ function createMockMarker(range, severity, owner) {
217
+ const data = {
218
+ range: range,
219
+ severity: severity,
220
+ message: 'message'
221
+ };
222
+ return Object.freeze({
223
+ uri: 'uri',
224
+ kind: 'marker',
225
+ owner: owner !== null && owner !== void 0 ? owner : 'owner',
226
+ data
227
+ });
228
+ }
229
+ function getRootNode(id) {
230
+ return {
231
+ visible: false,
232
+ id: id,
233
+ name: 'MarkerTree',
234
+ kind: 'problem',
235
+ children: [],
236
+ parent: undefined
237
+ };
238
+ }
239
239
  //# sourceMappingURL=problem-composite-tree-node.spec.js.map