@theia/markers 1.45.0 → 1.46.0-next.72

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

@@ -1,90 +1,90 @@
-// *****************************************************************************
-// Copyright (C) 2020 Ericsson 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 { Marker } from '../../common/marker';
-import { Diagnostic, DiagnosticSeverity } from '@theia/core/shared/vscode-languageserver-protocol';
-
-export namespace ProblemUtils {
-
-    /**
-     * Comparator for severity.
-     * - The highest severity (`error`) come first followed by others.
-     * - `undefined` severities are treated as the last ones.
-     * @param a the first marker for comparison.
-     * @param b the second marker for comparison.
-     */
-    export const severityCompareMarker = (a: Marker<Diagnostic>, b: Marker<Diagnostic>): number =>
-        (a.data.severity || Number.MAX_SAFE_INTEGER) - (b.data.severity || Number.MAX_SAFE_INTEGER);
-
-    /**
-     * Comparator for severity.
-     * - The highest severity (`error`) come first followed by others.
-     * - `undefined` severities are treated as the last ones.
-     * @param a the first severity for comparison.
-     * @param b the second severity for comparison.
-     */
-    export const severityCompare = (a: DiagnosticSeverity | undefined, b: DiagnosticSeverity | undefined): number =>
-        (a || Number.MAX_SAFE_INTEGER) - (b || Number.MAX_SAFE_INTEGER);
-
-    /**
-     * Comparator for line numbers.
-     * - The lowest line number comes first.
-     * @param a the first marker for comparison.
-     * @param b the second marker for comparison.
-     */
-    export const lineNumberCompare = (a: Marker<Diagnostic>, b: Marker<Diagnostic>): number => a.data.range.start.line - b.data.range.start.line;
-
-    /**
-     * Comparator for column numbers.
-     * - The lowest column number comes first.
-     * @param a the first marker for comparison.
-     * @param b the second marker for comparison.
-     */
-    export const columnNumberCompare = (a: Marker<Diagnostic>, b: Marker<Diagnostic>): number => a.data.range.start.character - b.data.range.start.character;
-
-    /**
-     * Comparator for marker owner (source).
-     * - The order is alphabetical.
-     * @param a the first marker for comparison.
-     * @param b the second marker for comparison.
-     */
-    export const ownerCompare = (a: Marker<Diagnostic>, b: Marker<Diagnostic>): number => a.owner.localeCompare(b.owner);
-
-    export function getPriority(marker: Marker<Diagnostic>): number {
-        const { severity } = marker.data;
-        switch (severity) {
-            case DiagnosticSeverity.Error: return 30;
-            case DiagnosticSeverity.Warning: return 20;
-            case DiagnosticSeverity.Information: return 10;
-            default: return 0;
-        }
-    }
-
-    export function getColor(marker: Marker<Diagnostic>): string {
-        const { severity } = marker.data;
-        switch (severity) {
-            case DiagnosticSeverity.Error: return 'list.errorForeground';
-            case DiagnosticSeverity.Warning: return 'list.warningForeground';
-            default: return ''; // other severities should not be decorated.
-        }
-    }
-
-    export function filterMarker(marker: Marker<Diagnostic>): boolean {
-        const { severity } = marker.data;
-        return severity === DiagnosticSeverity.Error
-            || severity === DiagnosticSeverity.Warning;
-    }
-}
+// *****************************************************************************
+// Copyright (C) 2020 Ericsson 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 { Marker } from '../../common/marker';
+import { Diagnostic, DiagnosticSeverity } from '@theia/core/shared/vscode-languageserver-protocol';
+
+export namespace ProblemUtils {
+
+    /**
+     * Comparator for severity.
+     * - The highest severity (`error`) come first followed by others.
+     * - `undefined` severities are treated as the last ones.
+     * @param a the first marker for comparison.
+     * @param b the second marker for comparison.
+     */
+    export const severityCompareMarker = (a: Marker<Diagnostic>, b: Marker<Diagnostic>): number =>
+        (a.data.severity || Number.MAX_SAFE_INTEGER) - (b.data.severity || Number.MAX_SAFE_INTEGER);
+
+    /**
+     * Comparator for severity.
+     * - The highest severity (`error`) come first followed by others.
+     * - `undefined` severities are treated as the last ones.
+     * @param a the first severity for comparison.
+     * @param b the second severity for comparison.
+     */
+    export const severityCompare = (a: DiagnosticSeverity | undefined, b: DiagnosticSeverity | undefined): number =>
+        (a || Number.MAX_SAFE_INTEGER) - (b || Number.MAX_SAFE_INTEGER);
+
+    /**
+     * Comparator for line numbers.
+     * - The lowest line number comes first.
+     * @param a the first marker for comparison.
+     * @param b the second marker for comparison.
+     */
+    export const lineNumberCompare = (a: Marker<Diagnostic>, b: Marker<Diagnostic>): number => a.data.range.start.line - b.data.range.start.line;
+
+    /**
+     * Comparator for column numbers.
+     * - The lowest column number comes first.
+     * @param a the first marker for comparison.
+     * @param b the second marker for comparison.
+     */
+    export const columnNumberCompare = (a: Marker<Diagnostic>, b: Marker<Diagnostic>): number => a.data.range.start.character - b.data.range.start.character;
+
+    /**
+     * Comparator for marker owner (source).
+     * - The order is alphabetical.
+     * @param a the first marker for comparison.
+     * @param b the second marker for comparison.
+     */
+    export const ownerCompare = (a: Marker<Diagnostic>, b: Marker<Diagnostic>): number => a.owner.localeCompare(b.owner);
+
+    export function getPriority(marker: Marker<Diagnostic>): number {
+        const { severity } = marker.data;
+        switch (severity) {
+            case DiagnosticSeverity.Error: return 30;
+            case DiagnosticSeverity.Warning: return 20;
+            case DiagnosticSeverity.Information: return 10;
+            default: return 0;
+        }
+    }
+
+    export function getColor(marker: Marker<Diagnostic>): string {
+        const { severity } = marker.data;
+        switch (severity) {
+            case DiagnosticSeverity.Error: return 'list.errorForeground';
+            case DiagnosticSeverity.Warning: return 'list.warningForeground';
+            default: return ''; // other severities should not be decorated.
+        }
+    }
+
+    export function filterMarker(marker: Marker<Diagnostic>): boolean {
+        const { severity } = marker.data;
+        return severity === DiagnosticSeverity.Error
+            || severity === DiagnosticSeverity.Warning;
+    }
+}

