@theia/markers 1.18.0 → 1.19.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/marker-tree.d.ts +3 -0
- package/lib/browser/marker-tree.d.ts.map +1 -1
- package/lib/browser/marker-tree.js +3 -0
- package/lib/browser/marker-tree.js.map +1 -1
- package/lib/browser/problem/problem-composite-tree-node.d.ts +24 -0
- package/lib/browser/problem/problem-composite-tree-node.d.ts.map +1 -0
- package/lib/browser/problem/problem-composite-tree-node.js +69 -0
- package/lib/browser/problem/problem-composite-tree-node.js.map +1 -0
- package/lib/browser/problem/problem-composite-tree-node.spec.d.ts +17 -0
- package/lib/browser/problem/problem-composite-tree-node.spec.d.ts.map +1 -0
- package/lib/browser/problem/problem-composite-tree-node.spec.js +215 -0
- package/lib/browser/problem/problem-composite-tree-node.spec.js.map +1 -0
- package/lib/browser/problem/problem-contribution.d.ts.map +1 -1
- package/lib/browser/problem/problem-contribution.js +15 -12
- package/lib/browser/problem/problem-contribution.js.map +1 -1
- package/lib/browser/problem/problem-decorator.d.ts.map +1 -1
- package/lib/browser/problem/problem-decorator.js +1 -1
- package/lib/browser/problem/problem-decorator.js.map +1 -1
- package/lib/browser/problem/problem-preferences.d.ts.map +1 -1
- package/lib/browser/problem/problem-preferences.js +4 -3
- package/lib/browser/problem/problem-preferences.js.map +1 -1
- package/lib/browser/problem/problem-tree-model.d.ts +1 -0
- package/lib/browser/problem/problem-tree-model.d.ts.map +1 -1
- package/lib/browser/problem/problem-tree-model.js +8 -1
- package/lib/browser/problem/problem-tree-model.js.map +1 -1
- package/lib/browser/problem/problem-utils.d.ts +10 -2
- package/lib/browser/problem/problem-utils.d.ts.map +1 -1
- package/lib/browser/problem/problem-utils.js +9 -1
- package/lib/browser/problem/problem-utils.js.map +1 -1
- package/lib/browser/problem/problem-widget.d.ts.map +1 -1
- package/lib/browser/problem/problem-widget.js +3 -2
- package/lib/browser/problem/problem-widget.js.map +1 -1
- package/package.json +7 -7
- package/src/browser/marker-tree.ts +6 -0
- package/src/browser/problem/problem-composite-tree-node.spec.ts +252 -0
- package/src/browser/problem/problem-composite-tree-node.ts +68 -0
- package/src/browser/problem/problem-contribution.ts +14 -12
- package/src/browser/problem/problem-decorator.ts +1 -1
- package/src/browser/problem/problem-preferences.ts +4 -3
- package/src/browser/problem/problem-tree-model.ts +9 -1
- package/src/browser/problem/problem-utils.ts +13 -3
- package/src/browser/problem/problem-widget.tsx +3 -2
|
@@ -19,6 +19,7 @@ import { Marker } from '../common/marker';
|
|
|
19
19
|
import { UriSelection } from '@theia/core/lib/common/selection';
|
|
20
20
|
import URI from '@theia/core/lib/common/uri';
|
|
21
21
|
import { ProblemSelection } from './problem/problem-selection';
|
|
22
|
+
import { DiagnosticSeverity } from '@theia/core/shared/vscode-languageserver-types';
|
|
22
23
|
export declare const MarkerOptions: unique symbol;
|
|
23
24
|
export interface MarkerOptions {
|
|
24
25
|
readonly kind: string;
|
|
@@ -28,6 +29,7 @@ export declare abstract class MarkerTree<T extends object> extends TreeImpl {
|
|
|
28
29
|
protected readonly markerOptions: MarkerOptions;
|
|
29
30
|
constructor(markerManager: MarkerManager<T>, markerOptions: MarkerOptions);
|
|
30
31
|
protected refreshMarkerInfo(uri: URI): Promise<void>;
|
|
32
|
+
protected insertNodeWithMarkers(node: MarkerInfoNode, markers: Marker<T>[]): void;
|
|
31
33
|
protected resolveChildren(parent: CompositeTreeNode): Promise<TreeNode[]>;
|
|
32
34
|
protected createMarkerInfo(id: string, uri: URI): MarkerInfoNode;
|
|
33
35
|
protected getMarkerNodes(parent: MarkerInfoNode, markers: Marker<T>[]): MarkerNode[];
|
|
@@ -42,6 +44,7 @@ export declare namespace MarkerNode {
|
|
|
42
44
|
export interface MarkerInfoNode extends UriSelection, SelectableTreeNode, ExpandableTreeNode {
|
|
43
45
|
parent: MarkerRootNode;
|
|
44
46
|
numberOfMarkers: number;
|
|
47
|
+
severity?: DiagnosticSeverity;
|
|
45
48
|
}
|
|
46
49
|
export declare namespace MarkerInfoNode {
|
|
47
50
|
function is(node: Object | undefined): node is MarkerInfoNode;
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"marker-tree.d.ts","sourceRoot":"","sources":["../../src/browser/marker-tree.ts"],"names":[],"mappings":"AAAA;;;;;;;;;;;;;;kFAckF;AAGlF,OAAO,EAAE,QAAQ,EAAE,iBAAiB,EAAE,QAAQ,EAAE,kBAAkB,EAAE,kBAAkB,EAAE,MAAM,yBAAyB,CAAC;AACxH,OAAO,EAAE,aAAa,EAAE,MAAM,kBAAkB,CAAC;AACjD,OAAO,EAAE,MAAM,EAAE,MAAM,kBAAkB,CAAC;AAC1C,OAAO,EAAE,YAAY,EAAE,MAAM,kCAAkC,CAAC;AAChE,OAAO,GAAG,MAAM,4BAA4B,CAAC;AAC7C,OAAO,EAAE,gBAAgB,EAAE,MAAM,6BAA6B,CAAC;
|
|
1
|
+
{"version":3,"file":"marker-tree.d.ts","sourceRoot":"","sources":["../../src/browser/marker-tree.ts"],"names":[],"mappings":"AAAA;;;;;;;;;;;;;;kFAckF;AAGlF,OAAO,EAAE,QAAQ,EAAE,iBAAiB,EAAE,QAAQ,EAAE,kBAAkB,EAAE,kBAAkB,EAAE,MAAM,yBAAyB,CAAC;AACxH,OAAO,EAAE,aAAa,EAAE,MAAM,kBAAkB,CAAC;AACjD,OAAO,EAAE,MAAM,EAAE,MAAM,kBAAkB,CAAC;AAC1C,OAAO,EAAE,YAAY,EAAE,MAAM,kCAAkC,CAAC;AAChE,OAAO,GAAG,MAAM,4BAA4B,CAAC;AAC7C,OAAO,EAAE,gBAAgB,EAAE,MAAM,6BAA6B,CAAC;AAC/D,OAAO,EAAE,kBAAkB,EAAE,MAAM,gDAAgD,CAAC;AAEpF,eAAO,MAAM,aAAa,eAA0B,CAAC;AACrD,MAAM,WAAW,aAAa;IAC1B,QAAQ,CAAC,IAAI,EAAE,MAAM,CAAC;CACzB;AAED,8BACsB,UAAU,CAAC,CAAC,SAAS,MAAM,CAAE,SAAQ,QAAQ;IAG3D,SAAS,CAAC,QAAQ,CAAC,aAAa,EAAE,aAAa,CAAC,CAAC,CAAC;IAClD,SAAS,CAAC,QAAQ,CAAC,aAAa,EAAE,aAAa;gBAD5B,aAAa,EAAE,aAAa,CAAC,CAAC,CAAC,EAC/B,aAAa,EAAE,aAAa;cAgBnC,iBAAiB,CAAC,GAAG,EAAE,GAAG,GAAG,OAAO,CAAC,IAAI,CAAC;IAgB1D,SAAS,CAAC,qBAAqB,CAAC,IAAI,EAAE,cAAc,EAAE,OAAO,EAAE,MAAM,CAAC,CAAC,CAAC,EAAE,GAAG,IAAI;cAOjE,eAAe,CAAC,MAAM,EAAE,iBAAiB,GAAG,OAAO,CAAC,QAAQ,EAAE,CAAC;IAiB/E,SAAS,CAAC,gBAAgB,CAAC,EAAE,EAAE,MAAM,EAAE,GAAG,EAAE,GAAG,GAAG,cAAc;IAYhE,SAAS,CAAC,cAAc,CAAC,MAAM,EAAE,cAAc,EAAE,OAAO,EAAE,MAAM,CAAC,CAAC,CAAC,EAAE,GAAG,UAAU,EAAE;IAKpF,SAAS,CAAC,gBAAgB,CAAC,MAAM,EAAE,MAAM,CAAC,CAAC,CAAC,EAAE,KAAK,EAAE,MAAM,EAAE,MAAM,EAAE,cAAc,GAAG,UAAU;CAgBnG;AAED,MAAM,WAAW,UAAW,SAAQ,YAAY,EAAE,kBAAkB,EAAE,gBAAgB;IAClF,MAAM,EAAE,MAAM,CAAC,MAAM,CAAC,CAAC;CAC1B;AACD,yBAAiB,UAAU,CAAC;IACxB,SAAgB,EAAE,CAAC,IAAI,EAAE,QAAQ,GAAG,SAAS,GAAG,IAAI,IAAI,UAAU,CAEjE;CACJ;AAED,MAAM,WAAW,cAAe,SAAQ,YAAY,EAAE,kBAAkB,EAAE,kBAAkB;IACxF,MAAM,EAAE,cAAc,CAAC;IACvB,eAAe,EAAE,MAAM,CAAC;IACxB,QAAQ,CAAC,EAAE,kBAAkB,CAAC;CACjC;AACD,yBAAiB,cAAc,CAAC;IAC5B,SAAgB,EAAE,CAAC,IAAI,EAAE,MAAM,GAAG,SAAS,GAAG,IAAI,IAAI,cAAc,CAEnE;CACJ;AAED,MAAM,WAAW,cAAe,SAAQ,iBAAiB;IACrD,IAAI,EAAE,MAAM,CAAC;CAChB;AACD,yBAAiB,cAAc,CAAC;IAC5B,SAAgB,EAAE,CAAC,IAAI,EAAE,QAAQ,GAAG,SAAS,GAAG,IAAI,IAAI,cAAc,CAErE;CACJ"}
|
|
@@ -60,6 +60,9 @@ let MarkerTree = class MarkerTree extends browser_1.TreeImpl {
|
|
|
60
60
|
return;
|
|
61
61
|
}
|
|
62
62
|
const node = MarkerInfoNode.is(existing) ? existing : this.createMarkerInfo(id, uri);
|
|
63
|
+
this.insertNodeWithMarkers(node, markers);
|
|
64
|
+
}
|
|
65
|
+
insertNodeWithMarkers(node, markers) {
|
|
63
66
|
browser_1.CompositeTreeNode.addChild(node.parent, node);
|
|
64
67
|
const children = this.getMarkerNodes(node, markers);
|
|
65
68
|
node.numberOfMarkers = markers.length;
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"marker-tree.js","sourceRoot":"","sources":["../../src/browser/marker-tree.ts"],"names":[],"mappings":";AAAA;;;;;;;;;;;;;;kFAckF;;;;;;;;;;;;AAElF,4DAA0D;AAC1D,qDAAwH;AACxH,qDAAiD;AAEjD,gEAAgE;AAChE,oDAA6C;AAC7C,mEAA+D;
|
|
1
|
+
{"version":3,"file":"marker-tree.js","sourceRoot":"","sources":["../../src/browser/marker-tree.ts"],"names":[],"mappings":"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"}
|
|
@@ -0,0 +1,24 @@
|
|
|
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 WITH Classpath-exception-2.0
|
|
15
|
+
********************************************************************************/
|
|
16
|
+
import { CompositeTreeNode } from '@theia/core/lib/browser/tree/tree';
|
|
17
|
+
import { MarkerInfoNode } from '../marker-tree';
|
|
18
|
+
import { Marker } from '../../common/marker';
|
|
19
|
+
import { Diagnostic } from '@theia/core/shared/vscode-languageserver-types';
|
|
20
|
+
export declare namespace ProblemCompositeTreeNode {
|
|
21
|
+
function setSeverity(parent: MarkerInfoNode, markers: Marker<Diagnostic>[]): void;
|
|
22
|
+
function addChild(parent: CompositeTreeNode, child: MarkerInfoNode, markers: Marker<Diagnostic>[]): CompositeTreeNode;
|
|
23
|
+
}
|
|
24
|
+
//# sourceMappingURL=problem-composite-tree-node.d.ts.map
|
|
@@ -0,0 +1 @@
|
|
|
1
|
+
{"version":3,"file":"problem-composite-tree-node.d.ts","sourceRoot":"","sources":["../../../src/browser/problem/problem-composite-tree-node.ts"],"names":[],"mappings":"AAAA;;;;;;;;;;;;;;kFAckF;AAElF,OAAO,EAAE,iBAAiB,EAAE,MAAM,mCAAmC,CAAC;AACtE,OAAO,EAAE,cAAc,EAAE,MAAM,gBAAgB,CAAC;AAEhD,OAAO,EAAE,MAAM,EAAE,MAAM,qBAAqB,CAAC;AAC7C,OAAO,EAAE,UAAU,EAAsB,MAAM,gDAAgD,CAAC;AAGhG,yBAAiB,wBAAwB,CAAC;IAEtC,SAAgB,WAAW,CAAC,MAAM,EAAE,cAAc,EAAE,OAAO,EAAE,MAAM,CAAC,UAAU,CAAC,EAAE,GAAG,IAAI,CAQvF;IAED,SAAgB,QAAQ,CAAC,MAAM,EAAE,iBAAiB,EAAE,KAAK,EAAE,cAAc,EAAE,OAAO,EAAE,MAAM,CAAC,UAAU,CAAC,EAAE,GAAG,iBAAiB,CA2B3H;CAKJ"}
|
|
@@ -0,0 +1,69 @@
|
|
|
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 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 addChild(parent, child, markers) {
|
|
35
|
+
ProblemCompositeTreeNode.setSeverity(child, markers);
|
|
36
|
+
const children = parent.children;
|
|
37
|
+
const index = children.findIndex(value => value.id === child.id);
|
|
38
|
+
if (index !== -1) {
|
|
39
|
+
tree_1.CompositeTreeNode.removeChild(parent, child);
|
|
40
|
+
}
|
|
41
|
+
if (children.length === 0) {
|
|
42
|
+
children.push(child);
|
|
43
|
+
tree_1.CompositeTreeNode.setParent(child, 0, parent);
|
|
44
|
+
}
|
|
45
|
+
else {
|
|
46
|
+
let inserted = false;
|
|
47
|
+
for (let i = 0; i < children.length; i++) {
|
|
48
|
+
// sort by severity, equal severity => sort by URI
|
|
49
|
+
if (problem_utils_1.ProblemUtils.severityCompare(child.severity, children[i].severity) < 0
|
|
50
|
+
|| (problem_utils_1.ProblemUtils.severityCompare(child.severity, children[i].severity) === 0 && compareURI(child.uri, children[i].uri) < 0)) {
|
|
51
|
+
children.splice(i, 0, child);
|
|
52
|
+
inserted = true;
|
|
53
|
+
tree_1.CompositeTreeNode.setParent(child, i, parent);
|
|
54
|
+
break;
|
|
55
|
+
}
|
|
56
|
+
;
|
|
57
|
+
}
|
|
58
|
+
if (inserted === false) {
|
|
59
|
+
children.push(child);
|
|
60
|
+
tree_1.CompositeTreeNode.setParent(child, children.length - 1, parent);
|
|
61
|
+
}
|
|
62
|
+
}
|
|
63
|
+
return parent;
|
|
64
|
+
}
|
|
65
|
+
ProblemCompositeTreeNode.addChild = addChild;
|
|
66
|
+
const compareURI = (uri1, uri2) => uri1.toString().localeCompare(uri2.toString(), undefined, { sensitivity: 'base' });
|
|
67
|
+
;
|
|
68
|
+
})(ProblemCompositeTreeNode = exports.ProblemCompositeTreeNode || (exports.ProblemCompositeTreeNode = {}));
|
|
69
|
+
//# sourceMappingURL=problem-composite-tree-node.js.map
|
|
@@ -0,0 +1 @@
|
|
|
1
|
+
{"version":3,"file":"problem-composite-tree-node.js","sourceRoot":"","sources":["../../../src/browser/problem/problem-composite-tree-node.ts"],"names":[],"mappings":";AAAA;;;;;;;;;;;;;;kFAckF;;;AAElF,4DAAsE;AAKtE,mDAA+C;AAE/C,IAAiB,wBAAwB,CA4CxC;AA5CD,WAAiB,wBAAwB;IAErC,SAAgB,WAAW,CAAC,MAAsB,EAAE,OAA6B;QAC7E,IAAI,WAA2C,CAAC;QAChD,OAAO,CAAC,OAAO,CAAC,MAAM,CAAC,EAAE;YACrB,IAAI,4BAAY,CAAC,eAAe,CAAC,MAAM,CAAC,IAAI,CAAC,QAAQ,EAAE,WAAW,CAAC,GAAG,CAAC,EAAE;gBACrE,WAAW,GAAG,MAAM,CAAC,IAAI,CAAC,QAAQ,CAAC;aACtC;QACL,CAAC,CAAC,CAAC;QACH,MAAM,CAAC,QAAQ,GAAG,WAAW,CAAC;IAClC,CAAC;IARe,oCAAW,cAQ1B,CAAA;IAAA,CAAC;IAEF,SAAgB,QAAQ,CAAC,MAAyB,EAAE,KAAqB,EAAE,OAA6B;QACpG,wBAAwB,CAAC,WAAW,CAAC,KAAK,EAAE,OAAO,CAAC,CAAC;QACrD,MAAM,QAAQ,GAAG,MAAM,CAAC,QAA4B,CAAC;QACrD,MAAM,KAAK,GAAG,QAAQ,CAAC,SAAS,CAAC,KAAK,CAAC,EAAE,CAAC,KAAK,CAAC,EAAE,KAAK,KAAK,CAAC,EAAE,CAAC,CAAC;QACjE,IAAI,KAAK,KAAK,CAAC,CAAC,EAAE;YACd,wBAAiB,CAAC,WAAW,CAAC,MAAM,EAAE,KAAK,CAAC,CAAC;SAChD;QAAC,IAAI,QAAQ,CAAC,MAAM,KAAK,CAAC,EAAE;YACzB,QAAQ,CAAC,IAAI,CAAC,KAAK,CAAC,CAAC;YACrB,wBAAiB,CAAC,SAAS,CAAC,KAAK,EAAE,CAAC,EAAE,MAAM,CAAC,CAAC;SACjD;aAAM;YACH,IAAI,QAAQ,GAAG,KAAK,CAAC;YACrB,KAAK,IAAI,CAAC,GAAG,CAAC,EAAE,CAAC,GAAG,QAAQ,CAAC,MAAM,EAAE,CAAC,EAAE,EAAE;gBACtC,kDAAkD;gBAClD,IAAI,4BAAY,CAAC,eAAe,CAAC,KAAK,CAAC,QAAQ,EAAE,QAAQ,CAAC,CAAC,CAAC,CAAC,QAAQ,CAAC,GAAG,CAAC;uBACnE,CAAC,4BAAY,CAAC,eAAe,CAAC,KAAK,CAAC,QAAQ,EAAE,QAAQ,CAAC,CAAC,CAAC,CAAC,QAAQ,CAAC,KAAK,CAAC,IAAI,UAAU,CAAC,KAAK,CAAC,GAAG,EAAE,QAAQ,CAAC,CAAC,CAAC,CAAC,GAAG,CAAC,GAAG,CAAC,CAAC,EAAE;oBAC7H,QAAQ,CAAC,MAAM,CAAC,CAAC,EAAE,CAAC,EAAE,KAAK,CAAC,CAAC;oBAC7B,QAAQ,GAAG,IAAI,CAAC;oBAChB,wBAAiB,CAAC,SAAS,CAAC,KAAK,EAAE,CAAC,EAAE,MAAM,CAAC,CAAC;oBAC9C,MAAM;iBACT;gBAAA,CAAC;aACL;YACD,IAAI,QAAQ,KAAK,KAAK,EAAE;gBACpB,QAAQ,CAAC,IAAI,CAAC,KAAK,CAAC,CAAC;gBACrB,wBAAiB,CAAC,SAAS,CAAC,KAAK,EAAE,QAAQ,CAAC,MAAM,GAAG,CAAC,EAAE,MAAM,CAAC,CAAC;aACnE;SACJ;QACD,OAAO,MAAM,CAAC;IAClB,CAAC;IA3Be,iCAAQ,WA2BvB,CAAA;IAED,MAAM,UAAU,GAAG,CAAC,IAAS,EAAE,IAAS,EAAU,EAAE,CAChD,IAAI,CAAC,QAAQ,EAAE,CAAC,aAAa,CAAC,IAAI,CAAC,QAAQ,EAAE,EAAE,SAAS,EAAE,EAAE,WAAW,EAAE,MAAM,EAAE,CAAC,CAAC;IACvF,CAAC;AACL,CAAC,EA5CgB,wBAAwB,GAAxB,gCAAwB,KAAxB,gCAAwB,QA4CxC"}
|
|
@@ -0,0 +1,17 @@
|
|
|
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 WITH Classpath-exception-2.0
|
|
15
|
+
********************************************************************************/
|
|
16
|
+
export {};
|
|
17
|
+
//# sourceMappingURL=problem-composite-tree-node.spec.d.ts.map
|
|
@@ -0,0 +1 @@
|
|
|
1
|
+
{"version":3,"file":"problem-composite-tree-node.spec.d.ts","sourceRoot":"","sources":["../../../src/browser/problem/problem-composite-tree-node.spec.ts"],"names":[],"mappings":"AAAA;;;;;;;;;;;;;;kFAckF"}
|
|
@@ -0,0 +1,215 @@
|
|
|
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 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 = jsdom_1.enableJSDOM();
|
|
20
|
+
const uri_1 = require("@theia/core/lib/common/uri");
|
|
21
|
+
const chai_1 = require("chai");
|
|
22
|
+
const inversify_1 = require("@theia/core/shared/inversify");
|
|
23
|
+
const vscode_languageserver_types_1 = require("@theia/core/shared/vscode-languageserver-types");
|
|
24
|
+
const event_1 = require("@theia/core/lib/common/event");
|
|
25
|
+
const marker_manager_1 = require("../marker-manager");
|
|
26
|
+
const marker_tree_1 = require("../marker-tree");
|
|
27
|
+
const problem_container_1 = require("./problem-container");
|
|
28
|
+
const problem_manager_1 = require("./problem-manager");
|
|
29
|
+
const problem_tree_model_1 = require("./problem-tree-model");
|
|
30
|
+
const file_service_1 = require("@theia/filesystem/lib/browser/file-service");
|
|
31
|
+
const problem_composite_tree_node_1 = require("./problem-composite-tree-node");
|
|
32
|
+
disableJSDOM();
|
|
33
|
+
let rootNode;
|
|
34
|
+
before(() => {
|
|
35
|
+
disableJSDOM = jsdom_1.enableJSDOM();
|
|
36
|
+
const testContainer = new inversify_1.Container();
|
|
37
|
+
testContainer.bind(marker_manager_1.MarkerManager).toSelf().inSingletonScope();
|
|
38
|
+
testContainer.bind(problem_manager_1.ProblemManager).toSelf();
|
|
39
|
+
testContainer.bind(marker_tree_1.MarkerOptions).toConstantValue(problem_container_1.PROBLEM_OPTIONS);
|
|
40
|
+
testContainer.bind(file_service_1.FileService).toConstantValue({
|
|
41
|
+
onDidFilesChange: event_1.Event.None
|
|
42
|
+
});
|
|
43
|
+
testContainer.bind(problem_tree_model_1.ProblemTree).toSelf().inSingletonScope();
|
|
44
|
+
});
|
|
45
|
+
beforeEach(() => {
|
|
46
|
+
rootNode = getRootNode('theia-problem-marker-widget');
|
|
47
|
+
});
|
|
48
|
+
after(() => {
|
|
49
|
+
disableJSDOM();
|
|
50
|
+
});
|
|
51
|
+
describe('problem-composite-tree-node', () => {
|
|
52
|
+
describe('#sortMarkersInfo', () => {
|
|
53
|
+
describe('should sort markersInfo based on the highest severity', () => {
|
|
54
|
+
function testSeveritySorting(high, low) {
|
|
55
|
+
const highMarker = createMockMarker({ start: { line: 0, character: 10 }, end: { line: 0, character: 10 } }, high);
|
|
56
|
+
const lowMarker = createMockMarker({ start: { line: 0, character: 10 }, end: { line: 0, character: 10 } }, low);
|
|
57
|
+
const highNode = createMockMarkerNode(highMarker);
|
|
58
|
+
const lowNode = createMockMarkerNode(lowMarker);
|
|
59
|
+
const highMarkerNode = createMarkerInfo('1', new uri_1.default('a'), [highNode]);
|
|
60
|
+
const lowMarkerNode = createMarkerInfo('2', new uri_1.default('b'), [lowNode]);
|
|
61
|
+
const highFirstRoot = getRootNode('highFirstRoot');
|
|
62
|
+
problem_composite_tree_node_1.ProblemCompositeTreeNode.addChild(highFirstRoot, highMarkerNode, [highMarker]);
|
|
63
|
+
problem_composite_tree_node_1.ProblemCompositeTreeNode.addChild(highFirstRoot, lowMarkerNode, [lowMarker]);
|
|
64
|
+
expectCorrectOrdering(highFirstRoot);
|
|
65
|
+
const lowFirstRoot = getRootNode('lowFirstRoot');
|
|
66
|
+
problem_composite_tree_node_1.ProblemCompositeTreeNode.addChild(lowFirstRoot, lowMarkerNode, [lowMarker]);
|
|
67
|
+
problem_composite_tree_node_1.ProblemCompositeTreeNode.addChild(lowFirstRoot, highMarkerNode, [highMarker]);
|
|
68
|
+
expectCorrectOrdering(lowFirstRoot);
|
|
69
|
+
function expectCorrectOrdering(root) {
|
|
70
|
+
chai_1.expect(root.children.length).to.equal(2);
|
|
71
|
+
chai_1.expect(root.children[0]).to.equal(highMarkerNode);
|
|
72
|
+
chai_1.expect(highMarkerNode.nextSibling).to.equal(lowMarkerNode);
|
|
73
|
+
chai_1.expect(root.children[1]).to.equal(lowMarkerNode);
|
|
74
|
+
chai_1.expect(lowMarkerNode.previousSibling).to.equal(highMarkerNode);
|
|
75
|
+
}
|
|
76
|
+
}
|
|
77
|
+
it('should sort error higher than warnings', () => {
|
|
78
|
+
testSeveritySorting(vscode_languageserver_types_1.DiagnosticSeverity.Error, vscode_languageserver_types_1.DiagnosticSeverity.Warning);
|
|
79
|
+
});
|
|
80
|
+
it('should sort errors higher than infos', () => {
|
|
81
|
+
testSeveritySorting(vscode_languageserver_types_1.DiagnosticSeverity.Error, vscode_languageserver_types_1.DiagnosticSeverity.Information);
|
|
82
|
+
});
|
|
83
|
+
it('should sort errors higher than hints', () => {
|
|
84
|
+
testSeveritySorting(vscode_languageserver_types_1.DiagnosticSeverity.Error, vscode_languageserver_types_1.DiagnosticSeverity.Hint);
|
|
85
|
+
});
|
|
86
|
+
it('should sort warnings higher than infos', () => {
|
|
87
|
+
testSeveritySorting(vscode_languageserver_types_1.DiagnosticSeverity.Warning, vscode_languageserver_types_1.DiagnosticSeverity.Information);
|
|
88
|
+
});
|
|
89
|
+
it('should sort warnings higher than hints', () => {
|
|
90
|
+
testSeveritySorting(vscode_languageserver_types_1.DiagnosticSeverity.Warning, vscode_languageserver_types_1.DiagnosticSeverity.Hint);
|
|
91
|
+
});
|
|
92
|
+
it('should sort infos higher than hints', () => {
|
|
93
|
+
testSeveritySorting(vscode_languageserver_types_1.DiagnosticSeverity.Information, vscode_languageserver_types_1.DiagnosticSeverity.Hint);
|
|
94
|
+
});
|
|
95
|
+
});
|
|
96
|
+
it('should sort markersInfo based on URI if severities are equal', () => {
|
|
97
|
+
const markerA = createMockMarker({ start: { line: 0, character: 10 }, end: { line: 0, character: 10 } }, vscode_languageserver_types_1.DiagnosticSeverity.Error);
|
|
98
|
+
const markerB = createMockMarker({ start: { line: 0, character: 10 }, end: { line: 0, character: 10 } }, vscode_languageserver_types_1.DiagnosticSeverity.Error);
|
|
99
|
+
const nodeA = createMockMarkerNode(markerA);
|
|
100
|
+
const nodeB = createMockMarkerNode(markerB);
|
|
101
|
+
const markerInfoNodeA = createMarkerInfo('1', new uri_1.default('a'), [nodeA]);
|
|
102
|
+
const markerInfoNodeB = createMarkerInfo('2', new uri_1.default('b'), [nodeB]);
|
|
103
|
+
problem_composite_tree_node_1.ProblemCompositeTreeNode.addChild(rootNode, markerInfoNodeA, [markerA]);
|
|
104
|
+
problem_composite_tree_node_1.ProblemCompositeTreeNode.addChild(rootNode, markerInfoNodeB, [markerB]);
|
|
105
|
+
chai_1.expect(rootNode.children.length).to.equal(2);
|
|
106
|
+
chai_1.expect(rootNode.children[0]).to.equal(markerInfoNodeA);
|
|
107
|
+
chai_1.expect(markerInfoNodeA.nextSibling).to.equal(markerInfoNodeB);
|
|
108
|
+
chai_1.expect(rootNode.children[1]).to.equal(markerInfoNodeB);
|
|
109
|
+
chai_1.expect(markerInfoNodeB.previousSibling).to.equal(markerInfoNodeA);
|
|
110
|
+
});
|
|
111
|
+
it('changing marker content should lead to update in ProblemCompositeTree', () => {
|
|
112
|
+
const markerA = createMockMarker({ start: { line: 0, character: 10 }, end: { line: 0, character: 10 } }, vscode_languageserver_types_1.DiagnosticSeverity.Error);
|
|
113
|
+
const nodeA = createMockMarkerNode(markerA);
|
|
114
|
+
const markerInfoNodeA = createMarkerInfo('1', new uri_1.default('a'), [nodeA]);
|
|
115
|
+
problem_composite_tree_node_1.ProblemCompositeTreeNode.addChild(rootNode, markerInfoNodeA, [markerA]);
|
|
116
|
+
markerA.data.severity = vscode_languageserver_types_1.DiagnosticSeverity.Hint;
|
|
117
|
+
problem_composite_tree_node_1.ProblemCompositeTreeNode.addChild(rootNode, markerInfoNodeA, [markerA]);
|
|
118
|
+
chai_1.expect(rootNode.children.length).to.equal(1);
|
|
119
|
+
chai_1.expect(rootNode.children[0]).to.equal(markerInfoNodeA);
|
|
120
|
+
});
|
|
121
|
+
it('changing marker content from error to hint should lead to lower rank', () => {
|
|
122
|
+
const markerA = createMockMarker({ start: { line: 0, character: 10 }, end: { line: 0, character: 10 } }, vscode_languageserver_types_1.DiagnosticSeverity.Error);
|
|
123
|
+
const nodeA = createMockMarkerNode(markerA);
|
|
124
|
+
const markerInfoNodeA = createMarkerInfo('1', new uri_1.default('a'), [nodeA]);
|
|
125
|
+
problem_composite_tree_node_1.ProblemCompositeTreeNode.addChild(rootNode, markerInfoNodeA, [markerA]);
|
|
126
|
+
const markerB = createMockMarker({ start: { line: 0, character: 10 }, end: { line: 0, character: 10 } }, vscode_languageserver_types_1.DiagnosticSeverity.Error);
|
|
127
|
+
const nodeB = createMockMarkerNode(markerB);
|
|
128
|
+
const markerInfoNodeB = createMarkerInfo('2', new uri_1.default('b'), [nodeB]);
|
|
129
|
+
problem_composite_tree_node_1.ProblemCompositeTreeNode.addChild(rootNode, markerInfoNodeB, [markerB]);
|
|
130
|
+
markerA.data.severity = vscode_languageserver_types_1.DiagnosticSeverity.Hint;
|
|
131
|
+
problem_composite_tree_node_1.ProblemCompositeTreeNode.addChild(rootNode, markerInfoNodeA, [markerA]);
|
|
132
|
+
chai_1.expect(rootNode.children.length).to.equal(2);
|
|
133
|
+
chai_1.expect(rootNode.children[0]).to.equal(markerInfoNodeB);
|
|
134
|
+
chai_1.expect(markerInfoNodeB.nextSibling).to.equal(markerInfoNodeA);
|
|
135
|
+
chai_1.expect(rootNode.children[1]).to.equal(markerInfoNodeA);
|
|
136
|
+
chai_1.expect(markerInfoNodeA.previousSibling).to.equal(markerInfoNodeB);
|
|
137
|
+
});
|
|
138
|
+
it('changing marker content from error to hint should lead to higher rank', () => {
|
|
139
|
+
const markerA = createMockMarker({ start: { line: 0, character: 10 }, end: { line: 0, character: 10 } }, vscode_languageserver_types_1.DiagnosticSeverity.Hint);
|
|
140
|
+
const nodeA = createMockMarkerNode(markerA);
|
|
141
|
+
const markerInfoNodeA = createMarkerInfo('1', new uri_1.default('a'), [nodeA]);
|
|
142
|
+
problem_composite_tree_node_1.ProblemCompositeTreeNode.addChild(rootNode, markerInfoNodeA, [markerA]);
|
|
143
|
+
const markerB = createMockMarker({ start: { line: 0, character: 10 }, end: { line: 0, character: 10 } }, vscode_languageserver_types_1.DiagnosticSeverity.Error);
|
|
144
|
+
const nodeB = createMockMarkerNode(markerB);
|
|
145
|
+
const markerInfoNodeB = createMarkerInfo('2', new uri_1.default('b'), [nodeB]);
|
|
146
|
+
problem_composite_tree_node_1.ProblemCompositeTreeNode.addChild(rootNode, markerInfoNodeB, [markerB]);
|
|
147
|
+
markerA.data.severity = vscode_languageserver_types_1.DiagnosticSeverity.Error;
|
|
148
|
+
problem_composite_tree_node_1.ProblemCompositeTreeNode.addChild(rootNode, markerInfoNodeA, [markerA]);
|
|
149
|
+
chai_1.expect(rootNode.children.length).to.equal(2);
|
|
150
|
+
chai_1.expect(rootNode.children[0]).to.equal(markerInfoNodeA);
|
|
151
|
+
chai_1.expect(markerInfoNodeA.nextSibling).to.equal(markerInfoNodeB);
|
|
152
|
+
chai_1.expect(rootNode.children[1]).to.equal(markerInfoNodeB);
|
|
153
|
+
chai_1.expect(markerInfoNodeB.previousSibling).to.equal(markerInfoNodeA);
|
|
154
|
+
});
|
|
155
|
+
});
|
|
156
|
+
});
|
|
157
|
+
function createMarkerInfo(id, uri, marker) {
|
|
158
|
+
return {
|
|
159
|
+
children: marker ? marker : [],
|
|
160
|
+
expanded: true,
|
|
161
|
+
uri,
|
|
162
|
+
id,
|
|
163
|
+
parent: rootNode,
|
|
164
|
+
selected: false,
|
|
165
|
+
numberOfMarkers: marker ? marker.length : 0
|
|
166
|
+
};
|
|
167
|
+
}
|
|
168
|
+
/**
|
|
169
|
+
* Create a mock marker node with the given diagnostic marker.
|
|
170
|
+
* @param marker the diagnostic marker.
|
|
171
|
+
*
|
|
172
|
+
* @returns a mock marker node.
|
|
173
|
+
*/
|
|
174
|
+
function createMockMarkerNode(marker) {
|
|
175
|
+
return {
|
|
176
|
+
id: 'id',
|
|
177
|
+
name: 'marker',
|
|
178
|
+
parent: undefined,
|
|
179
|
+
selected: false,
|
|
180
|
+
uri: new uri_1.default(''),
|
|
181
|
+
marker
|
|
182
|
+
};
|
|
183
|
+
}
|
|
184
|
+
/**
|
|
185
|
+
* Create a mock diagnostic marker.
|
|
186
|
+
* @param range the diagnostic range.
|
|
187
|
+
* @param severity the diagnostic severity.
|
|
188
|
+
* @param owner the optional owner of the diagnostic
|
|
189
|
+
*
|
|
190
|
+
* @returns a mock diagnostic marker.
|
|
191
|
+
*/
|
|
192
|
+
function createMockMarker(range, severity, owner) {
|
|
193
|
+
const data = {
|
|
194
|
+
range: range,
|
|
195
|
+
severity: severity,
|
|
196
|
+
message: 'message'
|
|
197
|
+
};
|
|
198
|
+
return Object.freeze({
|
|
199
|
+
uri: 'uri',
|
|
200
|
+
kind: 'marker',
|
|
201
|
+
owner: owner !== null && owner !== void 0 ? owner : 'owner',
|
|
202
|
+
data
|
|
203
|
+
});
|
|
204
|
+
}
|
|
205
|
+
function getRootNode(id) {
|
|
206
|
+
return {
|
|
207
|
+
visible: false,
|
|
208
|
+
id: id,
|
|
209
|
+
name: 'MarkerTree',
|
|
210
|
+
kind: 'problem',
|
|
211
|
+
children: [],
|
|
212
|
+
parent: undefined
|
|
213
|
+
};
|
|
214
|
+
}
|
|
215
|
+
//# sourceMappingURL=problem-composite-tree-node.spec.js.map
|
|
@@ -0,0 +1 @@
|
|
|
1
|
+
{"version":3,"file":"problem-composite-tree-node.spec.js","sourceRoot":"","sources":["../../../src/browser/problem/problem-composite-tree-node.spec.ts"],"names":[],"mappings":"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"}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"problem-contribution.d.ts","sourceRoot":"","sources":["../../../src/browser/problem/problem-contribution.ts"],"names":[],"mappings":"AAAA;;;;;;;;;;;;;;kFAckF;;AAIlF,OAAO,EAAE,mBAAmB,EAAE,+BAA+B,EAAyC,MAAM,EAAW,MAAM,yBAAyB,CAAC;AACvJ,OAAO,EAAE,SAAS,EAAsB,MAAM,+CAA+C,CAAC;AAC9F,OAAO,EAAE,wBAAwB,EAAE,MAAM,iDAAiD,CAAC;AAE3F,OAAO,EAAE,cAAc,EAAE,WAAW,EAAE,MAAM,mBAAmB,CAAC;AAChE,OAAO,EAAE,aAAa,EAAsB,MAAM,kBAAkB,CAAC;AACrE,OAAO,EAAE,QAAQ,EAAE,iBAAiB,EAAE,MAAM,6BAA6B,CAAC;AAC1E,OAAO,EAAE,OAAO,EAAE,eAAe,EAAE,MAAM,gCAAgC,CAAC;AAC1E,OAAO,EAAE,yBAAyB,EAAE,qBAAqB,EAAE,MAAM,+CAA+C,CAAC;AACjH,OAAO,EAAE,gBAAgB,EAAE,MAAM,0CAA0C,CAAC;AAC5E,OAAO,EAAE,gBAAgB,EAAE,MAAM,qBAAqB,CAAC;
|
|
1
|
+
{"version":3,"file":"problem-contribution.d.ts","sourceRoot":"","sources":["../../../src/browser/problem/problem-contribution.ts"],"names":[],"mappings":"AAAA;;;;;;;;;;;;;;kFAckF;;AAIlF,OAAO,EAAE,mBAAmB,EAAE,+BAA+B,EAAyC,MAAM,EAAW,MAAM,yBAAyB,CAAC;AACvJ,OAAO,EAAE,SAAS,EAAsB,MAAM,+CAA+C,CAAC;AAC9F,OAAO,EAAE,wBAAwB,EAAE,MAAM,iDAAiD,CAAC;AAE3F,OAAO,EAAE,cAAc,EAAE,WAAW,EAAE,MAAM,mBAAmB,CAAC;AAChE,OAAO,EAAE,aAAa,EAAsB,MAAM,kBAAkB,CAAC;AACrE,OAAO,EAAE,QAAQ,EAAE,iBAAiB,EAAE,MAAM,6BAA6B,CAAC;AAC1E,OAAO,EAAE,OAAO,EAAE,eAAe,EAAE,MAAM,gCAAgC,CAAC;AAC1E,OAAO,EAAE,yBAAyB,EAAE,qBAAqB,EAAE,MAAM,+CAA+C,CAAC;AACjH,OAAO,EAAE,gBAAgB,EAAE,MAAM,0CAA0C,CAAC;AAC5E,OAAO,EAAE,gBAAgB,EAAE,MAAM,qBAAqB,CAAC;AAGvD,eAAO,MAAM,qBAAqB,EAAE,QAAyB,CAAC;AAE9D,yBAAiB,YAAY,CAAC;IACnB,MAAM,SAAS,UAA4C,CAAC;IAC5D,MAAM,QAAQ,UAA2C,CAAC;CACpE;AAED,yBAAiB,gBAAgB,CAAC;IACvB,MAAM,YAAY,EAAE,OAE1B,CAAC;IACK,MAAM,oBAAoB,EAAE,OAGlC,CAAC;IACK,MAAM,IAAI,EAAE,OAElB,CAAC;IACK,MAAM,YAAY,EAAE,OAE1B,CAAC;IACK,MAAM,SAAS,SAK8C,CAAC;CACxE;AAED,qBACa,mBAAoB,SAAQ,wBAAwB,CAAC,aAAa,CAAE,YAAW,+BAA+B,EAAE,yBAAyB;IAE1H,SAAS,CAAC,QAAQ,CAAC,cAAc,EAAE,cAAc,CAAC;IACvD,SAAS,CAAC,QAAQ,CAAC,SAAS,EAAE,SAAS,CAAC;IACjC,SAAS,CAAC,QAAQ,CAAC,gBAAgB,EAAE,gBAAgB,CAAC;;IAchF,OAAO,CAAC,GAAG,EAAE,mBAAmB,GAAG,IAAI;IAKjC,gBAAgB,CAAC,GAAG,EAAE,mBAAmB,GAAG,OAAO,CAAC,IAAI,CAAC;IAI/D,SAAS,CAAC,sBAAsB,6CAAsF;IACtH,SAAS,CAAC,mBAAmB,CAAC,WAAW,EAAE,WAAW,GAAG,IAAI;IAY7D;;;;;;;;OAQG;IACH,SAAS,CAAC,mBAAmB,CAAC,IAAI,EAAE,WAAW,GAAG,MAAM;IAmBxD,gBAAgB,CAAC,QAAQ,EAAE,eAAe,GAAG,IAAI;IAiCjD,aAAa,CAAC,KAAK,EAAE,iBAAiB,GAAG,IAAI;IAmBvC,oBAAoB,CAAC,eAAe,EAAE,qBAAqB,GAAG,OAAO,CAAC,IAAI,CAAC;cAejE,mBAAmB,IAAI,OAAO,CAAC,IAAI,CAAC;IAUpD,SAAS,CAAC,cAAc,CAAC,OAAO,EAAE,MAAM,GAAG,IAAI;IAY/C,SAAS,CAAC,IAAI,CAAC,SAAS,EAAE,gBAAgB,GAAG,IAAI;IAkBjD,SAAS,CAAC,WAAW,CAAC,SAAS,EAAE,gBAAgB,GAAG,IAAI;IAKxD,SAAS,CAAC,UAAU,CAAC,CAAC,EAAE,MAAM,oBAA0C,EAAE,EAAE,EAAE,CAAC,QAAQ,EAAE,aAAa,KAAK,CAAC,GAAG,CAAC,GAAG,KAAK;CAM3H"}
|
|
@@ -33,8 +33,10 @@ const view_contribution_1 = require("@theia/core/lib/browser/shell/view-contribu
|
|
|
33
33
|
const problem_marker_1 = require("../../common/problem-marker");
|
|
34
34
|
const problem_manager_1 = require("./problem-manager");
|
|
35
35
|
const problem_widget_1 = require("./problem-widget");
|
|
36
|
+
const command_1 = require("@theia/core/lib/common/command");
|
|
36
37
|
const selection_service_1 = require("@theia/core/lib/common/selection-service");
|
|
37
38
|
const problem_selection_1 = require("./problem-selection");
|
|
39
|
+
const nls_1 = require("@theia/core/lib/common/nls");
|
|
38
40
|
exports.PROBLEMS_CONTEXT_MENU = [problem_marker_1.PROBLEM_KIND];
|
|
39
41
|
var ProblemsMenu;
|
|
40
42
|
(function (ProblemsMenu) {
|
|
@@ -56,18 +58,18 @@ var ProblemsCommands;
|
|
|
56
58
|
ProblemsCommands.COPY_MESSAGE = {
|
|
57
59
|
id: 'problems.copy.message',
|
|
58
60
|
};
|
|
59
|
-
ProblemsCommands.CLEAR_ALL = {
|
|
61
|
+
ProblemsCommands.CLEAR_ALL = command_1.Command.toLocalizedCommand({
|
|
60
62
|
id: 'problems.clear.all',
|
|
61
63
|
category: 'Problems',
|
|
62
64
|
label: 'Clear All',
|
|
63
65
|
iconClass: browser_1.codicon('clear-all')
|
|
64
|
-
};
|
|
66
|
+
}, 'theia/markers/clearAll', 'vscode/markers.contribution/problems');
|
|
65
67
|
})(ProblemsCommands = exports.ProblemsCommands || (exports.ProblemsCommands = {}));
|
|
66
68
|
let ProblemContribution = class ProblemContribution extends view_contribution_1.AbstractViewContribution {
|
|
67
69
|
constructor() {
|
|
68
70
|
super({
|
|
69
71
|
widgetId: problem_widget_1.PROBLEMS_WIDGET_ID,
|
|
70
|
-
widgetName: 'Problems',
|
|
72
|
+
widgetName: nls_1.nls.localize('vscode/markers.contribution/problems', 'Problems'),
|
|
71
73
|
defaultWidgetOptions: {
|
|
72
74
|
area: 'bottom'
|
|
73
75
|
},
|
|
@@ -105,17 +107,18 @@ let ProblemContribution = class ProblemContribution extends view_contribution_1.
|
|
|
105
107
|
*/
|
|
106
108
|
getStatusBarTooltip(stat) {
|
|
107
109
|
if (stat.errors <= 0 && stat.warnings <= 0 && stat.infos <= 0) {
|
|
108
|
-
return 'No Problems';
|
|
110
|
+
return nls_1.nls.localize('vscode/markers.contribution/noProblems', 'No Problems');
|
|
109
111
|
}
|
|
112
|
+
const localize = (text, value) => nls_1.nls.localize(`vscode/markers.contribution/total${text}`, `{0} ${text}`, value.toString());
|
|
110
113
|
const tooltip = [];
|
|
111
114
|
if (stat.errors > 0) {
|
|
112
|
-
tooltip.push(
|
|
115
|
+
tooltip.push(localize('Errors', stat.errors));
|
|
113
116
|
}
|
|
114
117
|
if (stat.warnings > 0) {
|
|
115
|
-
tooltip.push(
|
|
118
|
+
tooltip.push(localize('Warnings', stat.warnings));
|
|
116
119
|
}
|
|
117
120
|
if (stat.infos > 0) {
|
|
118
|
-
tooltip.push(
|
|
121
|
+
tooltip.push(localize('Infos', stat.infos));
|
|
119
122
|
}
|
|
120
123
|
return tooltip.join(', ');
|
|
121
124
|
}
|
|
@@ -151,17 +154,17 @@ let ProblemContribution = class ProblemContribution extends view_contribution_1.
|
|
|
151
154
|
super.registerMenus(menus);
|
|
152
155
|
menus.registerMenuAction(ProblemsMenu.CLIPBOARD, {
|
|
153
156
|
commandId: ProblemsCommands.COPY.id,
|
|
154
|
-
label: 'Copy',
|
|
157
|
+
label: nls_1.nls.localize('vscode/markers.contribution/copyMarker', 'Copy'),
|
|
155
158
|
order: '0'
|
|
156
159
|
});
|
|
157
160
|
menus.registerMenuAction(ProblemsMenu.CLIPBOARD, {
|
|
158
161
|
commandId: ProblemsCommands.COPY_MESSAGE.id,
|
|
159
|
-
label: 'Copy Message',
|
|
162
|
+
label: nls_1.nls.localize('vscode/markers.contribution/copyMessage', 'Copy Message'),
|
|
160
163
|
order: '1'
|
|
161
164
|
});
|
|
162
165
|
menus.registerMenuAction(ProblemsMenu.PROBLEMS, {
|
|
163
166
|
commandId: ProblemsCommands.COLLAPSE_ALL.id,
|
|
164
|
-
label: 'Collapse All',
|
|
167
|
+
label: nls_1.nls.localize('vscode/markers.contribution/collapseAll', 'Collapse All'),
|
|
165
168
|
order: '2'
|
|
166
169
|
});
|
|
167
170
|
}
|
|
@@ -169,13 +172,13 @@ let ProblemContribution = class ProblemContribution extends view_contribution_1.
|
|
|
169
172
|
toolbarRegistry.registerItem({
|
|
170
173
|
id: ProblemsCommands.COLLAPSE_ALL_TOOLBAR.id,
|
|
171
174
|
command: ProblemsCommands.COLLAPSE_ALL_TOOLBAR.id,
|
|
172
|
-
tooltip: 'Collapse All',
|
|
175
|
+
tooltip: nls_1.nls.localize('vscode/markers.contribution/collapseAll', 'Collapse All'),
|
|
173
176
|
priority: 0,
|
|
174
177
|
});
|
|
175
178
|
toolbarRegistry.registerItem({
|
|
176
179
|
id: ProblemsCommands.CLEAR_ALL.id,
|
|
177
180
|
command: ProblemsCommands.CLEAR_ALL.id,
|
|
178
|
-
tooltip:
|
|
181
|
+
tooltip: ProblemsCommands.CLEAR_ALL.label,
|
|
179
182
|
priority: 1,
|
|
180
183
|
});
|
|
181
184
|
}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"problem-contribution.js","sourceRoot":"","sources":["../../../src/browser/problem/problem-contribution.ts"],"names":[],"mappings":";AAAA;;;;;;;;;;;;;;kFAckF;;;;;;;;;;;;AAElF,+DAAgE;AAChE,4DAAkE;AAClE,qDAAuJ;AACvJ,8EAA8F;AAC9F,uFAA2F;AAC3F,gEAA0E;AAC1E,uDAAgE;AAChE,qDAAqE;
|
|
1
|
+
{"version":3,"file":"problem-contribution.js","sourceRoot":"","sources":["../../../src/browser/problem/problem-contribution.ts"],"names":[],"mappings":"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"}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"problem-decorator.d.ts","sourceRoot":"","sources":["../../../src/browser/problem/problem-decorator.ts"],"names":[],"mappings":"AAAA;;;;;;;;;;;;;;kFAckF;AAGlF,OAAO,EAAE,UAAU,EAAsB,MAAM,gDAAgD,CAAC;AAChG,OAAO,GAAG,MAAM,4BAA4B,CAAC;AAE7C,OAAO,EAAE,KAAK,EAAE,OAAO,EAAE,MAAM,8BAA8B,CAAC;AAC9D,OAAO,EAAE,IAAI,EAAE,MAAM,mCAAmC,CAAC;AAEzD,OAAO,EAAE,aAAa,EAAE,cAAc,EAAE,MAAM,6CAA6C,CAAC;AAE5F,OAAO,EAAE,MAAM,EAAE,MAAM,qBAAqB,CAAC;AAC7C,OAAO,EAAE,cAAc,EAAE,MAAM,mBAAmB,CAAC;AACnD,OAAO,EAAE,kBAAkB,EAAE,MAAM,uBAAuB,CAAC;AAG3D,OAAO,EAAE,aAAa,EAAE,MAAM,yBAAyB,CAAC;AACxD,OAAO,EAAE,gBAAgB,EAAE,MAAM,8BAA8B,CAAC;AAGhE,qBACa,gBAAiB,YAAW,aAAa;IAWd,SAAS,CAAC,QAAQ,CAAC,cAAc,EAAE,cAAc;IARrF,SAAS,CAAC,kBAAkB,EAAE,kBAAkB,CAAC;IACvB,SAAS,CAAC,QAAQ,CAAC,gBAAgB,EAAE,gBAAgB,CAAC;IACzD,SAAS,CAAC,QAAQ,CAAC,aAAa,EAAE,aAAa,CAAC;IAEvE,QAAQ,CAAC,EAAE,6BAA6B;IAExC,SAAS,CAAC,QAAQ,CAAC,OAAO,EAAE,OAAO,CAAC,CAAC,IAAI,EAAE,IAAI,KAAK,GAAG,CAAC,MAAM,EAAE,cAAc,CAAC,IAAI,CAAC,CAAC,CAAC;gBAE/B,cAAc,EAAE,cAAc;IAMrF,SAAS,CAAC,IAAI,IAAI,IAAI;IAchB,WAAW,CAAC,IAAI,EAAE,IAAI,GAAG,OAAO,CAAC,GAAG,CAAC,MAAM,EAAE,cAAc,CAAC,IAAI,CAAC,CAAC;IAIxE,IAAI,sBAAsB,IAAI,KAAK,CAAC,CAAC,IAAI,EAAE,IAAI,KAAK,GAAG,CAAC,MAAM,EAAE,cAAc,CAAC,IAAI,CAAC,CAAC,CAEpF;IAED,SAAS,CAAC,wBAAwB,CAAC,KAAK,EAAE,CAAC,IAAI,EAAE,IAAI,KAAK,GAAG,CAAC,MAAM,EAAE,cAAc,CAAC,IAAI,CAAC,GAAG,IAAI;IAIjG,SAAS,CAAC,iBAAiB,CAAC,IAAI,EAAE,IAAI,GAAG,GAAG,CAAC,MAAM,EAAE,cAAc,CAAC,IAAI,CAAC;IA0BzE,SAAS,CAAC,sBAAsB,CAAC,OAAO,EAAE,GAAG,EAAE,mBAAmB,CAAC,EAAE,cAAc,CAAC,IAAI,GAAG,cAAc,CAAC,IAAI;IAc9G,SAAS,CAAC,qBAAqB,CAAC,OAAO,EAAE,GAAG,GAAG,MAAM;IAkBrD,SAAS,CAAC,sBAAsB,CAAC,IAAI,EAAE,IAAI,EAAE,OAAO,EAAE,MAAM,CAAC,UAAU,CAAC,EAAE,GAAG,GAAG,CAAC,MAAM,EAAE,MAAM,CAAC,UAAU,CAAC,CAAC;IA6B5G,SAAS,CAAC,cAAc,CAAC,IAAI,EAAE,IAAI,GAAG,MAAM,CAAC,UAAU,CAAC,EAAE;IAU1D,SAAS,CAAC,WAAW,CAAC,MAAM,EAAE,MAAM,CAAC,UAAU,CAAC,GAAG,cAAc,CAAC,IAAI;IAsBtE,SAAS,CAAC,cAAc,CAAC,MAAM,EAAE,MAAM,CAAC,UAAU,CAAC,GAAG,MAAM;IAU5D,SAAS,CAAC,mBAAmB,CAAC,MAAM,EAAE,MAAM,CAAC,UAAU,CAAC,GAAG,cAAc,CAAC,KAAK;IAU/E;;;;OAIG;IACH,SAAS,CAAC,WAAW,CAAC,MAAM,EAAE,MAAM,CAAC,UAAU,CAAC,GAAG,MAAM;IAUzD;;;OAGG;IACH,SAAS,CAAC,YAAY,CAAC,MAAM,EAAE,MAAM,CAAC,UAAU,CAAC,GAAG,OAAO;IAO3D,SAAS,CAAC,OAAO,CAAC,IAAI,EAAE,MAAM,CAAC,UAAU,CAAC,EAAE,KAAK,EAAE,MAAM,CAAC,UAAU,CAAC,GAAG,MAAM;CAIjF;AAED,yBAAiB,gBAAgB,CAAC;IAGvB,MAAM,eAAe,
|
|
1
|
+
{"version":3,"file":"problem-decorator.d.ts","sourceRoot":"","sources":["../../../src/browser/problem/problem-decorator.ts"],"names":[],"mappings":"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"}
|
|
@@ -261,7 +261,7 @@ ProblemDecorator = ProblemDecorator_1 = __decorate([
|
|
|
261
261
|
exports.ProblemDecorator = ProblemDecorator;
|
|
262
262
|
(function (ProblemDecorator) {
|
|
263
263
|
// Highest severities (errors) come first, then the others. Undefined severities treated as the last ones.
|
|
264
|
-
ProblemDecorator.severityCompare = problem_utils_1.ProblemUtils.
|
|
264
|
+
ProblemDecorator.severityCompare = problem_utils_1.ProblemUtils.severityCompareMarker;
|
|
265
265
|
})(ProblemDecorator = exports.ProblemDecorator || (exports.ProblemDecorator = {}));
|
|
266
266
|
exports.ProblemDecorator = ProblemDecorator;
|
|
267
267
|
//# sourceMappingURL=problem-decorator.js.map
|