@theia/markers 1.34.1 → 1.34.3

package/lib/browser/problem/problem-composite-tree-node.js

@@ -1,69 +1,69 @@
-"use strict";
-// *****************************************************************************
-// Copyright (C) 2021 EclipseSource and others.
-//
-// This program and the accompanying materials are made available under the
-// terms of the Eclipse Public License v. 2.0 which is available at
-// http://www.eclipse.org/legal/epl-2.0.
-//
-// This Source Code may also be made available under the following Secondary
-// Licenses when the conditions for such availability set forth in the Eclipse
-// Public License v. 2.0 are satisfied: GNU General Public License, version 2
-// with the GNU Classpath Exception which is available at
-// https://www.gnu.org/software/classpath/license.html.
-//
-// SPDX-License-Identifier: EPL-2.0 OR GPL-2.0 WITH Classpath-exception-2.0
-// *****************************************************************************
-Object.defineProperty(exports, "__esModule", { value: true });
-exports.ProblemCompositeTreeNode = void 0;
-const tree_1 = require("@theia/core/lib/browser/tree/tree");
-const problem_utils_1 = require("./problem-utils");
-var ProblemCompositeTreeNode;
-(function (ProblemCompositeTreeNode) {
-    function setSeverity(parent, markers) {
-        let maxSeverity;
-        markers.forEach(marker => {
-            if (problem_utils_1.ProblemUtils.severityCompare(marker.data.severity, maxSeverity) < 0) {
-                maxSeverity = marker.data.severity;
-            }
-        });
-        parent.severity = maxSeverity;
-    }
-    ProblemCompositeTreeNode.setSeverity = setSeverity;
-    ;
-    function addChild(parent, child, markers) {
-        ProblemCompositeTreeNode.setSeverity(child, markers);
-        const children = parent.children;
-        const index = children.findIndex(value => value.id === child.id);
-        if (index !== -1) {
-            tree_1.CompositeTreeNode.removeChild(parent, child);
-        }
-        if (children.length === 0) {
-            children.push(child);
-            tree_1.CompositeTreeNode.setParent(child, 0, parent);
-        }
-        else {
-            let inserted = false;
-            for (let i = 0; i < children.length; i++) {
-                // sort by severity, equal severity => sort by URI
-                if (problem_utils_1.ProblemUtils.severityCompare(child.severity, children[i].severity) < 0
-                    || (problem_utils_1.ProblemUtils.severityCompare(child.severity, children[i].severity) === 0 && compareURI(child.uri, children[i].uri) < 0)) {
-                    children.splice(i, 0, child);
-                    inserted = true;
-                    tree_1.CompositeTreeNode.setParent(child, i, parent);
-                    break;
-                }
-                ;
-            }
-            if (inserted === false) {
-                children.push(child);
-                tree_1.CompositeTreeNode.setParent(child, children.length - 1, parent);
-            }
-        }
-        return parent;
-    }
-    ProblemCompositeTreeNode.addChild = addChild;
-    const compareURI = (uri1, uri2) => uri1.toString().localeCompare(uri2.toString(), undefined, { sensitivity: 'base' });
-    ;
-})(ProblemCompositeTreeNode = exports.ProblemCompositeTreeNode || (exports.ProblemCompositeTreeNode = {}));
+"use strict";
+// *****************************************************************************
+// Copyright (C) 2021 EclipseSource and others.
+//
+// This program and the accompanying materials are made available under the
+// terms of the Eclipse Public License v. 2.0 which is available at
+// http://www.eclipse.org/legal/epl-2.0.
+//
+// This Source Code may also be made available under the following Secondary
+// Licenses when the conditions for such availability set forth in the Eclipse
+// Public License v. 2.0 are satisfied: GNU General Public License, version 2
+// with the GNU Classpath Exception which is available at
+// https://www.gnu.org/software/classpath/license.html.
+//
+// SPDX-License-Identifier: EPL-2.0 OR GPL-2.0 WITH Classpath-exception-2.0
+// *****************************************************************************
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.ProblemCompositeTreeNode = void 0;
+const tree_1 = require("@theia/core/lib/browser/tree/tree");
+const problem_utils_1 = require("./problem-utils");
+var ProblemCompositeTreeNode;
+(function (ProblemCompositeTreeNode) {
+    function setSeverity(parent, markers) {
+        let maxSeverity;
+        markers.forEach(marker => {
+            if (problem_utils_1.ProblemUtils.severityCompare(marker.data.severity, maxSeverity) < 0) {
+                maxSeverity = marker.data.severity;
+            }
+        });
+        parent.severity = maxSeverity;
+    }
+    ProblemCompositeTreeNode.setSeverity = setSeverity;
+    ;
+    function addChild(parent, child, markers) {
+        ProblemCompositeTreeNode.setSeverity(child, markers);
+        const children = parent.children;
+        const index = children.findIndex(value => value.id === child.id);
+        if (index !== -1) {
+            tree_1.CompositeTreeNode.removeChild(parent, child);
+        }
+        if (children.length === 0) {
+            children.push(child);
+            tree_1.CompositeTreeNode.setParent(child, 0, parent);
+        }
+        else {
+            let inserted = false;
+            for (let i = 0; i < children.length; i++) {
+                // sort by severity, equal severity => sort by URI
+                if (problem_utils_1.ProblemUtils.severityCompare(child.severity, children[i].severity) < 0
+                    || (problem_utils_1.ProblemUtils.severityCompare(child.severity, children[i].severity) === 0 && compareURI(child.uri, children[i].uri) < 0)) {
+                    children.splice(i, 0, child);
+                    inserted = true;
+                    tree_1.CompositeTreeNode.setParent(child, i, parent);
+                    break;
+                }
+                ;
+            }
+            if (inserted === false) {
+                children.push(child);
+                tree_1.CompositeTreeNode.setParent(child, children.length - 1, parent);
+            }
+        }
+        return parent;
+    }
+    ProblemCompositeTreeNode.addChild = addChild;
+    const compareURI = (uri1, uri2) => uri1.toString().localeCompare(uri2.toString(), undefined, { sensitivity: 'base' });
+    ;
+})(ProblemCompositeTreeNode = exports.ProblemCompositeTreeNode || (exports.ProblemCompositeTreeNode = {}));
 //# sourceMappingURL=problem-composite-tree-node.js.map

