@theia/markers 1.45.0 → 1.46.0-next.72
This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
- package/README.md +33 -33
- package/lib/browser/index.d.ts +2 -2
- package/lib/browser/index.js +29 -29
- package/lib/browser/marker-manager.d.ts +47 -47
- package/lib/browser/marker-manager.js +187 -187
- package/lib/browser/marker-tree-label-provider.d.ts +15 -15
- package/lib/browser/marker-tree-label-provider.js +84 -84
- package/lib/browser/marker-tree-label-provider.spec.d.ts +1 -1
- package/lib/browser/marker-tree-label-provider.spec.js +201 -201
- package/lib/browser/marker-tree-model.d.ts +12 -12
- package/lib/browser/marker-tree-model.js +60 -60
- package/lib/browser/marker-tree.d.ts +42 -42
- package/lib/browser/marker-tree.js +143 -143
- package/lib/browser/problem/problem-composite-tree-node.d.ts +11 -11
- package/lib/browser/problem/problem-composite-tree-node.js +76 -76
- package/lib/browser/problem/problem-composite-tree-node.spec.d.ts +1 -1
- package/lib/browser/problem/problem-composite-tree-node.spec.js +238 -238
- package/lib/browser/problem/problem-container.d.ts +8 -8
- package/lib/browser/problem/problem-container.js +46 -46
- package/lib/browser/problem/problem-contribution.d.ts +51 -51
- package/lib/browser/problem/problem-contribution.js +247 -247
- package/lib/browser/problem/problem-decorations-provider.d.ts +21 -21
- package/lib/browser/problem/problem-decorations-provider.js +95 -95
- package/lib/browser/problem/problem-decorator.d.ts +57 -57
- package/lib/browser/problem/problem-decorator.js +233 -233
- package/lib/browser/problem/problem-frontend-module.d.ts +4 -4
- package/lib/browser/problem/problem-frontend-module.js +55 -55
- package/lib/browser/problem/problem-layout-migrations.d.ts +5 -5
- package/lib/browser/problem/problem-layout-migrations.js +43 -43
- package/lib/browser/problem/problem-manager.d.ts +11 -11
- package/lib/browser/problem/problem-manager.js +53 -53
- package/lib/browser/problem/problem-manager.spec.d.ts +1 -1
- package/lib/browser/problem/problem-manager.spec.js +167 -167
- package/lib/browser/problem/problem-preferences.d.ts +13 -13
- package/lib/browser/problem/problem-preferences.js +56 -56
- package/lib/browser/problem/problem-selection.d.ts +12 -12
- package/lib/browser/problem/problem-selection.js +34 -34
- package/lib/browser/problem/problem-tabbar-decorator.d.ts +42 -42
- package/lib/browser/problem/problem-tabbar-decorator.js +160 -160
- package/lib/browser/problem/problem-tree-model.d.ts +32 -32
- package/lib/browser/problem/problem-tree-model.js +131 -131
- package/lib/browser/problem/problem-tree-model.spec.d.ts +1 -1
- package/lib/browser/problem/problem-tree-model.spec.js +172 -172
- package/lib/browser/problem/problem-utils.d.ts +44 -44
- package/lib/browser/problem/problem-utils.js +84 -84
- package/lib/browser/problem/problem-widget-tab-bar-decorator.d.ts +14 -14
- package/lib/browser/problem/problem-widget-tab-bar-decorator.js +69 -69
- package/lib/browser/problem/problem-widget.d.ts +46 -46
- package/lib/browser/problem/problem-widget.js +235 -235
- package/lib/common/marker.d.ts +16 -16
- package/lib/common/marker.js +31 -31
- package/lib/common/problem-marker.d.ts +9 -9
- package/lib/common/problem-marker.js +27 -27
- package/package.json +6 -6
- package/src/browser/index.ts +18 -18
- package/src/browser/marker-manager.ts +205 -205
- package/src/browser/marker-tree-label-provider.spec.ts +245 -245
- package/src/browser/marker-tree-label-provider.ts +75 -75
- package/src/browser/marker-tree-model.ts +47 -47
- package/src/browser/marker-tree.ts +154 -154
- package/src/browser/problem/problem-composite-tree-node.spec.ts +277 -277
- package/src/browser/problem/problem-composite-tree-node.ts +81 -81
- package/src/browser/problem/problem-container.ts +47 -47
- package/src/browser/problem/problem-contribution.ts +247 -247
- package/src/browser/problem/problem-decorations-provider.ts +72 -72
- package/src/browser/problem/problem-decorator.ts +222 -222
- package/src/browser/problem/problem-frontend-module.ts +64 -64
- package/src/browser/problem/problem-layout-migrations.ts +32 -32
- package/src/browser/problem/problem-manager.spec.ts +216 -216
- package/src/browser/problem/problem-manager.ts +51 -51
- package/src/browser/problem/problem-preferences.ts +64 -64
- package/src/browser/problem/problem-selection.ts +45 -45
- package/src/browser/problem/problem-tabbar-decorator.ts +151 -151
- package/src/browser/problem/problem-tree-model.spec.ts +189 -189
- package/src/browser/problem/problem-tree-model.ts +124 -124
- package/src/browser/problem/problem-utils.ts +90 -90
- package/src/browser/problem/problem-widget-tab-bar-decorator.ts +55 -55
- package/src/browser/problem/problem-widget.tsx +246 -246
- package/src/browser/style/index.css +92 -92
- package/src/common/marker.ts +53 -53
- package/src/common/problem-marker.ts +30 -30
|
@@ -1,236 +1,236 @@
|
|
|
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.ProblemMarkerRemoveButton = exports.ProblemWidget = exports.PROBLEMS_WIDGET_ID = void 0;
|
|
31
|
-
const inversify_1 = require("@theia/core/shared/inversify");
|
|
32
|
-
const problem_manager_1 = require("./problem-manager");
|
|
33
|
-
const problem_marker_1 = require("../../common/problem-marker");
|
|
34
|
-
const problem_tree_model_1 = require("./problem-tree-model");
|
|
35
|
-
const marker_tree_1 = require("../marker-tree");
|
|
36
|
-
const browser_1 = require("@theia/core/lib/browser");
|
|
37
|
-
const React = require("@theia/core/shared/react");
|
|
38
|
-
const problem_preferences_1 = require("./problem-preferences");
|
|
39
|
-
const disposable_1 = require("@theia/core/lib/common/disposable");
|
|
40
|
-
const nls_1 = require("@theia/core/lib/common/nls");
|
|
41
|
-
exports.PROBLEMS_WIDGET_ID = 'problems';
|
|
42
|
-
let ProblemWidget = class ProblemWidget extends browser_1.TreeWidget {
|
|
43
|
-
constructor(treeProps, model, contextMenuRenderer) {
|
|
44
|
-
super(treeProps, model, contextMenuRenderer);
|
|
45
|
-
this.model = model;
|
|
46
|
-
this.toDisposeOnCurrentWidgetChanged = new disposable_1.DisposableCollection();
|
|
47
|
-
this.id = exports.PROBLEMS_WIDGET_ID;
|
|
48
|
-
this.title.label = nls_1.nls.localizeByDefault('Problems');
|
|
49
|
-
this.title.caption = this.title.label;
|
|
50
|
-
this.title.iconClass = (0, browser_1.codicon)('warning');
|
|
51
|
-
this.title.closable = true;
|
|
52
|
-
this.addClass('theia-marker-container');
|
|
53
|
-
this.addClipboardListener(this.node, 'copy', e => this.handleCopy(e));
|
|
54
|
-
}
|
|
55
|
-
init() {
|
|
56
|
-
super.init();
|
|
57
|
-
this.updateFollowActiveEditor();
|
|
58
|
-
this.toDispose.push(this.preferences.onPreferenceChanged(e => {
|
|
59
|
-
if (e.preferenceName === 'problems.autoReveal') {
|
|
60
|
-
this.updateFollowActiveEditor();
|
|
61
|
-
}
|
|
62
|
-
}));
|
|
63
|
-
}
|
|
64
|
-
onActivateRequest(msg) {
|
|
65
|
-
super.onActivateRequest(msg);
|
|
66
|
-
this.update();
|
|
67
|
-
}
|
|
68
|
-
updateFollowActiveEditor() {
|
|
69
|
-
this.toDisposeOnCurrentWidgetChanged.dispose();
|
|
70
|
-
this.toDispose.push(this.toDisposeOnCurrentWidgetChanged);
|
|
71
|
-
if (this.preferences.get('problems.autoReveal')) {
|
|
72
|
-
this.followActiveEditor();
|
|
73
|
-
}
|
|
74
|
-
}
|
|
75
|
-
followActiveEditor() {
|
|
76
|
-
this.autoRevealFromActiveEditor();
|
|
77
|
-
this.toDisposeOnCurrentWidgetChanged.push(this.shell.onDidChangeCurrentWidget(() => this.autoRevealFromActiveEditor()));
|
|
78
|
-
}
|
|
79
|
-
autoRevealFromActiveEditor() {
|
|
80
|
-
const widget = this.shell.currentWidget;
|
|
81
|
-
if (widget && browser_1.Navigatable.is(widget)) {
|
|
82
|
-
const uri = widget.getResourceUri();
|
|
83
|
-
const node = uri && this.model.getNode(uri.toString());
|
|
84
|
-
if (browser_1.ExpandableTreeNode.is(node) && browser_1.SelectableTreeNode.is(node)) {
|
|
85
|
-
this.model.expandNode(node);
|
|
86
|
-
this.model.selectNode(node);
|
|
87
|
-
}
|
|
88
|
-
}
|
|
89
|
-
}
|
|
90
|
-
storeState() {
|
|
91
|
-
// no-op
|
|
92
|
-
return {};
|
|
93
|
-
}
|
|
94
|
-
superStoreState() {
|
|
95
|
-
return super.storeState();
|
|
96
|
-
}
|
|
97
|
-
restoreState(state) {
|
|
98
|
-
// no-op
|
|
99
|
-
}
|
|
100
|
-
superRestoreState(state) {
|
|
101
|
-
super.restoreState(state);
|
|
102
|
-
return;
|
|
103
|
-
}
|
|
104
|
-
tapNode(node) {
|
|
105
|
-
super.tapNode(node);
|
|
106
|
-
if (marker_tree_1.MarkerNode.is(node)) {
|
|
107
|
-
this.model.revealNode(node);
|
|
108
|
-
}
|
|
109
|
-
}
|
|
110
|
-
handleCopy(event) {
|
|
111
|
-
const uris = this.model.selectedNodes.filter(marker_tree_1.MarkerNode.is).map(node => node.uri.toString());
|
|
112
|
-
if (uris.length > 0 && event.clipboardData) {
|
|
113
|
-
event.clipboardData.setData('text/plain', uris.join('\n'));
|
|
114
|
-
event.preventDefault();
|
|
115
|
-
}
|
|
116
|
-
}
|
|
117
|
-
handleDown(event) {
|
|
118
|
-
const node = this.model.getNextSelectableNode();
|
|
119
|
-
super.handleDown(event);
|
|
120
|
-
if (marker_tree_1.MarkerNode.is(node)) {
|
|
121
|
-
this.model.revealNode(node);
|
|
122
|
-
}
|
|
123
|
-
}
|
|
124
|
-
handleUp(event) {
|
|
125
|
-
const node = this.model.getPrevSelectableNode();
|
|
126
|
-
super.handleUp(event);
|
|
127
|
-
if (marker_tree_1.MarkerNode.is(node)) {
|
|
128
|
-
this.model.revealNode(node);
|
|
129
|
-
}
|
|
130
|
-
}
|
|
131
|
-
renderTree(model) {
|
|
132
|
-
if (marker_tree_1.MarkerRootNode.is(model.root) && model.root.children.length > 0) {
|
|
133
|
-
return super.renderTree(model);
|
|
134
|
-
}
|
|
135
|
-
return React.createElement("div", { className: 'theia-widget-noInfo noMarkers' }, nls_1.nls.localize('theia/markers/noProblems', 'No problems have been detected in the workspace so far.'));
|
|
136
|
-
}
|
|
137
|
-
renderCaption(node, props) {
|
|
138
|
-
if (marker_tree_1.MarkerInfoNode.is(node)) {
|
|
139
|
-
return this.decorateMarkerFileNode(node);
|
|
140
|
-
}
|
|
141
|
-
else if (marker_tree_1.MarkerNode.is(node)) {
|
|
142
|
-
return this.decorateMarkerNode(node);
|
|
143
|
-
}
|
|
144
|
-
return 'caption';
|
|
145
|
-
}
|
|
146
|
-
renderTailDecorations(node, props) {
|
|
147
|
-
return React.createElement("div", { className: 'row-button-container' }, this.renderRemoveButton(node));
|
|
148
|
-
}
|
|
149
|
-
renderRemoveButton(node) {
|
|
150
|
-
return React.createElement(ProblemMarkerRemoveButton, { model: this.model, node: node });
|
|
151
|
-
}
|
|
152
|
-
decorateMarkerNode(node) {
|
|
153
|
-
if (problem_marker_1.ProblemMarker.is(node.marker)) {
|
|
154
|
-
let severityClass = '';
|
|
155
|
-
const problemMarker = node.marker;
|
|
156
|
-
if (problemMarker.data.severity) {
|
|
157
|
-
severityClass = this.getSeverityClass(problemMarker.data.severity);
|
|
158
|
-
}
|
|
159
|
-
const location = nls_1.nls.localizeByDefault('Ln {0}, Col {1}', problemMarker.data.range.start.line + 1, problemMarker.data.range.start.character + 1);
|
|
160
|
-
return React.createElement("div", { className: 'markerNode', title: `${problemMarker.data.message} (${problemMarker.data.range.start.line + 1}, ${problemMarker.data.range.start.character + 1})` },
|
|
161
|
-
React.createElement("div", null,
|
|
162
|
-
React.createElement("i", { className: `${severityClass} ${browser_1.TREE_NODE_INFO_CLASS}` })),
|
|
163
|
-
React.createElement("div", { className: 'message' },
|
|
164
|
-
problemMarker.data.message,
|
|
165
|
-
(!!problemMarker.data.source || !!problemMarker.data.code) &&
|
|
166
|
-
React.createElement("span", { className: 'owner ' + browser_1.TREE_NODE_INFO_CLASS },
|
|
167
|
-
problemMarker.data.source || '',
|
|
168
|
-
problemMarker.data.code ? `(${problemMarker.data.code})` : ''),
|
|
169
|
-
React.createElement("span", { className: 'position ' + browser_1.TREE_NODE_INFO_CLASS }, `[${location}]`)));
|
|
170
|
-
}
|
|
171
|
-
return '';
|
|
172
|
-
}
|
|
173
|
-
getSeverityClass(severity) {
|
|
174
|
-
switch (severity) {
|
|
175
|
-
case 1: return `${(0, browser_1.codicon)('error')} error`;
|
|
176
|
-
case 2: return `${(0, browser_1.codicon)('warning')} warning`;
|
|
177
|
-
case 3: return `${(0, browser_1.codicon)('info')} information`;
|
|
178
|
-
default: return `${(0, browser_1.codicon)('thumbsup')} hint`;
|
|
179
|
-
}
|
|
180
|
-
}
|
|
181
|
-
decorateMarkerFileNode(node) {
|
|
182
|
-
const icon = this.toNodeIcon(node);
|
|
183
|
-
const name = this.toNodeName(node);
|
|
184
|
-
const description = this.toNodeDescription(node);
|
|
185
|
-
// Use a custom scheme so that we fallback to the `DefaultUriLabelProviderContribution`.
|
|
186
|
-
const path = this.labelProvider.getLongName(node.uri.withScheme('marker'));
|
|
187
|
-
return React.createElement("div", { title: path, className: 'markerFileNode' },
|
|
188
|
-
icon && React.createElement("div", { className: icon + ' file-icon' }),
|
|
189
|
-
React.createElement("div", { className: 'name' }, name),
|
|
190
|
-
React.createElement("div", { className: 'path ' + browser_1.TREE_NODE_INFO_CLASS }, description),
|
|
191
|
-
React.createElement("div", { className: 'notification-count-container' },
|
|
192
|
-
React.createElement("span", { className: 'notification-count' }, node.numberOfMarkers.toString())));
|
|
193
|
-
}
|
|
194
|
-
};
|
|
195
|
-
__decorate([
|
|
196
|
-
(0, inversify_1.inject)(problem_preferences_1.ProblemPreferences),
|
|
197
|
-
__metadata("design:type", Object)
|
|
198
|
-
], ProblemWidget.prototype, "preferences", void 0);
|
|
199
|
-
__decorate([
|
|
200
|
-
(0, inversify_1.inject)(browser_1.ApplicationShell),
|
|
201
|
-
__metadata("design:type", browser_1.ApplicationShell)
|
|
202
|
-
], ProblemWidget.prototype, "shell", void 0);
|
|
203
|
-
__decorate([
|
|
204
|
-
(0, inversify_1.inject)(problem_manager_1.ProblemManager),
|
|
205
|
-
__metadata("design:type", problem_manager_1.ProblemManager)
|
|
206
|
-
], ProblemWidget.prototype, "problemManager", void 0);
|
|
207
|
-
__decorate([
|
|
208
|
-
(0, inversify_1.postConstruct)(),
|
|
209
|
-
__metadata("design:type", Function),
|
|
210
|
-
__metadata("design:paramtypes", []),
|
|
211
|
-
__metadata("design:returntype", void 0)
|
|
212
|
-
], ProblemWidget.prototype, "init", null);
|
|
213
|
-
ProblemWidget = __decorate([
|
|
214
|
-
(0, inversify_1.injectable)(),
|
|
215
|
-
__param(0, (0, inversify_1.inject)(browser_1.TreeProps)),
|
|
216
|
-
__param(1, (0, inversify_1.inject)(problem_tree_model_1.ProblemTreeModel)),
|
|
217
|
-
__param(2, (0, inversify_1.inject)(browser_1.ContextMenuRenderer)),
|
|
218
|
-
__metadata("design:paramtypes", [Object, problem_tree_model_1.ProblemTreeModel,
|
|
219
|
-
browser_1.ContextMenuRenderer])
|
|
220
|
-
], ProblemWidget);
|
|
221
|
-
exports.ProblemWidget = ProblemWidget;
|
|
222
|
-
class ProblemMarkerRemoveButton extends React.Component {
|
|
223
|
-
constructor() {
|
|
224
|
-
super(...arguments);
|
|
225
|
-
this.remove = (e) => this.doRemove(e);
|
|
226
|
-
}
|
|
227
|
-
render() {
|
|
228
|
-
return React.createElement("span", { className: (0, browser_1.codicon)('close'), onClick: this.remove });
|
|
229
|
-
}
|
|
230
|
-
doRemove(e) {
|
|
231
|
-
this.props.model.removeNode(this.props.node);
|
|
232
|
-
e.stopPropagation();
|
|
233
|
-
}
|
|
234
|
-
}
|
|
235
|
-
exports.ProblemMarkerRemoveButton = ProblemMarkerRemoveButton;
|
|
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.ProblemMarkerRemoveButton = exports.ProblemWidget = exports.PROBLEMS_WIDGET_ID = void 0;
|
|
31
|
+
const inversify_1 = require("@theia/core/shared/inversify");
|
|
32
|
+
const problem_manager_1 = require("./problem-manager");
|
|
33
|
+
const problem_marker_1 = require("../../common/problem-marker");
|
|
34
|
+
const problem_tree_model_1 = require("./problem-tree-model");
|
|
35
|
+
const marker_tree_1 = require("../marker-tree");
|
|
36
|
+
const browser_1 = require("@theia/core/lib/browser");
|
|
37
|
+
const React = require("@theia/core/shared/react");
|
|
38
|
+
const problem_preferences_1 = require("./problem-preferences");
|
|
39
|
+
const disposable_1 = require("@theia/core/lib/common/disposable");
|
|
40
|
+
const nls_1 = require("@theia/core/lib/common/nls");
|
|
41
|
+
exports.PROBLEMS_WIDGET_ID = 'problems';
|
|
42
|
+
let ProblemWidget = class ProblemWidget extends browser_1.TreeWidget {
|
|
43
|
+
constructor(treeProps, model, contextMenuRenderer) {
|
|
44
|
+
super(treeProps, model, contextMenuRenderer);
|
|
45
|
+
this.model = model;
|
|
46
|
+
this.toDisposeOnCurrentWidgetChanged = new disposable_1.DisposableCollection();
|
|
47
|
+
this.id = exports.PROBLEMS_WIDGET_ID;
|
|
48
|
+
this.title.label = nls_1.nls.localizeByDefault('Problems');
|
|
49
|
+
this.title.caption = this.title.label;
|
|
50
|
+
this.title.iconClass = (0, browser_1.codicon)('warning');
|
|
51
|
+
this.title.closable = true;
|
|
52
|
+
this.addClass('theia-marker-container');
|
|
53
|
+
this.addClipboardListener(this.node, 'copy', e => this.handleCopy(e));
|
|
54
|
+
}
|
|
55
|
+
init() {
|
|
56
|
+
super.init();
|
|
57
|
+
this.updateFollowActiveEditor();
|
|
58
|
+
this.toDispose.push(this.preferences.onPreferenceChanged(e => {
|
|
59
|
+
if (e.preferenceName === 'problems.autoReveal') {
|
|
60
|
+
this.updateFollowActiveEditor();
|
|
61
|
+
}
|
|
62
|
+
}));
|
|
63
|
+
}
|
|
64
|
+
onActivateRequest(msg) {
|
|
65
|
+
super.onActivateRequest(msg);
|
|
66
|
+
this.update();
|
|
67
|
+
}
|
|
68
|
+
updateFollowActiveEditor() {
|
|
69
|
+
this.toDisposeOnCurrentWidgetChanged.dispose();
|
|
70
|
+
this.toDispose.push(this.toDisposeOnCurrentWidgetChanged);
|
|
71
|
+
if (this.preferences.get('problems.autoReveal')) {
|
|
72
|
+
this.followActiveEditor();
|
|
73
|
+
}
|
|
74
|
+
}
|
|
75
|
+
followActiveEditor() {
|
|
76
|
+
this.autoRevealFromActiveEditor();
|
|
77
|
+
this.toDisposeOnCurrentWidgetChanged.push(this.shell.onDidChangeCurrentWidget(() => this.autoRevealFromActiveEditor()));
|
|
78
|
+
}
|
|
79
|
+
autoRevealFromActiveEditor() {
|
|
80
|
+
const widget = this.shell.currentWidget;
|
|
81
|
+
if (widget && browser_1.Navigatable.is(widget)) {
|
|
82
|
+
const uri = widget.getResourceUri();
|
|
83
|
+
const node = uri && this.model.getNode(uri.toString());
|
|
84
|
+
if (browser_1.ExpandableTreeNode.is(node) && browser_1.SelectableTreeNode.is(node)) {
|
|
85
|
+
this.model.expandNode(node);
|
|
86
|
+
this.model.selectNode(node);
|
|
87
|
+
}
|
|
88
|
+
}
|
|
89
|
+
}
|
|
90
|
+
storeState() {
|
|
91
|
+
// no-op
|
|
92
|
+
return {};
|
|
93
|
+
}
|
|
94
|
+
superStoreState() {
|
|
95
|
+
return super.storeState();
|
|
96
|
+
}
|
|
97
|
+
restoreState(state) {
|
|
98
|
+
// no-op
|
|
99
|
+
}
|
|
100
|
+
superRestoreState(state) {
|
|
101
|
+
super.restoreState(state);
|
|
102
|
+
return;
|
|
103
|
+
}
|
|
104
|
+
tapNode(node) {
|
|
105
|
+
super.tapNode(node);
|
|
106
|
+
if (marker_tree_1.MarkerNode.is(node)) {
|
|
107
|
+
this.model.revealNode(node);
|
|
108
|
+
}
|
|
109
|
+
}
|
|
110
|
+
handleCopy(event) {
|
|
111
|
+
const uris = this.model.selectedNodes.filter(marker_tree_1.MarkerNode.is).map(node => node.uri.toString());
|
|
112
|
+
if (uris.length > 0 && event.clipboardData) {
|
|
113
|
+
event.clipboardData.setData('text/plain', uris.join('\n'));
|
|
114
|
+
event.preventDefault();
|
|
115
|
+
}
|
|
116
|
+
}
|
|
117
|
+
handleDown(event) {
|
|
118
|
+
const node = this.model.getNextSelectableNode();
|
|
119
|
+
super.handleDown(event);
|
|
120
|
+
if (marker_tree_1.MarkerNode.is(node)) {
|
|
121
|
+
this.model.revealNode(node);
|
|
122
|
+
}
|
|
123
|
+
}
|
|
124
|
+
handleUp(event) {
|
|
125
|
+
const node = this.model.getPrevSelectableNode();
|
|
126
|
+
super.handleUp(event);
|
|
127
|
+
if (marker_tree_1.MarkerNode.is(node)) {
|
|
128
|
+
this.model.revealNode(node);
|
|
129
|
+
}
|
|
130
|
+
}
|
|
131
|
+
renderTree(model) {
|
|
132
|
+
if (marker_tree_1.MarkerRootNode.is(model.root) && model.root.children.length > 0) {
|
|
133
|
+
return super.renderTree(model);
|
|
134
|
+
}
|
|
135
|
+
return React.createElement("div", { className: 'theia-widget-noInfo noMarkers' }, nls_1.nls.localize('theia/markers/noProblems', 'No problems have been detected in the workspace so far.'));
|
|
136
|
+
}
|
|
137
|
+
renderCaption(node, props) {
|
|
138
|
+
if (marker_tree_1.MarkerInfoNode.is(node)) {
|
|
139
|
+
return this.decorateMarkerFileNode(node);
|
|
140
|
+
}
|
|
141
|
+
else if (marker_tree_1.MarkerNode.is(node)) {
|
|
142
|
+
return this.decorateMarkerNode(node);
|
|
143
|
+
}
|
|
144
|
+
return 'caption';
|
|
145
|
+
}
|
|
146
|
+
renderTailDecorations(node, props) {
|
|
147
|
+
return React.createElement("div", { className: 'row-button-container' }, this.renderRemoveButton(node));
|
|
148
|
+
}
|
|
149
|
+
renderRemoveButton(node) {
|
|
150
|
+
return React.createElement(ProblemMarkerRemoveButton, { model: this.model, node: node });
|
|
151
|
+
}
|
|
152
|
+
decorateMarkerNode(node) {
|
|
153
|
+
if (problem_marker_1.ProblemMarker.is(node.marker)) {
|
|
154
|
+
let severityClass = '';
|
|
155
|
+
const problemMarker = node.marker;
|
|
156
|
+
if (problemMarker.data.severity) {
|
|
157
|
+
severityClass = this.getSeverityClass(problemMarker.data.severity);
|
|
158
|
+
}
|
|
159
|
+
const location = nls_1.nls.localizeByDefault('Ln {0}, Col {1}', problemMarker.data.range.start.line + 1, problemMarker.data.range.start.character + 1);
|
|
160
|
+
return React.createElement("div", { className: 'markerNode', title: `${problemMarker.data.message} (${problemMarker.data.range.start.line + 1}, ${problemMarker.data.range.start.character + 1})` },
|
|
161
|
+
React.createElement("div", null,
|
|
162
|
+
React.createElement("i", { className: `${severityClass} ${browser_1.TREE_NODE_INFO_CLASS}` })),
|
|
163
|
+
React.createElement("div", { className: 'message' },
|
|
164
|
+
problemMarker.data.message,
|
|
165
|
+
(!!problemMarker.data.source || !!problemMarker.data.code) &&
|
|
166
|
+
React.createElement("span", { className: 'owner ' + browser_1.TREE_NODE_INFO_CLASS },
|
|
167
|
+
problemMarker.data.source || '',
|
|
168
|
+
problemMarker.data.code ? `(${problemMarker.data.code})` : ''),
|
|
169
|
+
React.createElement("span", { className: 'position ' + browser_1.TREE_NODE_INFO_CLASS }, `[${location}]`)));
|
|
170
|
+
}
|
|
171
|
+
return '';
|
|
172
|
+
}
|
|
173
|
+
getSeverityClass(severity) {
|
|
174
|
+
switch (severity) {
|
|
175
|
+
case 1: return `${(0, browser_1.codicon)('error')} error`;
|
|
176
|
+
case 2: return `${(0, browser_1.codicon)('warning')} warning`;
|
|
177
|
+
case 3: return `${(0, browser_1.codicon)('info')} information`;
|
|
178
|
+
default: return `${(0, browser_1.codicon)('thumbsup')} hint`;
|
|
179
|
+
}
|
|
180
|
+
}
|
|
181
|
+
decorateMarkerFileNode(node) {
|
|
182
|
+
const icon = this.toNodeIcon(node);
|
|
183
|
+
const name = this.toNodeName(node);
|
|
184
|
+
const description = this.toNodeDescription(node);
|
|
185
|
+
// Use a custom scheme so that we fallback to the `DefaultUriLabelProviderContribution`.
|
|
186
|
+
const path = this.labelProvider.getLongName(node.uri.withScheme('marker'));
|
|
187
|
+
return React.createElement("div", { title: path, className: 'markerFileNode' },
|
|
188
|
+
icon && React.createElement("div", { className: icon + ' file-icon' }),
|
|
189
|
+
React.createElement("div", { className: 'name' }, name),
|
|
190
|
+
React.createElement("div", { className: 'path ' + browser_1.TREE_NODE_INFO_CLASS }, description),
|
|
191
|
+
React.createElement("div", { className: 'notification-count-container' },
|
|
192
|
+
React.createElement("span", { className: 'notification-count' }, node.numberOfMarkers.toString())));
|
|
193
|
+
}
|
|
194
|
+
};
|
|
195
|
+
__decorate([
|
|
196
|
+
(0, inversify_1.inject)(problem_preferences_1.ProblemPreferences),
|
|
197
|
+
__metadata("design:type", Object)
|
|
198
|
+
], ProblemWidget.prototype, "preferences", void 0);
|
|
199
|
+
__decorate([
|
|
200
|
+
(0, inversify_1.inject)(browser_1.ApplicationShell),
|
|
201
|
+
__metadata("design:type", browser_1.ApplicationShell)
|
|
202
|
+
], ProblemWidget.prototype, "shell", void 0);
|
|
203
|
+
__decorate([
|
|
204
|
+
(0, inversify_1.inject)(problem_manager_1.ProblemManager),
|
|
205
|
+
__metadata("design:type", problem_manager_1.ProblemManager)
|
|
206
|
+
], ProblemWidget.prototype, "problemManager", void 0);
|
|
207
|
+
__decorate([
|
|
208
|
+
(0, inversify_1.postConstruct)(),
|
|
209
|
+
__metadata("design:type", Function),
|
|
210
|
+
__metadata("design:paramtypes", []),
|
|
211
|
+
__metadata("design:returntype", void 0)
|
|
212
|
+
], ProblemWidget.prototype, "init", null);
|
|
213
|
+
ProblemWidget = __decorate([
|
|
214
|
+
(0, inversify_1.injectable)(),
|
|
215
|
+
__param(0, (0, inversify_1.inject)(browser_1.TreeProps)),
|
|
216
|
+
__param(1, (0, inversify_1.inject)(problem_tree_model_1.ProblemTreeModel)),
|
|
217
|
+
__param(2, (0, inversify_1.inject)(browser_1.ContextMenuRenderer)),
|
|
218
|
+
__metadata("design:paramtypes", [Object, problem_tree_model_1.ProblemTreeModel,
|
|
219
|
+
browser_1.ContextMenuRenderer])
|
|
220
|
+
], ProblemWidget);
|
|
221
|
+
exports.ProblemWidget = ProblemWidget;
|
|
222
|
+
class ProblemMarkerRemoveButton extends React.Component {
|
|
223
|
+
constructor() {
|
|
224
|
+
super(...arguments);
|
|
225
|
+
this.remove = (e) => this.doRemove(e);
|
|
226
|
+
}
|
|
227
|
+
render() {
|
|
228
|
+
return React.createElement("span", { className: (0, browser_1.codicon)('close'), onClick: this.remove });
|
|
229
|
+
}
|
|
230
|
+
doRemove(e) {
|
|
231
|
+
this.props.model.removeNode(this.props.node);
|
|
232
|
+
e.stopPropagation();
|
|
233
|
+
}
|
|
234
|
+
}
|
|
235
|
+
exports.ProblemMarkerRemoveButton = ProblemMarkerRemoveButton;
|
|
236
236
|
//# sourceMappingURL=problem-widget.js.map
|
package/lib/common/marker.d.ts
CHANGED
|
@@ -1,17 +1,17 @@
|
|
|
1
|
-
export interface Marker<T> {
|
|
2
|
-
/**
|
|
3
|
-
* the uri this marker is associated with.
|
|
4
|
-
*/
|
|
5
|
-
uri: string;
|
|
6
|
-
owner: string;
|
|
7
|
-
/**
|
|
8
|
-
* the kind, e.g. 'problem'
|
|
9
|
-
*/
|
|
10
|
-
kind?: string;
|
|
11
|
-
data: T;
|
|
12
|
-
}
|
|
13
|
-
export declare namespace Marker {
|
|
14
|
-
function is(value: unknown): value is Marker<object>;
|
|
15
|
-
function is<T>(value: unknown, subTypeCheck: (value: unknown) => value is T): value is Marker<T>;
|
|
16
|
-
}
|
|
1
|
+
export interface Marker<T> {
|
|
2
|
+
/**
|
|
3
|
+
* the uri this marker is associated with.
|
|
4
|
+
*/
|
|
5
|
+
uri: string;
|
|
6
|
+
owner: string;
|
|
7
|
+
/**
|
|
8
|
+
* the kind, e.g. 'problem'
|
|
9
|
+
*/
|
|
10
|
+
kind?: string;
|
|
11
|
+
data: T;
|
|
12
|
+
}
|
|
13
|
+
export declare namespace Marker {
|
|
14
|
+
function is(value: unknown): value is Marker<object>;
|
|
15
|
+
function is<T>(value: unknown, subTypeCheck: (value: unknown) => value is T): value is Marker<T>;
|
|
16
|
+
}
|
|
17
17
|
//# sourceMappingURL=marker.d.ts.map
|
package/lib/common/marker.js
CHANGED
|
@@ -1,32 +1,32 @@
|
|
|
1
|
-
"use strict";
|
|
2
|
-
// *****************************************************************************
|
|
3
|
-
// Copyright (C) 2017 Ericsson 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.Marker = void 0;
|
|
19
|
-
const types_1 = require("@theia/core/lib/common/types");
|
|
20
|
-
var Marker;
|
|
21
|
-
(function (Marker) {
|
|
22
|
-
function is(value, subTypeCheck) {
|
|
23
|
-
subTypeCheck !== null && subTypeCheck !== void 0 ? subTypeCheck : (subTypeCheck = types_1.isObject);
|
|
24
|
-
return (0, types_1.isObject)(value)
|
|
25
|
-
&& !Array.isArray(value)
|
|
26
|
-
&& subTypeCheck(value.data)
|
|
27
|
-
&& (0, types_1.isString)(value.uri)
|
|
28
|
-
&& (0, types_1.isString)(value.owner);
|
|
29
|
-
}
|
|
30
|
-
Marker.is = is;
|
|
31
|
-
})(Marker = exports.Marker || (exports.Marker = {}));
|
|
1
|
+
"use strict";
|
|
2
|
+
// *****************************************************************************
|
|
3
|
+
// Copyright (C) 2017 Ericsson 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.Marker = void 0;
|
|
19
|
+
const types_1 = require("@theia/core/lib/common/types");
|
|
20
|
+
var Marker;
|
|
21
|
+
(function (Marker) {
|
|
22
|
+
function is(value, subTypeCheck) {
|
|
23
|
+
subTypeCheck !== null && subTypeCheck !== void 0 ? subTypeCheck : (subTypeCheck = types_1.isObject);
|
|
24
|
+
return (0, types_1.isObject)(value)
|
|
25
|
+
&& !Array.isArray(value)
|
|
26
|
+
&& subTypeCheck(value.data)
|
|
27
|
+
&& (0, types_1.isString)(value.uri)
|
|
28
|
+
&& (0, types_1.isString)(value.owner);
|
|
29
|
+
}
|
|
30
|
+
Marker.is = is;
|
|
31
|
+
})(Marker = exports.Marker || (exports.Marker = {}));
|
|
32
32
|
//# sourceMappingURL=marker.js.map
|
|
@@ -1,10 +1,10 @@
|
|
|
1
|
-
import { Marker } from './marker';
|
|
2
|
-
import { Diagnostic } from '@theia/core/shared/vscode-languageserver-protocol';
|
|
3
|
-
export declare const PROBLEM_KIND = "problem";
|
|
4
|
-
export interface ProblemMarker extends Marker<Diagnostic> {
|
|
5
|
-
kind: 'problem';
|
|
6
|
-
}
|
|
7
|
-
export declare namespace ProblemMarker {
|
|
8
|
-
function is(node: unknown): node is ProblemMarker;
|
|
9
|
-
}
|
|
1
|
+
import { Marker } from './marker';
|
|
2
|
+
import { Diagnostic } from '@theia/core/shared/vscode-languageserver-protocol';
|
|
3
|
+
export declare const PROBLEM_KIND = "problem";
|
|
4
|
+
export interface ProblemMarker extends Marker<Diagnostic> {
|
|
5
|
+
kind: 'problem';
|
|
6
|
+
}
|
|
7
|
+
export declare namespace ProblemMarker {
|
|
8
|
+
function is(node: unknown): node is ProblemMarker;
|
|
9
|
+
}
|
|
10
10
|
//# sourceMappingURL=problem-marker.d.ts.map
|