@theia/markers 1.45.0 → 1.46.0-next.72

package/src/browser/problem/problem-composite-tree-node.ts

@@ -1,81 +1,81 @@
-// *****************************************************************************
-// 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-only WITH Classpath-exception-2.0
-// *****************************************************************************
-
-import { CompositeTreeNode } from '@theia/core/lib/browser/tree/tree';
-import { MarkerInfoNode } from '../marker-tree';
-import URI from '@theia/core/lib/common/uri';
-import { Marker } from '../../common/marker';
-import { Diagnostic, DiagnosticSeverity } from '@theia/core/shared/vscode-languageserver-protocol';
-import { ProblemUtils } from './problem-utils';
-
-export namespace ProblemCompositeTreeNode {
-
-    export function setSeverity(parent: MarkerInfoNode, markers: Marker<Diagnostic>[]): void {
-        let maxSeverity: DiagnosticSeverity | undefined;
-        markers.forEach(marker => {
-            if (ProblemUtils.severityCompare(marker.data.severity, maxSeverity) < 0) {
-                maxSeverity = marker.data.severity;
-            }
-        });
-        parent.severity = maxSeverity;
-    };
-
-    export function addChildren(parent: CompositeTreeNode, insertChildren: { node: MarkerInfoNode, markers: Marker<Diagnostic>[] }[]): void {
-        for (const { node, markers } of insertChildren) {
-            ProblemCompositeTreeNode.setSeverity(node, markers);
-        }
-
-        const sortedInsertChildren = insertChildren.sort(
-            (a, b) => (ProblemUtils.severityCompare(a.node.severity, b.node.severity) || compareURI(a.node.uri, b.node.uri))
-        );
-
-        let startIndex = 0;
-        const children = parent.children as MarkerInfoNode[];
-        for (const { node } of sortedInsertChildren) {
-            const index = children.findIndex(value => value.id === node.id);
-            if (index !== -1) {
-                CompositeTreeNode.removeChild(parent, node);
-            }
-            if (children.length === 0) {
-                children.push(node);
-                startIndex = 1;
-                CompositeTreeNode.setParent(node, 0, parent);
-            } else {
-                let inserted = false;
-                for (let i = startIndex; i < children.length; i++) {
-                    // sort by severity, equal severity => sort by URI
-                    if (ProblemUtils.severityCompare(node.severity, children[i].severity) < 0
-                        || (ProblemUtils.severityCompare(node.severity, children[i].severity) === 0 && compareURI(node.uri, children[i].uri) < 0)) {
-                        children.splice(i, 0, node);
-                        inserted = true;
-                        startIndex = i + 1;
-                        CompositeTreeNode.setParent(node, i, parent);
-                        break;
-                    };
-                }
-                if (inserted === false) {
-                    children.push(node);
-                    startIndex = children.length;
-                    CompositeTreeNode.setParent(node, children.length - 1, parent);
-                }
-            }
-        }
-    }
-
-    const compareURI = (uri1: URI, uri2: URI): number =>
-        uri1.toString().localeCompare(uri2.toString(), undefined, { sensitivity: 'base' });
-    ;
-}
+// *****************************************************************************
+// 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-only WITH Classpath-exception-2.0
+// *****************************************************************************
+
+import { CompositeTreeNode } from '@theia/core/lib/browser/tree/tree';
+import { MarkerInfoNode } from '../marker-tree';
+import URI from '@theia/core/lib/common/uri';
+import { Marker } from '../../common/marker';
+import { Diagnostic, DiagnosticSeverity } from '@theia/core/shared/vscode-languageserver-protocol';
+import { ProblemUtils } from './problem-utils';
+
+export namespace ProblemCompositeTreeNode {
+
+    export function setSeverity(parent: MarkerInfoNode, markers: Marker<Diagnostic>[]): void {
+        let maxSeverity: DiagnosticSeverity | undefined;
+        markers.forEach(marker => {
+            if (ProblemUtils.severityCompare(marker.data.severity, maxSeverity) < 0) {
+                maxSeverity = marker.data.severity;
+            }
+        });
+        parent.severity = maxSeverity;
+    };
+
+    export function addChildren(parent: CompositeTreeNode, insertChildren: { node: MarkerInfoNode, markers: Marker<Diagnostic>[] }[]): void {
+        for (const { node, markers } of insertChildren) {
+            ProblemCompositeTreeNode.setSeverity(node, markers);
+        }
+
+        const sortedInsertChildren = insertChildren.sort(
+            (a, b) => (ProblemUtils.severityCompare(a.node.severity, b.node.severity) || compareURI(a.node.uri, b.node.uri))
+        );
+
+        let startIndex = 0;
+        const children = parent.children as MarkerInfoNode[];
+        for (const { node } of sortedInsertChildren) {
+            const index = children.findIndex(value => value.id === node.id);
+            if (index !== -1) {
+                CompositeTreeNode.removeChild(parent, node);
+            }
+            if (children.length === 0) {
+                children.push(node);
+                startIndex = 1;
+                CompositeTreeNode.setParent(node, 0, parent);
+            } else {
+                let inserted = false;
+                for (let i = startIndex; i < children.length; i++) {
+                    // sort by severity, equal severity => sort by URI
+                    if (ProblemUtils.severityCompare(node.severity, children[i].severity) < 0
+                        || (ProblemUtils.severityCompare(node.severity, children[i].severity) === 0 && compareURI(node.uri, children[i].uri) < 0)) {
+                        children.splice(i, 0, node);
+                        inserted = true;
+                        startIndex = i + 1;
+                        CompositeTreeNode.setParent(node, i, parent);
+                        break;
+                    };
+                }
+                if (inserted === false) {
+                    children.push(node);
+                    startIndex = children.length;
+                    CompositeTreeNode.setParent(node, children.length - 1, parent);
+                }
+            }
+        }
+    }
+
+    const compareURI = (uri1: URI, uri2: URI): number =>
+        uri1.toString().localeCompare(uri2.toString(), undefined, { sensitivity: 'base' });
+    ;
+}