package/lib/browser/problem/problem-composite-tree-node.spec.d.ts

@@ -1,2 +1,2 @@
-export {};
+export {};
 //# sourceMappingURL=problem-composite-tree-node.spec.d.ts.map

package/lib/browser/problem/problem-composite-tree-node.spec.js

@@ -1,217 +1,217 @@
-"use strict";
-// *****************************************************************************
-// Copyright (C) 2021 EclipseSource and others.
-//
-// This program and the accompanying materials are made available under the
-// terms of the Eclipse Public License v. 2.0 which is available at
-// http://www.eclipse.org/legal/epl-2.0.
-//
-// This Source Code may also be made available under the following Secondary
-// Licenses when the conditions for such availability set forth in the Eclipse
-// Public License v. 2.0 are satisfied: GNU General Public License, version 2
-// with the GNU Classpath Exception which is available at
-// https://www.gnu.org/software/classpath/license.html.
-//
-// SPDX-License-Identifier: EPL-2.0 OR GPL-2.0 WITH Classpath-exception-2.0
-// *****************************************************************************
-Object.defineProperty(exports, "__esModule", { value: true });
-const jsdom_1 = require("@theia/core/lib/browser/test/jsdom");
-let disableJSDOM = (0, jsdom_1.enableJSDOM)();
-const frontend_application_config_provider_1 = require("@theia/core/lib/browser/frontend-application-config-provider");
-frontend_application_config_provider_1.FrontendApplicationConfigProvider.set({});
-const uri_1 = require("@theia/core/lib/common/uri");
-const chai_1 = require("chai");
-const inversify_1 = require("@theia/core/shared/inversify");
-const vscode_languageserver_protocol_1 = require("@theia/core/shared/vscode-languageserver-protocol");
-const event_1 = require("@theia/core/lib/common/event");
-const marker_manager_1 = require("../marker-manager");
-const marker_tree_1 = require("../marker-tree");
-const problem_container_1 = require("./problem-container");
-const problem_manager_1 = require("./problem-manager");
-const problem_tree_model_1 = require("./problem-tree-model");
-const file_service_1 = require("@theia/filesystem/lib/browser/file-service");
-const problem_composite_tree_node_1 = require("./problem-composite-tree-node");
-disableJSDOM();
-let rootNode;
-before(() => {
-    disableJSDOM = (0, jsdom_1.enableJSDOM)();
-    const testContainer = new inversify_1.Container();
-    testContainer.bind(marker_manager_1.MarkerManager).toSelf().inSingletonScope();
-    testContainer.bind(problem_manager_1.ProblemManager).toSelf();
-    testContainer.bind(marker_tree_1.MarkerOptions).toConstantValue(problem_container_1.PROBLEM_OPTIONS);
-    testContainer.bind(file_service_1.FileService).toConstantValue({
-        onDidFilesChange: event_1.Event.None
-    });
-    testContainer.bind(problem_tree_model_1.ProblemTree).toSelf().inSingletonScope();
-});
-beforeEach(() => {
-    rootNode = getRootNode('theia-problem-marker-widget');
-});
-after(() => {
-    disableJSDOM();
-});
-describe('problem-composite-tree-node', () => {
-    describe('#sortMarkersInfo', () => {
-        describe('should sort markersInfo based on the highest severity', () => {
-            function testSeveritySorting(high, low) {
-                const highMarker = createMockMarker({ start: { line: 0, character: 10 }, end: { line: 0, character: 10 } }, high);
-                const lowMarker = createMockMarker({ start: { line: 0, character: 10 }, end: { line: 0, character: 10 } }, low);
-                const highNode = createMockMarkerNode(highMarker);
-                const lowNode = createMockMarkerNode(lowMarker);
-                const highMarkerNode = createMarkerInfo('1', new uri_1.default('a'), [highNode]);
-                const lowMarkerNode = createMarkerInfo('2', new uri_1.default('b'), [lowNode]);
-                const highFirstRoot = getRootNode('highFirstRoot');
-                problem_composite_tree_node_1.ProblemCompositeTreeNode.addChild(highFirstRoot, highMarkerNode, [highMarker]);
-                problem_composite_tree_node_1.ProblemCompositeTreeNode.addChild(highFirstRoot, lowMarkerNode, [lowMarker]);
-                expectCorrectOrdering(highFirstRoot);
-                const lowFirstRoot = getRootNode('lowFirstRoot');
-                problem_composite_tree_node_1.ProblemCompositeTreeNode.addChild(lowFirstRoot, lowMarkerNode, [lowMarker]);
-                problem_composite_tree_node_1.ProblemCompositeTreeNode.addChild(lowFirstRoot, highMarkerNode, [highMarker]);
-                expectCorrectOrdering(lowFirstRoot);
-                function expectCorrectOrdering(root) {
-                    (0, chai_1.expect)(root.children.length).to.equal(2);
-                    (0, chai_1.expect)(root.children[0]).to.equal(highMarkerNode);
-                    (0, chai_1.expect)(highMarkerNode.nextSibling).to.equal(lowMarkerNode);
-                    (0, chai_1.expect)(root.children[1]).to.equal(lowMarkerNode);
-                    (0, chai_1.expect)(lowMarkerNode.previousSibling).to.equal(highMarkerNode);
-                }
-            }
-            it('should sort error higher than warnings', () => {
-                testSeveritySorting(vscode_languageserver_protocol_1.DiagnosticSeverity.Error, vscode_languageserver_protocol_1.DiagnosticSeverity.Warning);
-            });
-            it('should sort errors higher than infos', () => {
-                testSeveritySorting(vscode_languageserver_protocol_1.DiagnosticSeverity.Error, vscode_languageserver_protocol_1.DiagnosticSeverity.Information);
-            });
-            it('should sort errors higher than hints', () => {
-                testSeveritySorting(vscode_languageserver_protocol_1.DiagnosticSeverity.Error, vscode_languageserver_protocol_1.DiagnosticSeverity.Hint);
-            });
-            it('should sort warnings higher than infos', () => {
-                testSeveritySorting(vscode_languageserver_protocol_1.DiagnosticSeverity.Warning, vscode_languageserver_protocol_1.DiagnosticSeverity.Information);
-            });
-            it('should sort warnings higher than hints', () => {
-                testSeveritySorting(vscode_languageserver_protocol_1.DiagnosticSeverity.Warning, vscode_languageserver_protocol_1.DiagnosticSeverity.Hint);
-            });
-            it('should sort infos higher than hints', () => {
-                testSeveritySorting(vscode_languageserver_protocol_1.DiagnosticSeverity.Information, vscode_languageserver_protocol_1.DiagnosticSeverity.Hint);
-            });
-        });
-        it('should sort markersInfo based on URI if severities are equal', () => {
-            const markerA = createMockMarker({ start: { line: 0, character: 10 }, end: { line: 0, character: 10 } }, vscode_languageserver_protocol_1.DiagnosticSeverity.Error);
-            const markerB = createMockMarker({ start: { line: 0, character: 10 }, end: { line: 0, character: 10 } }, vscode_languageserver_protocol_1.DiagnosticSeverity.Error);
-            const nodeA = createMockMarkerNode(markerA);
-            const nodeB = createMockMarkerNode(markerB);
-            const markerInfoNodeA = createMarkerInfo('1', new uri_1.default('a'), [nodeA]);
-            const markerInfoNodeB = createMarkerInfo('2', new uri_1.default('b'), [nodeB]);
-            problem_composite_tree_node_1.ProblemCompositeTreeNode.addChild(rootNode, markerInfoNodeA, [markerA]);
-            problem_composite_tree_node_1.ProblemCompositeTreeNode.addChild(rootNode, markerInfoNodeB, [markerB]);
-            (0, chai_1.expect)(rootNode.children.length).to.equal(2);
-            (0, chai_1.expect)(rootNode.children[0]).to.equal(markerInfoNodeA);
-            (0, chai_1.expect)(markerInfoNodeA.nextSibling).to.equal(markerInfoNodeB);
-            (0, chai_1.expect)(rootNode.children[1]).to.equal(markerInfoNodeB);
-            (0, chai_1.expect)(markerInfoNodeB.previousSibling).to.equal(markerInfoNodeA);
-        });
-        it('changing marker content should lead to update in ProblemCompositeTree', () => {
-            const markerA = createMockMarker({ start: { line: 0, character: 10 }, end: { line: 0, character: 10 } }, vscode_languageserver_protocol_1.DiagnosticSeverity.Error);
-            const nodeA = createMockMarkerNode(markerA);
-            const markerInfoNodeA = createMarkerInfo('1', new uri_1.default('a'), [nodeA]);
-            problem_composite_tree_node_1.ProblemCompositeTreeNode.addChild(rootNode, markerInfoNodeA, [markerA]);
-            markerA.data.severity = vscode_languageserver_protocol_1.DiagnosticSeverity.Hint;
-            problem_composite_tree_node_1.ProblemCompositeTreeNode.addChild(rootNode, markerInfoNodeA, [markerA]);
-            (0, chai_1.expect)(rootNode.children.length).to.equal(1);
-            (0, chai_1.expect)(rootNode.children[0]).to.equal(markerInfoNodeA);
-        });
-        it('changing marker content from error to hint should lead to lower rank', () => {
-            const markerA = createMockMarker({ start: { line: 0, character: 10 }, end: { line: 0, character: 10 } }, vscode_languageserver_protocol_1.DiagnosticSeverity.Error);
-            const nodeA = createMockMarkerNode(markerA);
-            const markerInfoNodeA = createMarkerInfo('1', new uri_1.default('a'), [nodeA]);
-            problem_composite_tree_node_1.ProblemCompositeTreeNode.addChild(rootNode, markerInfoNodeA, [markerA]);
-            const markerB = createMockMarker({ start: { line: 0, character: 10 }, end: { line: 0, character: 10 } }, vscode_languageserver_protocol_1.DiagnosticSeverity.Error);
-            const nodeB = createMockMarkerNode(markerB);
-            const markerInfoNodeB = createMarkerInfo('2', new uri_1.default('b'), [nodeB]);
-            problem_composite_tree_node_1.ProblemCompositeTreeNode.addChild(rootNode, markerInfoNodeB, [markerB]);
-            markerA.data.severity = vscode_languageserver_protocol_1.DiagnosticSeverity.Hint;
-            problem_composite_tree_node_1.ProblemCompositeTreeNode.addChild(rootNode, markerInfoNodeA, [markerA]);
-            (0, chai_1.expect)(rootNode.children.length).to.equal(2);
-            (0, chai_1.expect)(rootNode.children[0]).to.equal(markerInfoNodeB);
-            (0, chai_1.expect)(markerInfoNodeB.nextSibling).to.equal(markerInfoNodeA);
-            (0, chai_1.expect)(rootNode.children[1]).to.equal(markerInfoNodeA);
-            (0, chai_1.expect)(markerInfoNodeA.previousSibling).to.equal(markerInfoNodeB);
-        });
-        it('changing marker content from error to hint should lead to higher rank', () => {
-            const markerA = createMockMarker({ start: { line: 0, character: 10 }, end: { line: 0, character: 10 } }, vscode_languageserver_protocol_1.DiagnosticSeverity.Hint);
-            const nodeA = createMockMarkerNode(markerA);
-            const markerInfoNodeA = createMarkerInfo('1', new uri_1.default('a'), [nodeA]);
-            problem_composite_tree_node_1.ProblemCompositeTreeNode.addChild(rootNode, markerInfoNodeA, [markerA]);
-            const markerB = createMockMarker({ start: { line: 0, character: 10 }, end: { line: 0, character: 10 } }, vscode_languageserver_protocol_1.DiagnosticSeverity.Error);
-            const nodeB = createMockMarkerNode(markerB);
-            const markerInfoNodeB = createMarkerInfo('2', new uri_1.default('b'), [nodeB]);
-            problem_composite_tree_node_1.ProblemCompositeTreeNode.addChild(rootNode, markerInfoNodeB, [markerB]);
-            markerA.data.severity = vscode_languageserver_protocol_1.DiagnosticSeverity.Error;
-            problem_composite_tree_node_1.ProblemCompositeTreeNode.addChild(rootNode, markerInfoNodeA, [markerA]);
-            (0, chai_1.expect)(rootNode.children.length).to.equal(2);
-            (0, chai_1.expect)(rootNode.children[0]).to.equal(markerInfoNodeA);
-            (0, chai_1.expect)(markerInfoNodeA.nextSibling).to.equal(markerInfoNodeB);
-            (0, chai_1.expect)(rootNode.children[1]).to.equal(markerInfoNodeB);
-            (0, chai_1.expect)(markerInfoNodeB.previousSibling).to.equal(markerInfoNodeA);
-        });
-    });
-});
-function createMarkerInfo(id, uri, marker) {
-    return {
-        children: marker ? marker : [],
-        expanded: true,
-        uri,
-        id,
-        parent: rootNode,
-        selected: false,
-        numberOfMarkers: marker ? marker.length : 0
-    };
-}
-/**
- * Create a mock marker node with the given diagnostic marker.
- * @param marker the diagnostic marker.
- *
- * @returns a mock marker node.
- */
-function createMockMarkerNode(marker) {
-    return {
-        id: 'id',
-        name: 'marker',
-        parent: undefined,
-        selected: false,
-        uri: new uri_1.default(''),
-        marker
-    };
-}
-/**
- * Create a mock diagnostic marker.
- * @param range the diagnostic range.
- * @param severity the diagnostic severity.
- * @param owner the optional owner of the diagnostic
- *
- * @returns a mock diagnostic marker.
- */
-function createMockMarker(range, severity, owner) {
-    const data = {
-        range: range,
-        severity: severity,
-        message: 'message'
-    };
-    return Object.freeze({
-        uri: 'uri',
-        kind: 'marker',
-        owner: owner !== null && owner !== void 0 ? owner : 'owner',
-        data
-    });
-}
-function getRootNode(id) {
-    return {
-        visible: false,
-        id: id,
-        name: 'MarkerTree',
-        kind: 'problem',
-        children: [],
-        parent: undefined
-    };
-}
+"use strict";
+// *****************************************************************************
+// Copyright (C) 2021 EclipseSource and others.
+//
+// This program and the accompanying materials are made available under the
+// terms of the Eclipse Public License v. 2.0 which is available at
+// http://www.eclipse.org/legal/epl-2.0.
+//
+// This Source Code may also be made available under the following Secondary
+// Licenses when the conditions for such availability set forth in the Eclipse
+// Public License v. 2.0 are satisfied: GNU General Public License, version 2
+// with the GNU Classpath Exception which is available at
+// https://www.gnu.org/software/classpath/license.html.
+//
+// SPDX-License-Identifier: EPL-2.0 OR GPL-2.0 WITH Classpath-exception-2.0
+// *****************************************************************************
+Object.defineProperty(exports, "__esModule", { value: true });
+const jsdom_1 = require("@theia/core/lib/browser/test/jsdom");
+let disableJSDOM = (0, jsdom_1.enableJSDOM)();
+const frontend_application_config_provider_1 = require("@theia/core/lib/browser/frontend-application-config-provider");
+frontend_application_config_provider_1.FrontendApplicationConfigProvider.set({});
+const uri_1 = require("@theia/core/lib/common/uri");
+const chai_1 = require("chai");
+const inversify_1 = require("@theia/core/shared/inversify");
+const vscode_languageserver_protocol_1 = require("@theia/core/shared/vscode-languageserver-protocol");
+const event_1 = require("@theia/core/lib/common/event");
+const marker_manager_1 = require("../marker-manager");
+const marker_tree_1 = require("../marker-tree");
+const problem_container_1 = require("./problem-container");
+const problem_manager_1 = require("./problem-manager");
+const problem_tree_model_1 = require("./problem-tree-model");
+const file_service_1 = require("@theia/filesystem/lib/browser/file-service");
+const problem_composite_tree_node_1 = require("./problem-composite-tree-node");
+disableJSDOM();
+let rootNode;
+before(() => {
+    disableJSDOM = (0, jsdom_1.enableJSDOM)();
+    const testContainer = new inversify_1.Container();
+    testContainer.bind(marker_manager_1.MarkerManager).toSelf().inSingletonScope();
+    testContainer.bind(problem_manager_1.ProblemManager).toSelf();
+    testContainer.bind(marker_tree_1.MarkerOptions).toConstantValue(problem_container_1.PROBLEM_OPTIONS);
+    testContainer.bind(file_service_1.FileService).toConstantValue({
+        onDidFilesChange: event_1.Event.None
+    });
+    testContainer.bind(problem_tree_model_1.ProblemTree).toSelf().inSingletonScope();
+});
+beforeEach(() => {
+    rootNode = getRootNode('theia-problem-marker-widget');
+});
+after(() => {
+    disableJSDOM();
+});
+describe('problem-composite-tree-node', () => {
+    describe('#sortMarkersInfo', () => {
+        describe('should sort markersInfo based on the highest severity', () => {
+            function testSeveritySorting(high, low) {
+                const highMarker = createMockMarker({ start: { line: 0, character: 10 }, end: { line: 0, character: 10 } }, high);
+                const lowMarker = createMockMarker({ start: { line: 0, character: 10 }, end: { line: 0, character: 10 } }, low);
+                const highNode = createMockMarkerNode(highMarker);
+                const lowNode = createMockMarkerNode(lowMarker);
+                const highMarkerNode = createMarkerInfo('1', new uri_1.default('a'), [highNode]);
+                const lowMarkerNode = createMarkerInfo('2', new uri_1.default('b'), [lowNode]);
+                const highFirstRoot = getRootNode('highFirstRoot');
+                problem_composite_tree_node_1.ProblemCompositeTreeNode.addChild(highFirstRoot, highMarkerNode, [highMarker]);
+                problem_composite_tree_node_1.ProblemCompositeTreeNode.addChild(highFirstRoot, lowMarkerNode, [lowMarker]);
+                expectCorrectOrdering(highFirstRoot);
+                const lowFirstRoot = getRootNode('lowFirstRoot');
+                problem_composite_tree_node_1.ProblemCompositeTreeNode.addChild(lowFirstRoot, lowMarkerNode, [lowMarker]);
+                problem_composite_tree_node_1.ProblemCompositeTreeNode.addChild(lowFirstRoot, highMarkerNode, [highMarker]);
+                expectCorrectOrdering(lowFirstRoot);
+                function expectCorrectOrdering(root) {
+                    (0, chai_1.expect)(root.children.length).to.equal(2);
+                    (0, chai_1.expect)(root.children[0]).to.equal(highMarkerNode);
+                    (0, chai_1.expect)(highMarkerNode.nextSibling).to.equal(lowMarkerNode);
+                    (0, chai_1.expect)(root.children[1]).to.equal(lowMarkerNode);
+                    (0, chai_1.expect)(lowMarkerNode.previousSibling).to.equal(highMarkerNode);
+                }
+            }
+            it('should sort error higher than warnings', () => {
+                testSeveritySorting(vscode_languageserver_protocol_1.DiagnosticSeverity.Error, vscode_languageserver_protocol_1.DiagnosticSeverity.Warning);
+            });
+            it('should sort errors higher than infos', () => {
+                testSeveritySorting(vscode_languageserver_protocol_1.DiagnosticSeverity.Error, vscode_languageserver_protocol_1.DiagnosticSeverity.Information);
+            });
+            it('should sort errors higher than hints', () => {
+                testSeveritySorting(vscode_languageserver_protocol_1.DiagnosticSeverity.Error, vscode_languageserver_protocol_1.DiagnosticSeverity.Hint);
+            });
+            it('should sort warnings higher than infos', () => {
+                testSeveritySorting(vscode_languageserver_protocol_1.DiagnosticSeverity.Warning, vscode_languageserver_protocol_1.DiagnosticSeverity.Information);
+            });
+            it('should sort warnings higher than hints', () => {
+                testSeveritySorting(vscode_languageserver_protocol_1.DiagnosticSeverity.Warning, vscode_languageserver_protocol_1.DiagnosticSeverity.Hint);
+            });
+            it('should sort infos higher than hints', () => {
+                testSeveritySorting(vscode_languageserver_protocol_1.DiagnosticSeverity.Information, vscode_languageserver_protocol_1.DiagnosticSeverity.Hint);
+            });
+        });
+        it('should sort markersInfo based on URI if severities are equal', () => {
+            const markerA = createMockMarker({ start: { line: 0, character: 10 }, end: { line: 0, character: 10 } }, vscode_languageserver_protocol_1.DiagnosticSeverity.Error);
+            const markerB = createMockMarker({ start: { line: 0, character: 10 }, end: { line: 0, character: 10 } }, vscode_languageserver_protocol_1.DiagnosticSeverity.Error);
+            const nodeA = createMockMarkerNode(markerA);
+            const nodeB = createMockMarkerNode(markerB);
+            const markerInfoNodeA = createMarkerInfo('1', new uri_1.default('a'), [nodeA]);
+            const markerInfoNodeB = createMarkerInfo('2', new uri_1.default('b'), [nodeB]);
+            problem_composite_tree_node_1.ProblemCompositeTreeNode.addChild(rootNode, markerInfoNodeA, [markerA]);
+            problem_composite_tree_node_1.ProblemCompositeTreeNode.addChild(rootNode, markerInfoNodeB, [markerB]);
+            (0, chai_1.expect)(rootNode.children.length).to.equal(2);
+            (0, chai_1.expect)(rootNode.children[0]).to.equal(markerInfoNodeA);
+            (0, chai_1.expect)(markerInfoNodeA.nextSibling).to.equal(markerInfoNodeB);
+            (0, chai_1.expect)(rootNode.children[1]).to.equal(markerInfoNodeB);
+            (0, chai_1.expect)(markerInfoNodeB.previousSibling).to.equal(markerInfoNodeA);
+        });
+        it('changing marker content should lead to update in ProblemCompositeTree', () => {
+            const markerA = createMockMarker({ start: { line: 0, character: 10 }, end: { line: 0, character: 10 } }, vscode_languageserver_protocol_1.DiagnosticSeverity.Error);
+            const nodeA = createMockMarkerNode(markerA);
+            const markerInfoNodeA = createMarkerInfo('1', new uri_1.default('a'), [nodeA]);
+            problem_composite_tree_node_1.ProblemCompositeTreeNode.addChild(rootNode, markerInfoNodeA, [markerA]);
+            markerA.data.severity = vscode_languageserver_protocol_1.DiagnosticSeverity.Hint;
+            problem_composite_tree_node_1.ProblemCompositeTreeNode.addChild(rootNode, markerInfoNodeA, [markerA]);
+            (0, chai_1.expect)(rootNode.children.length).to.equal(1);
+            (0, chai_1.expect)(rootNode.children[0]).to.equal(markerInfoNodeA);
+        });
+        it('changing marker content from error to hint should lead to lower rank', () => {
+            const markerA = createMockMarker({ start: { line: 0, character: 10 }, end: { line: 0, character: 10 } }, vscode_languageserver_protocol_1.DiagnosticSeverity.Error);
+            const nodeA = createMockMarkerNode(markerA);
+            const markerInfoNodeA = createMarkerInfo('1', new uri_1.default('a'), [nodeA]);
+            problem_composite_tree_node_1.ProblemCompositeTreeNode.addChild(rootNode, markerInfoNodeA, [markerA]);
+            const markerB = createMockMarker({ start: { line: 0, character: 10 }, end: { line: 0, character: 10 } }, vscode_languageserver_protocol_1.DiagnosticSeverity.Error);
+            const nodeB = createMockMarkerNode(markerB);
+            const markerInfoNodeB = createMarkerInfo('2', new uri_1.default('b'), [nodeB]);
+            problem_composite_tree_node_1.ProblemCompositeTreeNode.addChild(rootNode, markerInfoNodeB, [markerB]);
+            markerA.data.severity = vscode_languageserver_protocol_1.DiagnosticSeverity.Hint;
+            problem_composite_tree_node_1.ProblemCompositeTreeNode.addChild(rootNode, markerInfoNodeA, [markerA]);
+            (0, chai_1.expect)(rootNode.children.length).to.equal(2);
+            (0, chai_1.expect)(rootNode.children[0]).to.equal(markerInfoNodeB);
+            (0, chai_1.expect)(markerInfoNodeB.nextSibling).to.equal(markerInfoNodeA);
+            (0, chai_1.expect)(rootNode.children[1]).to.equal(markerInfoNodeA);
+            (0, chai_1.expect)(markerInfoNodeA.previousSibling).to.equal(markerInfoNodeB);
+        });
+        it('changing marker content from error to hint should lead to higher rank', () => {
+            const markerA = createMockMarker({ start: { line: 0, character: 10 }, end: { line: 0, character: 10 } }, vscode_languageserver_protocol_1.DiagnosticSeverity.Hint);
+            const nodeA = createMockMarkerNode(markerA);
+            const markerInfoNodeA = createMarkerInfo('1', new uri_1.default('a'), [nodeA]);
+            problem_composite_tree_node_1.ProblemCompositeTreeNode.addChild(rootNode, markerInfoNodeA, [markerA]);
+            const markerB = createMockMarker({ start: { line: 0, character: 10 }, end: { line: 0, character: 10 } }, vscode_languageserver_protocol_1.DiagnosticSeverity.Error);
+            const nodeB = createMockMarkerNode(markerB);
+            const markerInfoNodeB = createMarkerInfo('2', new uri_1.default('b'), [nodeB]);
+            problem_composite_tree_node_1.ProblemCompositeTreeNode.addChild(rootNode, markerInfoNodeB, [markerB]);
+            markerA.data.severity = vscode_languageserver_protocol_1.DiagnosticSeverity.Error;
+            problem_composite_tree_node_1.ProblemCompositeTreeNode.addChild(rootNode, markerInfoNodeA, [markerA]);
+            (0, chai_1.expect)(rootNode.children.length).to.equal(2);
+            (0, chai_1.expect)(rootNode.children[0]).to.equal(markerInfoNodeA);
+            (0, chai_1.expect)(markerInfoNodeA.nextSibling).to.equal(markerInfoNodeB);
+            (0, chai_1.expect)(rootNode.children[1]).to.equal(markerInfoNodeB);
+            (0, chai_1.expect)(markerInfoNodeB.previousSibling).to.equal(markerInfoNodeA);
+        });
+    });
+});
+function createMarkerInfo(id, uri, marker) {
+    return {
+        children: marker ? marker : [],
+        expanded: true,
+        uri,
+        id,
+        parent: rootNode,
+        selected: false,
+        numberOfMarkers: marker ? marker.length : 0
+    };
+}
+/**
+ * Create a mock marker node with the given diagnostic marker.
+ * @param marker the diagnostic marker.
+ *
+ * @returns a mock marker node.
+ */
+function createMockMarkerNode(marker) {
+    return {
+        id: 'id',
+        name: 'marker',
+        parent: undefined,
+        selected: false,
+        uri: new uri_1.default(''),
+        marker
+    };
+}
+/**
+ * Create a mock diagnostic marker.
+ * @param range the diagnostic range.
+ * @param severity the diagnostic severity.
+ * @param owner the optional owner of the diagnostic
+ *
+ * @returns a mock diagnostic marker.
+ */
+function createMockMarker(range, severity, owner) {
+    const data = {
+        range: range,
+        severity: severity,
+        message: 'message'
+    };
+    return Object.freeze({
+        uri: 'uri',
+        kind: 'marker',
+        owner: owner !== null && owner !== void 0 ? owner : 'owner',
+        data
+    });
+}
+function getRootNode(id) {
+    return {
+        visible: false,
+        id: id,
+        name: 'MarkerTree',
+        kind: 'problem',
+        children: [],
+        parent: undefined
+    };
+}
 //# sourceMappingURL=problem-composite-tree-node.spec.js.map

package/lib/browser/problem/problem-container.d.ts

@@ -1,9 +1,9 @@
-import { interfaces, Container } from '@theia/core/shared/inversify';
-import { MarkerOptions } from '../marker-tree';
-import { ProblemWidget } from './problem-widget';
-import { TreeProps } from '@theia/core/lib/browser';
-export declare const PROBLEM_TREE_PROPS: TreeProps;
-export declare const PROBLEM_OPTIONS: MarkerOptions;
-export declare function createProblemTreeContainer(parent: interfaces.Container): Container;
-export declare function createProblemWidget(parent: interfaces.Container): ProblemWidget;
+import { interfaces, Container } from '@theia/core/shared/inversify';
+import { MarkerOptions } from '../marker-tree';
+import { ProblemWidget } from './problem-widget';
+import { TreeProps } from '@theia/core/lib/browser';
+export declare const PROBLEM_TREE_PROPS: TreeProps;
+export declare const PROBLEM_OPTIONS: MarkerOptions;
+export declare function createProblemTreeContainer(parent: interfaces.Container): Container;
+export declare function createProblemWidget(parent: interfaces.Container): ProblemWidget;
 //# sourceMappingURL=problem-container.d.ts.map