package/src/browser/problem/problem-widget-tab-bar-decorator.ts

@@ -1,55 +1,55 @@
-// *****************************************************************************
-// Copyright (C) 2020 Ericsson 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 { injectable, inject, postConstruct } from '@theia/core/shared/inversify';
-import { Event, Emitter } from '@theia/core/lib/common/event';
-import { ProblemManager } from './problem-manager';
-import { TabBarDecorator } from '@theia/core/lib/browser/shell/tab-bar-decorator';
-import { Title, Widget } from '@theia/core/lib/browser';
-import { WidgetDecoration } from '@theia/core/lib/browser/widget-decoration';
-
-@injectable()
-export class ProblemWidgetTabBarDecorator implements TabBarDecorator {
-
-    readonly id = 'theia-problems-widget-tabbar-decorator';
-    protected readonly emitter = new Emitter<void>();
-
-    @inject(ProblemManager)
-    protected readonly problemManager: ProblemManager;
-
-    @postConstruct()
-    protected init(): void {
-        this.problemManager.onDidChangeMarkers(() => this.fireDidChangeDecorations());
-    }
-
-    decorate(title: Title<Widget>): WidgetDecoration.Data[] {
-        if (title.owner.id === 'problems') {
-            const { infos, warnings, errors } = this.problemManager.getProblemStat();
-            const markerCount = infos + warnings + errors;
-            return markerCount > 0 ? [{ badge: markerCount }] : [];
-        } else {
-            return [];
-        }
-    }
-
-    get onDidChangeDecorations(): Event<void> {
-        return this.emitter.event;
-    }
-
-    protected fireDidChangeDecorations(): void {
-        this.emitter.fire(undefined);
-    }
-}
+// *****************************************************************************
+// Copyright (C) 2020 Ericsson 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 { injectable, inject, postConstruct } from '@theia/core/shared/inversify';
+import { Event, Emitter } from '@theia/core/lib/common/event';
+import { ProblemManager } from './problem-manager';
+import { TabBarDecorator } from '@theia/core/lib/browser/shell/tab-bar-decorator';
+import { Title, Widget } from '@theia/core/lib/browser';
+import { WidgetDecoration } from '@theia/core/lib/browser/widget-decoration';
+
+@injectable()
+export class ProblemWidgetTabBarDecorator implements TabBarDecorator {
+
+    readonly id = 'theia-problems-widget-tabbar-decorator';
+    protected readonly emitter = new Emitter<void>();
+
+    @inject(ProblemManager)
+    protected readonly problemManager: ProblemManager;
+
+    @postConstruct()
+    protected init(): void {
+        this.problemManager.onDidChangeMarkers(() => this.fireDidChangeDecorations());
+    }
+
+    decorate(title: Title<Widget>): WidgetDecoration.Data[] {
+        if (title.owner.id === 'problems') {
+            const { infos, warnings, errors } = this.problemManager.getProblemStat();
+            const markerCount = infos + warnings + errors;
+            return markerCount > 0 ? [{ badge: markerCount }] : [];
+        } else {
+            return [];
+        }
+    }
+
+    get onDidChangeDecorations(): Event<void> {
+        return this.emitter.event;
+    }
+
+    protected fireDidChangeDecorations(): void {
+        this.emitter.fire(undefined);
+    }
+}