@theia/markers 1.45.1 → 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,33 +1,33 @@
|
|
|
1
|
-
/// <reference types="lodash" />
|
|
2
|
-
import { ProblemManager } from './problem-manager';
|
|
3
|
-
import { MarkerNode, MarkerTree, MarkerOptions, MarkerInfoNode } from '../marker-tree';
|
|
4
|
-
import { MarkerTreeModel } from '../marker-tree-model';
|
|
5
|
-
import { OpenerOptions, TreeNode } from '@theia/core/lib/browser';
|
|
6
|
-
import { Marker } from '../../common/marker';
|
|
7
|
-
import { Diagnostic } from '@theia/core/shared/vscode-languageserver-protocol';
|
|
8
|
-
export declare class ProblemTree extends MarkerTree<Diagnostic> {
|
|
9
|
-
protected markers: {
|
|
10
|
-
node: MarkerInfoNode;
|
|
11
|
-
markers: Marker<Diagnostic>[];
|
|
12
|
-
}[];
|
|
13
|
-
constructor(markerManager: ProblemManager, markerOptions: MarkerOptions);
|
|
14
|
-
protected getMarkerNodes(parent: MarkerInfoNode, markers: Marker<Diagnostic>[]): MarkerNode[];
|
|
15
|
-
/**
|
|
16
|
-
* Sort markers based on the following rules:
|
|
17
|
-
* - Markers are fist sorted by `severity`.
|
|
18
|
-
* - Markers are sorted by `line number` if applicable.
|
|
19
|
-
* - Markers are sorted by `column number` if applicable.
|
|
20
|
-
* - Markers are then finally sorted by `owner` if applicable.
|
|
21
|
-
* @param a the first marker for comparison.
|
|
22
|
-
* @param b the second marker for comparison.
|
|
23
|
-
*/
|
|
24
|
-
protected sortMarkers(a: MarkerNode, b: MarkerNode): number;
|
|
25
|
-
protected insertNodeWithMarkers(node: MarkerInfoNode, markers: Marker<Diagnostic>[]): void;
|
|
26
|
-
protected doInsertNodesWithMarkers: import("lodash").DebouncedFunc<() => void>;
|
|
27
|
-
}
|
|
28
|
-
export declare class ProblemTreeModel extends MarkerTreeModel {
|
|
29
|
-
protected readonly problemManager: ProblemManager;
|
|
30
|
-
protected getOpenerOptionsByMarker(node: MarkerNode): OpenerOptions | undefined;
|
|
31
|
-
removeNode(node: TreeNode): void;
|
|
32
|
-
}
|
|
1
|
+
/// <reference types="lodash" />
|
|
2
|
+
import { ProblemManager } from './problem-manager';
|
|
3
|
+
import { MarkerNode, MarkerTree, MarkerOptions, MarkerInfoNode } from '../marker-tree';
|
|
4
|
+
import { MarkerTreeModel } from '../marker-tree-model';
|
|
5
|
+
import { OpenerOptions, TreeNode } from '@theia/core/lib/browser';
|
|
6
|
+
import { Marker } from '../../common/marker';
|
|
7
|
+
import { Diagnostic } from '@theia/core/shared/vscode-languageserver-protocol';
|
|
8
|
+
export declare class ProblemTree extends MarkerTree<Diagnostic> {
|
|
9
|
+
protected markers: {
|
|
10
|
+
node: MarkerInfoNode;
|
|
11
|
+
markers: Marker<Diagnostic>[];
|
|
12
|
+
}[];
|
|
13
|
+
constructor(markerManager: ProblemManager, markerOptions: MarkerOptions);
|
|
14
|
+
protected getMarkerNodes(parent: MarkerInfoNode, markers: Marker<Diagnostic>[]): MarkerNode[];
|
|
15
|
+
/**
|
|
16
|
+
* Sort markers based on the following rules:
|
|
17
|
+
* - Markers are fist sorted by `severity`.
|
|
18
|
+
* - Markers are sorted by `line number` if applicable.
|
|
19
|
+
* - Markers are sorted by `column number` if applicable.
|
|
20
|
+
* - Markers are then finally sorted by `owner` if applicable.
|
|
21
|
+
* @param a the first marker for comparison.
|
|
22
|
+
* @param b the second marker for comparison.
|
|
23
|
+
*/
|
|
24
|
+
protected sortMarkers(a: MarkerNode, b: MarkerNode): number;
|
|
25
|
+
protected insertNodeWithMarkers(node: MarkerInfoNode, markers: Marker<Diagnostic>[]): void;
|
|
26
|
+
protected doInsertNodesWithMarkers: import("lodash").DebouncedFunc<() => void>;
|
|
27
|
+
}
|
|
28
|
+
export declare class ProblemTreeModel extends MarkerTreeModel {
|
|
29
|
+
protected readonly problemManager: ProblemManager;
|
|
30
|
+
protected getOpenerOptionsByMarker(node: MarkerNode): OpenerOptions | undefined;
|
|
31
|
+
removeNode(node: TreeNode): void;
|
|
32
|
+
}
|
|
33
33
|
//# sourceMappingURL=problem-tree-model.d.ts.map
|
|
@@ -1,132 +1,132 @@
|
|
|
1
|
-
"use strict";
|
|
2
|
-
// *****************************************************************************
|
|
3
|
-
// Copyright (C) 2017 TypeFox 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
|
-
var __decorate = (this && this.__decorate) || function (decorators, target, key, desc) {
|
|
18
|
-
var c = arguments.length, r = c < 3 ? target : desc === null ? desc = Object.getOwnPropertyDescriptor(target, key) : desc, d;
|
|
19
|
-
if (typeof Reflect === "object" && typeof Reflect.decorate === "function") r = Reflect.decorate(decorators, target, key, desc);
|
|
20
|
-
else for (var i = decorators.length - 1; i >= 0; i--) if (d = decorators[i]) r = (c < 3 ? d(r) : c > 3 ? d(target, key, r) : d(target, key)) || r;
|
|
21
|
-
return c > 3 && r && Object.defineProperty(target, key, r), r;
|
|
22
|
-
};
|
|
23
|
-
var __metadata = (this && this.__metadata) || function (k, v) {
|
|
24
|
-
if (typeof Reflect === "object" && typeof Reflect.metadata === "function") return Reflect.metadata(k, v);
|
|
25
|
-
};
|
|
26
|
-
var __param = (this && this.__param) || function (paramIndex, decorator) {
|
|
27
|
-
return function (target, key) { decorator(target, key, paramIndex); }
|
|
28
|
-
};
|
|
29
|
-
Object.defineProperty(exports, "__esModule", { value: true });
|
|
30
|
-
exports.ProblemTreeModel = exports.ProblemTree = void 0;
|
|
31
|
-
const problem_marker_1 = require("../../common/problem-marker");
|
|
32
|
-
const problem_manager_1 = require("./problem-manager");
|
|
33
|
-
const problem_composite_tree_node_1 = require("./problem-composite-tree-node");
|
|
34
|
-
const marker_tree_1 = require("../marker-tree");
|
|
35
|
-
const marker_tree_model_1 = require("../marker-tree-model");
|
|
36
|
-
const inversify_1 = require("@theia/core/shared/inversify");
|
|
37
|
-
const problem_utils_1 = require("./problem-utils");
|
|
38
|
-
const debounce = require("@theia/core/shared/lodash.debounce");
|
|
39
|
-
let ProblemTree = class ProblemTree extends marker_tree_1.MarkerTree {
|
|
40
|
-
constructor(markerManager, markerOptions) {
|
|
41
|
-
super(markerManager, markerOptions);
|
|
42
|
-
this.markers = [];
|
|
43
|
-
this.doInsertNodesWithMarkers = debounce(() => {
|
|
44
|
-
problem_composite_tree_node_1.ProblemCompositeTreeNode.addChildren(this.root, this.markers);
|
|
45
|
-
for (const { node, markers } of this.markers) {
|
|
46
|
-
const children = this.getMarkerNodes(node, markers);
|
|
47
|
-
node.numberOfMarkers = markers.length;
|
|
48
|
-
this.setChildren(node, children);
|
|
49
|
-
}
|
|
50
|
-
this.markers.length = 0;
|
|
51
|
-
}, 50);
|
|
52
|
-
}
|
|
53
|
-
getMarkerNodes(parent, markers) {
|
|
54
|
-
const nodes = super.getMarkerNodes(parent, markers);
|
|
55
|
-
return nodes.sort((a, b) => this.sortMarkers(a, b));
|
|
56
|
-
}
|
|
57
|
-
/**
|
|
58
|
-
* Sort markers based on the following rules:
|
|
59
|
-
* - Markers are fist sorted by `severity`.
|
|
60
|
-
* - Markers are sorted by `line number` if applicable.
|
|
61
|
-
* - Markers are sorted by `column number` if applicable.
|
|
62
|
-
* - Markers are then finally sorted by `owner` if applicable.
|
|
63
|
-
* @param a the first marker for comparison.
|
|
64
|
-
* @param b the second marker for comparison.
|
|
65
|
-
*/
|
|
66
|
-
sortMarkers(a, b) {
|
|
67
|
-
const markerA = a.marker;
|
|
68
|
-
const markerB = b.marker;
|
|
69
|
-
// Determine the marker with the highest severity.
|
|
70
|
-
const severity = problem_utils_1.ProblemUtils.severityCompareMarker(markerA, markerB);
|
|
71
|
-
if (severity !== 0) {
|
|
72
|
-
return severity;
|
|
73
|
-
}
|
|
74
|
-
// Determine the marker with the lower line number.
|
|
75
|
-
const lineNumber = problem_utils_1.ProblemUtils.lineNumberCompare(markerA, markerB);
|
|
76
|
-
if (lineNumber !== 0) {
|
|
77
|
-
return lineNumber;
|
|
78
|
-
}
|
|
79
|
-
// Determine the marker with the lower column number.
|
|
80
|
-
const columnNumber = problem_utils_1.ProblemUtils.columnNumberCompare(markerA, markerB);
|
|
81
|
-
if (columnNumber !== 0) {
|
|
82
|
-
return columnNumber;
|
|
83
|
-
}
|
|
84
|
-
// Sort by owner in alphabetical order.
|
|
85
|
-
const owner = problem_utils_1.ProblemUtils.ownerCompare(markerA, markerB);
|
|
86
|
-
if (owner !== 0) {
|
|
87
|
-
return owner;
|
|
88
|
-
}
|
|
89
|
-
return 0;
|
|
90
|
-
}
|
|
91
|
-
insertNodeWithMarkers(node, markers) {
|
|
92
|
-
this.markers.push({ node, markers });
|
|
93
|
-
this.doInsertNodesWithMarkers();
|
|
94
|
-
}
|
|
95
|
-
};
|
|
96
|
-
ProblemTree = __decorate([
|
|
97
|
-
(0, inversify_1.injectable)(),
|
|
98
|
-
__param(0, (0, inversify_1.inject)(problem_manager_1.ProblemManager)),
|
|
99
|
-
__param(1, (0, inversify_1.inject)(marker_tree_1.MarkerOptions)),
|
|
100
|
-
__metadata("design:paramtypes", [problem_manager_1.ProblemManager, Object])
|
|
101
|
-
], ProblemTree);
|
|
102
|
-
exports.ProblemTree = ProblemTree;
|
|
103
|
-
let ProblemTreeModel = class ProblemTreeModel extends marker_tree_model_1.MarkerTreeModel {
|
|
104
|
-
getOpenerOptionsByMarker(node) {
|
|
105
|
-
if (problem_marker_1.ProblemMarker.is(node.marker)) {
|
|
106
|
-
return {
|
|
107
|
-
selection: node.marker.data.range
|
|
108
|
-
};
|
|
109
|
-
}
|
|
110
|
-
return undefined;
|
|
111
|
-
}
|
|
112
|
-
removeNode(node) {
|
|
113
|
-
if (marker_tree_1.MarkerInfoNode.is(node)) {
|
|
114
|
-
this.problemManager.cleanAllMarkers(node.uri);
|
|
115
|
-
}
|
|
116
|
-
if (marker_tree_1.MarkerNode.is(node)) {
|
|
117
|
-
const { uri } = node;
|
|
118
|
-
const { owner } = node.marker;
|
|
119
|
-
const diagnostics = this.problemManager.findMarkers({ uri, owner, dataFilter: data => node.marker.data !== data }).map(({ data }) => data);
|
|
120
|
-
this.problemManager.setMarkers(uri, owner, diagnostics);
|
|
121
|
-
}
|
|
122
|
-
}
|
|
123
|
-
};
|
|
124
|
-
__decorate([
|
|
125
|
-
(0, inversify_1.inject)(problem_manager_1.ProblemManager),
|
|
126
|
-
__metadata("design:type", problem_manager_1.ProblemManager)
|
|
127
|
-
], ProblemTreeModel.prototype, "problemManager", void 0);
|
|
128
|
-
ProblemTreeModel = __decorate([
|
|
129
|
-
(0, inversify_1.injectable)()
|
|
130
|
-
], ProblemTreeModel);
|
|
131
|
-
exports.ProblemTreeModel = ProblemTreeModel;
|
|
1
|
+
"use strict";
|
|
2
|
+
// *****************************************************************************
|
|
3
|
+
// Copyright (C) 2017 TypeFox 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
|
+
var __decorate = (this && this.__decorate) || function (decorators, target, key, desc) {
|
|
18
|
+
var c = arguments.length, r = c < 3 ? target : desc === null ? desc = Object.getOwnPropertyDescriptor(target, key) : desc, d;
|
|
19
|
+
if (typeof Reflect === "object" && typeof Reflect.decorate === "function") r = Reflect.decorate(decorators, target, key, desc);
|
|
20
|
+
else for (var i = decorators.length - 1; i >= 0; i--) if (d = decorators[i]) r = (c < 3 ? d(r) : c > 3 ? d(target, key, r) : d(target, key)) || r;
|
|
21
|
+
return c > 3 && r && Object.defineProperty(target, key, r), r;
|
|
22
|
+
};
|
|
23
|
+
var __metadata = (this && this.__metadata) || function (k, v) {
|
|
24
|
+
if (typeof Reflect === "object" && typeof Reflect.metadata === "function") return Reflect.metadata(k, v);
|
|
25
|
+
};
|
|
26
|
+
var __param = (this && this.__param) || function (paramIndex, decorator) {
|
|
27
|
+
return function (target, key) { decorator(target, key, paramIndex); }
|
|
28
|
+
};
|
|
29
|
+
Object.defineProperty(exports, "__esModule", { value: true });
|
|
30
|
+
exports.ProblemTreeModel = exports.ProblemTree = void 0;
|
|
31
|
+
const problem_marker_1 = require("../../common/problem-marker");
|
|
32
|
+
const problem_manager_1 = require("./problem-manager");
|
|
33
|
+
const problem_composite_tree_node_1 = require("./problem-composite-tree-node");
|
|
34
|
+
const marker_tree_1 = require("../marker-tree");
|
|
35
|
+
const marker_tree_model_1 = require("../marker-tree-model");
|
|
36
|
+
const inversify_1 = require("@theia/core/shared/inversify");
|
|
37
|
+
const problem_utils_1 = require("./problem-utils");
|
|
38
|
+
const debounce = require("@theia/core/shared/lodash.debounce");
|
|
39
|
+
let ProblemTree = class ProblemTree extends marker_tree_1.MarkerTree {
|
|
40
|
+
constructor(markerManager, markerOptions) {
|
|
41
|
+
super(markerManager, markerOptions);
|
|
42
|
+
this.markers = [];
|
|
43
|
+
this.doInsertNodesWithMarkers = debounce(() => {
|
|
44
|
+
problem_composite_tree_node_1.ProblemCompositeTreeNode.addChildren(this.root, this.markers);
|
|
45
|
+
for (const { node, markers } of this.markers) {
|
|
46
|
+
const children = this.getMarkerNodes(node, markers);
|
|
47
|
+
node.numberOfMarkers = markers.length;
|
|
48
|
+
this.setChildren(node, children);
|
|
49
|
+
}
|
|
50
|
+
this.markers.length = 0;
|
|
51
|
+
}, 50);
|
|
52
|
+
}
|
|
53
|
+
getMarkerNodes(parent, markers) {
|
|
54
|
+
const nodes = super.getMarkerNodes(parent, markers);
|
|
55
|
+
return nodes.sort((a, b) => this.sortMarkers(a, b));
|
|
56
|
+
}
|
|
57
|
+
/**
|
|
58
|
+
* Sort markers based on the following rules:
|
|
59
|
+
* - Markers are fist sorted by `severity`.
|
|
60
|
+
* - Markers are sorted by `line number` if applicable.
|
|
61
|
+
* - Markers are sorted by `column number` if applicable.
|
|
62
|
+
* - Markers are then finally sorted by `owner` if applicable.
|
|
63
|
+
* @param a the first marker for comparison.
|
|
64
|
+
* @param b the second marker for comparison.
|
|
65
|
+
*/
|
|
66
|
+
sortMarkers(a, b) {
|
|
67
|
+
const markerA = a.marker;
|
|
68
|
+
const markerB = b.marker;
|
|
69
|
+
// Determine the marker with the highest severity.
|
|
70
|
+
const severity = problem_utils_1.ProblemUtils.severityCompareMarker(markerA, markerB);
|
|
71
|
+
if (severity !== 0) {
|
|
72
|
+
return severity;
|
|
73
|
+
}
|
|
74
|
+
// Determine the marker with the lower line number.
|
|
75
|
+
const lineNumber = problem_utils_1.ProblemUtils.lineNumberCompare(markerA, markerB);
|
|
76
|
+
if (lineNumber !== 0) {
|
|
77
|
+
return lineNumber;
|
|
78
|
+
}
|
|
79
|
+
// Determine the marker with the lower column number.
|
|
80
|
+
const columnNumber = problem_utils_1.ProblemUtils.columnNumberCompare(markerA, markerB);
|
|
81
|
+
if (columnNumber !== 0) {
|
|
82
|
+
return columnNumber;
|
|
83
|
+
}
|
|
84
|
+
// Sort by owner in alphabetical order.
|
|
85
|
+
const owner = problem_utils_1.ProblemUtils.ownerCompare(markerA, markerB);
|
|
86
|
+
if (owner !== 0) {
|
|
87
|
+
return owner;
|
|
88
|
+
}
|
|
89
|
+
return 0;
|
|
90
|
+
}
|
|
91
|
+
insertNodeWithMarkers(node, markers) {
|
|
92
|
+
this.markers.push({ node, markers });
|
|
93
|
+
this.doInsertNodesWithMarkers();
|
|
94
|
+
}
|
|
95
|
+
};
|
|
96
|
+
ProblemTree = __decorate([
|
|
97
|
+
(0, inversify_1.injectable)(),
|
|
98
|
+
__param(0, (0, inversify_1.inject)(problem_manager_1.ProblemManager)),
|
|
99
|
+
__param(1, (0, inversify_1.inject)(marker_tree_1.MarkerOptions)),
|
|
100
|
+
__metadata("design:paramtypes", [problem_manager_1.ProblemManager, Object])
|
|
101
|
+
], ProblemTree);
|
|
102
|
+
exports.ProblemTree = ProblemTree;
|
|
103
|
+
let ProblemTreeModel = class ProblemTreeModel extends marker_tree_model_1.MarkerTreeModel {
|
|
104
|
+
getOpenerOptionsByMarker(node) {
|
|
105
|
+
if (problem_marker_1.ProblemMarker.is(node.marker)) {
|
|
106
|
+
return {
|
|
107
|
+
selection: node.marker.data.range
|
|
108
|
+
};
|
|
109
|
+
}
|
|
110
|
+
return undefined;
|
|
111
|
+
}
|
|
112
|
+
removeNode(node) {
|
|
113
|
+
if (marker_tree_1.MarkerInfoNode.is(node)) {
|
|
114
|
+
this.problemManager.cleanAllMarkers(node.uri);
|
|
115
|
+
}
|
|
116
|
+
if (marker_tree_1.MarkerNode.is(node)) {
|
|
117
|
+
const { uri } = node;
|
|
118
|
+
const { owner } = node.marker;
|
|
119
|
+
const diagnostics = this.problemManager.findMarkers({ uri, owner, dataFilter: data => node.marker.data !== data }).map(({ data }) => data);
|
|
120
|
+
this.problemManager.setMarkers(uri, owner, diagnostics);
|
|
121
|
+
}
|
|
122
|
+
}
|
|
123
|
+
};
|
|
124
|
+
__decorate([
|
|
125
|
+
(0, inversify_1.inject)(problem_manager_1.ProblemManager),
|
|
126
|
+
__metadata("design:type", problem_manager_1.ProblemManager)
|
|
127
|
+
], ProblemTreeModel.prototype, "problemManager", void 0);
|
|
128
|
+
ProblemTreeModel = __decorate([
|
|
129
|
+
(0, inversify_1.injectable)()
|
|
130
|
+
], ProblemTreeModel);
|
|
131
|
+
exports.ProblemTreeModel = ProblemTreeModel;
|
|
132
132
|
//# sourceMappingURL=problem-tree-model.js.map
|
|
@@ -1,2 +1,2 @@
|
|
|
1
|
-
export {};
|
|
1
|
+
export {};
|
|
2
2
|
//# sourceMappingURL=problem-tree-model.spec.d.ts.map
|