@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,44 +1,44 @@
|
|
|
1
|
-
"use strict";
|
|
2
|
-
// *****************************************************************************
|
|
3
|
-
// Copyright (C) 2019 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
|
-
Object.defineProperty(exports, "__esModule", { value: true });
|
|
24
|
-
exports.ProblemLayoutVersion3Migration = void 0;
|
|
25
|
-
const inversify_1 = require("@theia/core/shared/inversify");
|
|
26
|
-
const problem_marker_1 = require("../../common/problem-marker");
|
|
27
|
-
const problem_widget_1 = require("./problem-widget");
|
|
28
|
-
let ProblemLayoutVersion3Migration = class ProblemLayoutVersion3Migration {
|
|
29
|
-
constructor() {
|
|
30
|
-
this.layoutVersion = 3.0;
|
|
31
|
-
}
|
|
32
|
-
onWillInflateWidget(desc) {
|
|
33
|
-
if (desc.constructionOptions.factoryId === problem_marker_1.PROBLEM_KIND) {
|
|
34
|
-
desc.constructionOptions.factoryId = problem_widget_1.PROBLEMS_WIDGET_ID;
|
|
35
|
-
return desc;
|
|
36
|
-
}
|
|
37
|
-
return undefined;
|
|
38
|
-
}
|
|
39
|
-
};
|
|
40
|
-
ProblemLayoutVersion3Migration = __decorate([
|
|
41
|
-
(0, inversify_1.injectable)()
|
|
42
|
-
], ProblemLayoutVersion3Migration);
|
|
43
|
-
exports.ProblemLayoutVersion3Migration = ProblemLayoutVersion3Migration;
|
|
1
|
+
"use strict";
|
|
2
|
+
// *****************************************************************************
|
|
3
|
+
// Copyright (C) 2019 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
|
+
Object.defineProperty(exports, "__esModule", { value: true });
|
|
24
|
+
exports.ProblemLayoutVersion3Migration = void 0;
|
|
25
|
+
const inversify_1 = require("@theia/core/shared/inversify");
|
|
26
|
+
const problem_marker_1 = require("../../common/problem-marker");
|
|
27
|
+
const problem_widget_1 = require("./problem-widget");
|
|
28
|
+
let ProblemLayoutVersion3Migration = class ProblemLayoutVersion3Migration {
|
|
29
|
+
constructor() {
|
|
30
|
+
this.layoutVersion = 3.0;
|
|
31
|
+
}
|
|
32
|
+
onWillInflateWidget(desc) {
|
|
33
|
+
if (desc.constructionOptions.factoryId === problem_marker_1.PROBLEM_KIND) {
|
|
34
|
+
desc.constructionOptions.factoryId = problem_widget_1.PROBLEMS_WIDGET_ID;
|
|
35
|
+
return desc;
|
|
36
|
+
}
|
|
37
|
+
return undefined;
|
|
38
|
+
}
|
|
39
|
+
};
|
|
40
|
+
ProblemLayoutVersion3Migration = __decorate([
|
|
41
|
+
(0, inversify_1.injectable)()
|
|
42
|
+
], ProblemLayoutVersion3Migration);
|
|
43
|
+
exports.ProblemLayoutVersion3Migration = ProblemLayoutVersion3Migration;
|
|
44
44
|
//# sourceMappingURL=problem-layout-migrations.js.map
|
|
@@ -1,12 +1,12 @@
|
|
|
1
|
-
import { MarkerManager } from '../marker-manager';
|
|
2
|
-
import { Diagnostic } from '@theia/core/shared/vscode-languageserver-protocol';
|
|
3
|
-
export interface ProblemStat {
|
|
4
|
-
errors: number;
|
|
5
|
-
warnings: number;
|
|
6
|
-
infos: number;
|
|
7
|
-
}
|
|
8
|
-
export declare class ProblemManager extends MarkerManager<Diagnostic> {
|
|
9
|
-
getKind(): string;
|
|
10
|
-
getProblemStat(): ProblemStat;
|
|
11
|
-
}
|
|
1
|
+
import { MarkerManager } from '../marker-manager';
|
|
2
|
+
import { Diagnostic } from '@theia/core/shared/vscode-languageserver-protocol';
|
|
3
|
+
export interface ProblemStat {
|
|
4
|
+
errors: number;
|
|
5
|
+
warnings: number;
|
|
6
|
+
infos: number;
|
|
7
|
+
}
|
|
8
|
+
export declare class ProblemManager extends MarkerManager<Diagnostic> {
|
|
9
|
+
getKind(): string;
|
|
10
|
+
getProblemStat(): ProblemStat;
|
|
11
|
+
}
|
|
12
12
|
//# sourceMappingURL=problem-manager.d.ts.map
|
|
@@ -1,54 +1,54 @@
|
|
|
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
|
-
Object.defineProperty(exports, "__esModule", { value: true });
|
|
24
|
-
exports.ProblemManager = void 0;
|
|
25
|
-
const inversify_1 = require("@theia/core/shared/inversify");
|
|
26
|
-
const marker_manager_1 = require("../marker-manager");
|
|
27
|
-
const problem_marker_1 = require("../../common/problem-marker");
|
|
28
|
-
let ProblemManager = class ProblemManager extends marker_manager_1.MarkerManager {
|
|
29
|
-
getKind() {
|
|
30
|
-
return problem_marker_1.PROBLEM_KIND;
|
|
31
|
-
}
|
|
32
|
-
getProblemStat() {
|
|
33
|
-
let errors = 0;
|
|
34
|
-
let warnings = 0;
|
|
35
|
-
let infos = 0;
|
|
36
|
-
for (const marker of this.findMarkers()) {
|
|
37
|
-
if (marker.data.severity === 1) {
|
|
38
|
-
errors++;
|
|
39
|
-
}
|
|
40
|
-
else if (marker.data.severity === 2) {
|
|
41
|
-
warnings++;
|
|
42
|
-
}
|
|
43
|
-
else if (marker.data.severity === 3) {
|
|
44
|
-
infos++;
|
|
45
|
-
}
|
|
46
|
-
}
|
|
47
|
-
return { errors, warnings, infos };
|
|
48
|
-
}
|
|
49
|
-
};
|
|
50
|
-
ProblemManager = __decorate([
|
|
51
|
-
(0, inversify_1.injectable)()
|
|
52
|
-
], ProblemManager);
|
|
53
|
-
exports.ProblemManager = ProblemManager;
|
|
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
|
+
Object.defineProperty(exports, "__esModule", { value: true });
|
|
24
|
+
exports.ProblemManager = void 0;
|
|
25
|
+
const inversify_1 = require("@theia/core/shared/inversify");
|
|
26
|
+
const marker_manager_1 = require("../marker-manager");
|
|
27
|
+
const problem_marker_1 = require("../../common/problem-marker");
|
|
28
|
+
let ProblemManager = class ProblemManager extends marker_manager_1.MarkerManager {
|
|
29
|
+
getKind() {
|
|
30
|
+
return problem_marker_1.PROBLEM_KIND;
|
|
31
|
+
}
|
|
32
|
+
getProblemStat() {
|
|
33
|
+
let errors = 0;
|
|
34
|
+
let warnings = 0;
|
|
35
|
+
let infos = 0;
|
|
36
|
+
for (const marker of this.findMarkers()) {
|
|
37
|
+
if (marker.data.severity === 1) {
|
|
38
|
+
errors++;
|
|
39
|
+
}
|
|
40
|
+
else if (marker.data.severity === 2) {
|
|
41
|
+
warnings++;
|
|
42
|
+
}
|
|
43
|
+
else if (marker.data.severity === 3) {
|
|
44
|
+
infos++;
|
|
45
|
+
}
|
|
46
|
+
}
|
|
47
|
+
return { errors, warnings, infos };
|
|
48
|
+
}
|
|
49
|
+
};
|
|
50
|
+
ProblemManager = __decorate([
|
|
51
|
+
(0, inversify_1.injectable)()
|
|
52
|
+
], ProblemManager);
|
|
53
|
+
exports.ProblemManager = ProblemManager;
|
|
54
54
|
//# sourceMappingURL=problem-manager.js.map
|
|
@@ -1,2 +1,2 @@
|
|
|
1
|
-
export {};
|
|
1
|
+
export {};
|
|
2
2
|
//# sourceMappingURL=problem-manager.spec.d.ts.map
|
|
@@ -1,168 +1,168 @@
|
|
|
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
|
-
Object.defineProperty(exports, "__esModule", { value: true });
|
|
18
|
-
const jsdom_1 = require("@theia/core/lib/browser/test/jsdom");
|
|
19
|
-
const disableJSDOM = (0, jsdom_1.enableJSDOM)();
|
|
20
|
-
const chai = require("chai");
|
|
21
|
-
const uri_1 = require("@theia/core/lib/common/uri");
|
|
22
|
-
const inversify_1 = require("@theia/core/shared/inversify");
|
|
23
|
-
const problem_manager_1 = require("./problem-manager");
|
|
24
|
-
const event_1 = require("@theia/core/lib/common/event");
|
|
25
|
-
const logger_1 = require("@theia/core/lib/common/logger");
|
|
26
|
-
const vscode_languageserver_protocol_1 = require("@theia/core/shared/vscode-languageserver-protocol");
|
|
27
|
-
const mock_logger_1 = require("@theia/core/lib/common/test/mock-logger");
|
|
28
|
-
const file_service_1 = require("@theia/filesystem/lib/browser/file-service");
|
|
29
|
-
const storage_service_1 = require("@theia/core/lib/browser/storage-service");
|
|
30
|
-
disableJSDOM();
|
|
31
|
-
const expect = chai.expect;
|
|
32
|
-
let manager;
|
|
33
|
-
let container;
|
|
34
|
-
/**
|
|
35
|
-
* The default range for test purposes.
|
|
36
|
-
*/
|
|
37
|
-
const range = { start: { line: 0, character: 10 }, end: { line: 0, character: 10 } };
|
|
38
|
-
describe('problem-manager', () => {
|
|
39
|
-
beforeEach(() => {
|
|
40
|
-
container = new inversify_1.Container();
|
|
41
|
-
container.bind(logger_1.ILogger).to(mock_logger_1.MockLogger);
|
|
42
|
-
container.bind(storage_service_1.StorageService).to(storage_service_1.LocalStorageService).inSingletonScope();
|
|
43
|
-
container.bind(storage_service_1.LocalStorageService).toSelf().inSingletonScope();
|
|
44
|
-
container.bind(file_service_1.FileService).toConstantValue({
|
|
45
|
-
onDidFilesChange: event_1.Event.None
|
|
46
|
-
});
|
|
47
|
-
container.bind(problem_manager_1.ProblemManager).toSelf();
|
|
48
|
-
manager = container.get(problem_manager_1.ProblemManager);
|
|
49
|
-
});
|
|
50
|
-
describe('#setMarkers', () => {
|
|
51
|
-
it('should successfully set new markers', () => {
|
|
52
|
-
expect(Array.from(manager.getUris()).length).to.equal(0);
|
|
53
|
-
manager.setMarkers(new uri_1.default('a'), 'a', [{ message: 'a', range }]);
|
|
54
|
-
expect(Array.from(manager.getUris()).length).to.equal(1);
|
|
55
|
-
});
|
|
56
|
-
it('should replace markers', () => {
|
|
57
|
-
const uri = new uri_1.default('a');
|
|
58
|
-
let events = 0;
|
|
59
|
-
manager.onDidChangeMarkers(() => events++);
|
|
60
|
-
expect(events).equal(0);
|
|
61
|
-
const initial = manager.setMarkers(uri, 'a', [{ message: 'a', range }]);
|
|
62
|
-
expect(initial.length).equal(0);
|
|
63
|
-
expect(events).equal(1);
|
|
64
|
-
const updated = manager.setMarkers(uri, 'a', [{ message: 'a', range }]);
|
|
65
|
-
expect(updated.length).equal(1);
|
|
66
|
-
expect(events).equal(2);
|
|
67
|
-
expect(manager.findMarkers({ uri }).length).equal(1);
|
|
68
|
-
});
|
|
69
|
-
});
|
|
70
|
-
describe('#cleanAllMarkers', () => {
|
|
71
|
-
it('should successfully clean all markers', () => {
|
|
72
|
-
// Create mock markers.
|
|
73
|
-
manager.setMarkers(new uri_1.default('a'), 'a', [{ message: 'a', range }]);
|
|
74
|
-
manager.setMarkers(new uri_1.default('b'), 'b', [{ message: 'a', range }]);
|
|
75
|
-
manager.setMarkers(new uri_1.default('c'), 'c', [{ message: 'a', range }]);
|
|
76
|
-
expect(Array.from(manager.getUris()).length).to.equal(3);
|
|
77
|
-
// Clean the markers.
|
|
78
|
-
manager.cleanAllMarkers();
|
|
79
|
-
expect(Array.from(manager.getUris()).length).to.equal(0);
|
|
80
|
-
});
|
|
81
|
-
});
|
|
82
|
-
describe('#findMarkers', () => {
|
|
83
|
-
it('should find markers by `owner`', () => {
|
|
84
|
-
const owner = 'foo';
|
|
85
|
-
manager.setMarkers(new uri_1.default('a'), owner, [{ message: 'a', range }]);
|
|
86
|
-
manager.setMarkers(new uri_1.default('b'), owner, [{ message: 'a', range }]);
|
|
87
|
-
expect(manager.findMarkers({ owner }).length).equal(2);
|
|
88
|
-
expect(manager.findMarkers({ owner: 'unknown' }).length).equal(0);
|
|
89
|
-
});
|
|
90
|
-
it('should find markers by `owner` and `uri`', () => {
|
|
91
|
-
const owner = 'foo';
|
|
92
|
-
const uri = new uri_1.default('bar');
|
|
93
|
-
// Create a marker to match the filter.
|
|
94
|
-
manager.setMarkers(uri, owner, [{ message: 'a', range }]);
|
|
95
|
-
// Create 2 markers that do not match the filter.
|
|
96
|
-
manager.setMarkers(new uri_1.default('invalid'), 'invalid-owner', [{ message: 'a', range }]);
|
|
97
|
-
manager.setMarkers(new uri_1.default('invalid'), 'invalid-owner', [{ message: 'a', range }]);
|
|
98
|
-
// Expect to find the markers which satisfy the filter only.
|
|
99
|
-
expect(manager.findMarkers({ owner, uri }).length).equal(1);
|
|
100
|
-
});
|
|
101
|
-
describe('dataFilter', () => {
|
|
102
|
-
it('should find markers that satisfy filter for `severity`', () => {
|
|
103
|
-
manager.setMarkers(new uri_1.default('a'), 'a', [{ message: 'a', range, severity: vscode_languageserver_protocol_1.DiagnosticSeverity.Error }]);
|
|
104
|
-
expect(manager.findMarkers({ dataFilter: d => d.severity === vscode_languageserver_protocol_1.DiagnosticSeverity.Error }).length).equal(1);
|
|
105
|
-
expect(manager.findMarkers({ dataFilter: d => d.severity !== vscode_languageserver_protocol_1.DiagnosticSeverity.Error }).length).equal(0);
|
|
106
|
-
});
|
|
107
|
-
it('should find markers that satisfy filter for `code`', () => {
|
|
108
|
-
const code = 100;
|
|
109
|
-
manager.setMarkers(new uri_1.default('a'), 'a', [{ message: 'a', range, code }]);
|
|
110
|
-
expect(manager.findMarkers({ dataFilter: d => d.code === code }).length).equal(1);
|
|
111
|
-
expect(manager.findMarkers({ dataFilter: d => d.code !== code }).length).equal(0);
|
|
112
|
-
});
|
|
113
|
-
it('should find markers that satisfy filter for `message`', () => {
|
|
114
|
-
const message = 'foo';
|
|
115
|
-
manager.setMarkers(new uri_1.default('a'), 'a', [{ message, range }]);
|
|
116
|
-
expect(manager.findMarkers({ dataFilter: d => d.message === message }).length).equal(1);
|
|
117
|
-
expect(manager.findMarkers({ dataFilter: d => d.message !== message }).length).equal(0);
|
|
118
|
-
});
|
|
119
|
-
it('should find markers that satisfy filter for `source`', () => {
|
|
120
|
-
const source = 'typescript';
|
|
121
|
-
manager.setMarkers(new uri_1.default('a'), 'a', [{ message: 'a', range, source }]);
|
|
122
|
-
expect(manager.findMarkers({ dataFilter: d => d.source === source }).length).equal(1);
|
|
123
|
-
expect(manager.findMarkers({ dataFilter: d => d.source !== source }).length).equal(0);
|
|
124
|
-
});
|
|
125
|
-
it('should find markers that satisfy filter for `range`', () => {
|
|
126
|
-
manager.setMarkers(new uri_1.default('a'), 'a', [{ message: 'a', range }]);
|
|
127
|
-
// The default `range` has a start line number of 0.
|
|
128
|
-
expect(manager.findMarkers({ dataFilter: d => d.range.start.line === 0 }).length).equal(1);
|
|
129
|
-
expect(manager.findMarkers({ dataFilter: d => d.range.start.line > 0 }).length).equal(0);
|
|
130
|
-
});
|
|
131
|
-
});
|
|
132
|
-
});
|
|
133
|
-
describe('#getUris', () => {
|
|
134
|
-
it('should return 0 uris when no markers are present', () => {
|
|
135
|
-
expect(Array.from(manager.getUris()).length).to.equal(0);
|
|
136
|
-
});
|
|
137
|
-
it('should return the list of uris', () => {
|
|
138
|
-
manager.setMarkers(new uri_1.default('a'), 'a', [{ message: 'a', range, severity: vscode_languageserver_protocol_1.DiagnosticSeverity.Error }]);
|
|
139
|
-
manager.setMarkers(new uri_1.default('b'), 'b', [{ message: 'a', range, severity: vscode_languageserver_protocol_1.DiagnosticSeverity.Error }]);
|
|
140
|
-
expect(Array.from(manager.getUris()).length).to.equal(2);
|
|
141
|
-
});
|
|
142
|
-
});
|
|
143
|
-
describe('#getProblemStat', () => {
|
|
144
|
-
it('should return 0 stats when no markers are present', () => {
|
|
145
|
-
const { errors, warnings, infos } = manager.getProblemStat();
|
|
146
|
-
expect(errors).to.equal(0);
|
|
147
|
-
expect(warnings).to.equal(0);
|
|
148
|
-
expect(infos).to.equal(0);
|
|
149
|
-
});
|
|
150
|
-
it('should return the proper problem stats', () => {
|
|
151
|
-
// Create 3 error markers.
|
|
152
|
-
manager.setMarkers(new uri_1.default('error-1'), 'error-1', [{ message: 'a', range, severity: vscode_languageserver_protocol_1.DiagnosticSeverity.Error }]);
|
|
153
|
-
manager.setMarkers(new uri_1.default('error-2'), 'error-2', [{ message: 'a', range, severity: vscode_languageserver_protocol_1.DiagnosticSeverity.Error }]);
|
|
154
|
-
manager.setMarkers(new uri_1.default('error-3'), 'error-3', [{ message: 'a', range, severity: vscode_languageserver_protocol_1.DiagnosticSeverity.Error }]);
|
|
155
|
-
// Create 2 warning markers.
|
|
156
|
-
manager.setMarkers(new uri_1.default('warning-1'), 'warning-1', [{ message: 'a', range, severity: vscode_languageserver_protocol_1.DiagnosticSeverity.Warning }]);
|
|
157
|
-
manager.setMarkers(new uri_1.default('warning-2'), 'warning-2', [{ message: 'a', range, severity: vscode_languageserver_protocol_1.DiagnosticSeverity.Warning }]);
|
|
158
|
-
// Create 1 info marker.
|
|
159
|
-
manager.setMarkers(new uri_1.default('info-1'), 'info-1', [{ message: 'a', range, severity: vscode_languageserver_protocol_1.DiagnosticSeverity.Information }]);
|
|
160
|
-
// Collect the total problem stats for the application.
|
|
161
|
-
const { errors, warnings, infos } = manager.getProblemStat();
|
|
162
|
-
expect(errors).to.equal(3);
|
|
163
|
-
expect(warnings).to.equal(2);
|
|
164
|
-
expect(infos).to.equal(1);
|
|
165
|
-
});
|
|
166
|
-
});
|
|
167
|
-
});
|
|
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
|
+
Object.defineProperty(exports, "__esModule", { value: true });
|
|
18
|
+
const jsdom_1 = require("@theia/core/lib/browser/test/jsdom");
|
|
19
|
+
const disableJSDOM = (0, jsdom_1.enableJSDOM)();
|
|
20
|
+
const chai = require("chai");
|
|
21
|
+
const uri_1 = require("@theia/core/lib/common/uri");
|
|
22
|
+
const inversify_1 = require("@theia/core/shared/inversify");
|
|
23
|
+
const problem_manager_1 = require("./problem-manager");
|
|
24
|
+
const event_1 = require("@theia/core/lib/common/event");
|
|
25
|
+
const logger_1 = require("@theia/core/lib/common/logger");
|
|
26
|
+
const vscode_languageserver_protocol_1 = require("@theia/core/shared/vscode-languageserver-protocol");
|
|
27
|
+
const mock_logger_1 = require("@theia/core/lib/common/test/mock-logger");
|
|
28
|
+
const file_service_1 = require("@theia/filesystem/lib/browser/file-service");
|
|
29
|
+
const storage_service_1 = require("@theia/core/lib/browser/storage-service");
|
|
30
|
+
disableJSDOM();
|
|
31
|
+
const expect = chai.expect;
|
|
32
|
+
let manager;
|
|
33
|
+
let container;
|
|
34
|
+
/**
|
|
35
|
+
* The default range for test purposes.
|
|
36
|
+
*/
|
|
37
|
+
const range = { start: { line: 0, character: 10 }, end: { line: 0, character: 10 } };
|
|
38
|
+
describe('problem-manager', () => {
|
|
39
|
+
beforeEach(() => {
|
|
40
|
+
container = new inversify_1.Container();
|
|
41
|
+
container.bind(logger_1.ILogger).to(mock_logger_1.MockLogger);
|
|
42
|
+
container.bind(storage_service_1.StorageService).to(storage_service_1.LocalStorageService).inSingletonScope();
|
|
43
|
+
container.bind(storage_service_1.LocalStorageService).toSelf().inSingletonScope();
|
|
44
|
+
container.bind(file_service_1.FileService).toConstantValue({
|
|
45
|
+
onDidFilesChange: event_1.Event.None
|
|
46
|
+
});
|
|
47
|
+
container.bind(problem_manager_1.ProblemManager).toSelf();
|
|
48
|
+
manager = container.get(problem_manager_1.ProblemManager);
|
|
49
|
+
});
|
|
50
|
+
describe('#setMarkers', () => {
|
|
51
|
+
it('should successfully set new markers', () => {
|
|
52
|
+
expect(Array.from(manager.getUris()).length).to.equal(0);
|
|
53
|
+
manager.setMarkers(new uri_1.default('a'), 'a', [{ message: 'a', range }]);
|
|
54
|
+
expect(Array.from(manager.getUris()).length).to.equal(1);
|
|
55
|
+
});
|
|
56
|
+
it('should replace markers', () => {
|
|
57
|
+
const uri = new uri_1.default('a');
|
|
58
|
+
let events = 0;
|
|
59
|
+
manager.onDidChangeMarkers(() => events++);
|
|
60
|
+
expect(events).equal(0);
|
|
61
|
+
const initial = manager.setMarkers(uri, 'a', [{ message: 'a', range }]);
|
|
62
|
+
expect(initial.length).equal(0);
|
|
63
|
+
expect(events).equal(1);
|
|
64
|
+
const updated = manager.setMarkers(uri, 'a', [{ message: 'a', range }]);
|
|
65
|
+
expect(updated.length).equal(1);
|
|
66
|
+
expect(events).equal(2);
|
|
67
|
+
expect(manager.findMarkers({ uri }).length).equal(1);
|
|
68
|
+
});
|
|
69
|
+
});
|
|
70
|
+
describe('#cleanAllMarkers', () => {
|
|
71
|
+
it('should successfully clean all markers', () => {
|
|
72
|
+
// Create mock markers.
|
|
73
|
+
manager.setMarkers(new uri_1.default('a'), 'a', [{ message: 'a', range }]);
|
|
74
|
+
manager.setMarkers(new uri_1.default('b'), 'b', [{ message: 'a', range }]);
|
|
75
|
+
manager.setMarkers(new uri_1.default('c'), 'c', [{ message: 'a', range }]);
|
|
76
|
+
expect(Array.from(manager.getUris()).length).to.equal(3);
|
|
77
|
+
// Clean the markers.
|
|
78
|
+
manager.cleanAllMarkers();
|
|
79
|
+
expect(Array.from(manager.getUris()).length).to.equal(0);
|
|
80
|
+
});
|
|
81
|
+
});
|
|
82
|
+
describe('#findMarkers', () => {
|
|
83
|
+
it('should find markers by `owner`', () => {
|
|
84
|
+
const owner = 'foo';
|
|
85
|
+
manager.setMarkers(new uri_1.default('a'), owner, [{ message: 'a', range }]);
|
|
86
|
+
manager.setMarkers(new uri_1.default('b'), owner, [{ message: 'a', range }]);
|
|
87
|
+
expect(manager.findMarkers({ owner }).length).equal(2);
|
|
88
|
+
expect(manager.findMarkers({ owner: 'unknown' }).length).equal(0);
|
|
89
|
+
});
|
|
90
|
+
it('should find markers by `owner` and `uri`', () => {
|
|
91
|
+
const owner = 'foo';
|
|
92
|
+
const uri = new uri_1.default('bar');
|
|
93
|
+
// Create a marker to match the filter.
|
|
94
|
+
manager.setMarkers(uri, owner, [{ message: 'a', range }]);
|
|
95
|
+
// Create 2 markers that do not match the filter.
|
|
96
|
+
manager.setMarkers(new uri_1.default('invalid'), 'invalid-owner', [{ message: 'a', range }]);
|
|
97
|
+
manager.setMarkers(new uri_1.default('invalid'), 'invalid-owner', [{ message: 'a', range }]);
|
|
98
|
+
// Expect to find the markers which satisfy the filter only.
|
|
99
|
+
expect(manager.findMarkers({ owner, uri }).length).equal(1);
|
|
100
|
+
});
|
|
101
|
+
describe('dataFilter', () => {
|
|
102
|
+
it('should find markers that satisfy filter for `severity`', () => {
|
|
103
|
+
manager.setMarkers(new uri_1.default('a'), 'a', [{ message: 'a', range, severity: vscode_languageserver_protocol_1.DiagnosticSeverity.Error }]);
|
|
104
|
+
expect(manager.findMarkers({ dataFilter: d => d.severity === vscode_languageserver_protocol_1.DiagnosticSeverity.Error }).length).equal(1);
|
|
105
|
+
expect(manager.findMarkers({ dataFilter: d => d.severity !== vscode_languageserver_protocol_1.DiagnosticSeverity.Error }).length).equal(0);
|
|
106
|
+
});
|
|
107
|
+
it('should find markers that satisfy filter for `code`', () => {
|
|
108
|
+
const code = 100;
|
|
109
|
+
manager.setMarkers(new uri_1.default('a'), 'a', [{ message: 'a', range, code }]);
|
|
110
|
+
expect(manager.findMarkers({ dataFilter: d => d.code === code }).length).equal(1);
|
|
111
|
+
expect(manager.findMarkers({ dataFilter: d => d.code !== code }).length).equal(0);
|
|
112
|
+
});
|
|
113
|
+
it('should find markers that satisfy filter for `message`', () => {
|
|
114
|
+
const message = 'foo';
|
|
115
|
+
manager.setMarkers(new uri_1.default('a'), 'a', [{ message, range }]);
|
|
116
|
+
expect(manager.findMarkers({ dataFilter: d => d.message === message }).length).equal(1);
|
|
117
|
+
expect(manager.findMarkers({ dataFilter: d => d.message !== message }).length).equal(0);
|
|
118
|
+
});
|
|
119
|
+
it('should find markers that satisfy filter for `source`', () => {
|
|
120
|
+
const source = 'typescript';
|
|
121
|
+
manager.setMarkers(new uri_1.default('a'), 'a', [{ message: 'a', range, source }]);
|
|
122
|
+
expect(manager.findMarkers({ dataFilter: d => d.source === source }).length).equal(1);
|
|
123
|
+
expect(manager.findMarkers({ dataFilter: d => d.source !== source }).length).equal(0);
|
|
124
|
+
});
|
|
125
|
+
it('should find markers that satisfy filter for `range`', () => {
|
|
126
|
+
manager.setMarkers(new uri_1.default('a'), 'a', [{ message: 'a', range }]);
|
|
127
|
+
// The default `range` has a start line number of 0.
|
|
128
|
+
expect(manager.findMarkers({ dataFilter: d => d.range.start.line === 0 }).length).equal(1);
|
|
129
|
+
expect(manager.findMarkers({ dataFilter: d => d.range.start.line > 0 }).length).equal(0);
|
|
130
|
+
});
|
|
131
|
+
});
|
|
132
|
+
});
|
|
133
|
+
describe('#getUris', () => {
|
|
134
|
+
it('should return 0 uris when no markers are present', () => {
|
|
135
|
+
expect(Array.from(manager.getUris()).length).to.equal(0);
|
|
136
|
+
});
|
|
137
|
+
it('should return the list of uris', () => {
|
|
138
|
+
manager.setMarkers(new uri_1.default('a'), 'a', [{ message: 'a', range, severity: vscode_languageserver_protocol_1.DiagnosticSeverity.Error }]);
|
|
139
|
+
manager.setMarkers(new uri_1.default('b'), 'b', [{ message: 'a', range, severity: vscode_languageserver_protocol_1.DiagnosticSeverity.Error }]);
|
|
140
|
+
expect(Array.from(manager.getUris()).length).to.equal(2);
|
|
141
|
+
});
|
|
142
|
+
});
|
|
143
|
+
describe('#getProblemStat', () => {
|
|
144
|
+
it('should return 0 stats when no markers are present', () => {
|
|
145
|
+
const { errors, warnings, infos } = manager.getProblemStat();
|
|
146
|
+
expect(errors).to.equal(0);
|
|
147
|
+
expect(warnings).to.equal(0);
|
|
148
|
+
expect(infos).to.equal(0);
|
|
149
|
+
});
|
|
150
|
+
it('should return the proper problem stats', () => {
|
|
151
|
+
// Create 3 error markers.
|
|
152
|
+
manager.setMarkers(new uri_1.default('error-1'), 'error-1', [{ message: 'a', range, severity: vscode_languageserver_protocol_1.DiagnosticSeverity.Error }]);
|
|
153
|
+
manager.setMarkers(new uri_1.default('error-2'), 'error-2', [{ message: 'a', range, severity: vscode_languageserver_protocol_1.DiagnosticSeverity.Error }]);
|
|
154
|
+
manager.setMarkers(new uri_1.default('error-3'), 'error-3', [{ message: 'a', range, severity: vscode_languageserver_protocol_1.DiagnosticSeverity.Error }]);
|
|
155
|
+
// Create 2 warning markers.
|
|
156
|
+
manager.setMarkers(new uri_1.default('warning-1'), 'warning-1', [{ message: 'a', range, severity: vscode_languageserver_protocol_1.DiagnosticSeverity.Warning }]);
|
|
157
|
+
manager.setMarkers(new uri_1.default('warning-2'), 'warning-2', [{ message: 'a', range, severity: vscode_languageserver_protocol_1.DiagnosticSeverity.Warning }]);
|
|
158
|
+
// Create 1 info marker.
|
|
159
|
+
manager.setMarkers(new uri_1.default('info-1'), 'info-1', [{ message: 'a', range, severity: vscode_languageserver_protocol_1.DiagnosticSeverity.Information }]);
|
|
160
|
+
// Collect the total problem stats for the application.
|
|
161
|
+
const { errors, warnings, infos } = manager.getProblemStat();
|
|
162
|
+
expect(errors).to.equal(3);
|
|
163
|
+
expect(warnings).to.equal(2);
|
|
164
|
+
expect(infos).to.equal(1);
|
|
165
|
+
});
|
|
166
|
+
});
|
|
167
|
+
});
|
|
168
168
|
//# sourceMappingURL=problem-manager.spec.js.map
|
|
@@ -1,14 +1,14 @@
|
|
|
1
|
-
import { interfaces } from '@theia/core/shared/inversify';
|
|
2
|
-
import { PreferenceProxy, PreferenceService, PreferenceSchema } from '@theia/core/lib/browser';
|
|
3
|
-
export declare const ProblemConfigSchema: PreferenceSchema;
|
|
4
|
-
export interface ProblemConfiguration {
|
|
5
|
-
'problems.decorations.enabled': boolean;
|
|
6
|
-
'problems.decorations.tabbar.enabled': boolean;
|
|
7
|
-
'problems.autoReveal': boolean;
|
|
8
|
-
}
|
|
9
|
-
export declare const ProblemPreferenceContribution: unique symbol;
|
|
10
|
-
export declare const ProblemPreferences: unique symbol;
|
|
11
|
-
export declare type ProblemPreferences = PreferenceProxy<ProblemConfiguration>;
|
|
12
|
-
export declare function createProblemPreferences(preferences: PreferenceService, schema?: PreferenceSchema): ProblemPreferences;
|
|
13
|
-
export declare const bindProblemPreferences: (bind: interfaces.Bind) => void;
|
|
1
|
+
import { interfaces } from '@theia/core/shared/inversify';
|
|
2
|
+
import { PreferenceProxy, PreferenceService, PreferenceSchema } from '@theia/core/lib/browser';
|
|
3
|
+
export declare const ProblemConfigSchema: PreferenceSchema;
|
|
4
|
+
export interface ProblemConfiguration {
|
|
5
|
+
'problems.decorations.enabled': boolean;
|
|
6
|
+
'problems.decorations.tabbar.enabled': boolean;
|
|
7
|
+
'problems.autoReveal': boolean;
|
|
8
|
+
}
|
|
9
|
+
export declare const ProblemPreferenceContribution: unique symbol;
|
|
10
|
+
export declare const ProblemPreferences: unique symbol;
|
|
11
|
+
export declare type ProblemPreferences = PreferenceProxy<ProblemConfiguration>;
|
|
12
|
+
export declare function createProblemPreferences(preferences: PreferenceService, schema?: PreferenceSchema): ProblemPreferences;
|
|
13
|
+
export declare const bindProblemPreferences: (bind: interfaces.Bind) => void;
|
|
14
14
|
//# sourceMappingURL=problem-preferences.d.ts.map
|