package/src/browser/problem/problem-container.ts

@@ -1,47 +1,47 @@
-// *****************************************************************************
-// Copyright (C) 2017 TypeFox 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-only WITH Classpath-exception-2.0
-// *****************************************************************************
-
-import { interfaces, Container } from '@theia/core/shared/inversify';
-import { MarkerOptions } from '../marker-tree';
-import { ProblemWidget } from './problem-widget';
-import { ProblemTreeModel, ProblemTree } from './problem-tree-model';
-import { TreeProps, defaultTreeProps, createTreeContainer } from '@theia/core/lib/browser';
-import { PROBLEM_KIND } from '../../common/problem-marker';
-
-export const PROBLEM_TREE_PROPS = <TreeProps>{
-    ...defaultTreeProps,
-    contextMenuPath: [PROBLEM_KIND],
-    globalSelection: true
-};
-
-export const PROBLEM_OPTIONS = <MarkerOptions>{
-    kind: 'problem'
-};
-
-export function createProblemTreeContainer(parent: interfaces.Container): Container {
-    const child = createTreeContainer(parent, {
-        tree: ProblemTree,
-        widget: ProblemWidget,
-        model: ProblemTreeModel,
-        props: PROBLEM_TREE_PROPS,
-    });
-    child.bind(MarkerOptions).toConstantValue(PROBLEM_OPTIONS);
-    return child;
-}
-
-export function createProblemWidget(parent: interfaces.Container): ProblemWidget {
-    return createProblemTreeContainer(parent).get(ProblemWidget);
-}
+// *****************************************************************************
+// Copyright (C) 2017 TypeFox 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-only WITH Classpath-exception-2.0
+// *****************************************************************************
+
+import { interfaces, Container } from '@theia/core/shared/inversify';
+import { MarkerOptions } from '../marker-tree';
+import { ProblemWidget } from './problem-widget';
+import { ProblemTreeModel, ProblemTree } from './problem-tree-model';
+import { TreeProps, defaultTreeProps, createTreeContainer } from '@theia/core/lib/browser';
+import { PROBLEM_KIND } from '../../common/problem-marker';
+
+export const PROBLEM_TREE_PROPS = <TreeProps>{
+    ...defaultTreeProps,
+    contextMenuPath: [PROBLEM_KIND],
+    globalSelection: true
+};
+
+export const PROBLEM_OPTIONS = <MarkerOptions>{
+    kind: 'problem'
+};
+
+export function createProblemTreeContainer(parent: interfaces.Container): Container {
+    const child = createTreeContainer(parent, {
+        tree: ProblemTree,
+        widget: ProblemWidget,
+        model: ProblemTreeModel,
+        props: PROBLEM_TREE_PROPS,
+    });
+    child.bind(MarkerOptions).toConstantValue(PROBLEM_OPTIONS);
+    return child;
+}
+
+export function createProblemWidget(parent: interfaces.Container): ProblemWidget {
+    return createProblemTreeContainer(parent).get(ProblemWidget);
+}