@theia/editor 1.34.2 → 1.34.3

package/src/browser/navigation/test/mock-navigation-location-updater.ts

@@ -1,41 +1,41 @@
-// *****************************************************************************
-// Copyright (C) 2018 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 WITH Classpath-exception-2.0
-// *****************************************************************************
-
-import { Range } from '../navigation-location';
-import { NavigationLocationUpdater } from '../navigation-location-updater';
-
-/**
- * Navigation location updater with increased method visibility for testing.
- */
-export class MockNavigationLocationUpdater extends NavigationLocationUpdater {
-
-    override contained(subRange: Range, range: Range): boolean {
-        return super.contained(subRange, range);
-    }
-
-}
-
-/**
- * NOOP navigation location updater for testing. Use this, if you want to avoid any
- * location updates during the tests.
- */
-export class NoopNavigationLocationUpdater extends NavigationLocationUpdater {
-
-    override affects(): false {
-        return false;
-    }
-
-}
+// *****************************************************************************
+// Copyright (C) 2018 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 WITH Classpath-exception-2.0
+// *****************************************************************************
+
+import { Range } from '../navigation-location';
+import { NavigationLocationUpdater } from '../navigation-location-updater';
+
+/**
+ * Navigation location updater with increased method visibility for testing.
+ */
+export class MockNavigationLocationUpdater extends NavigationLocationUpdater {
+
+    override contained(subRange: Range, range: Range): boolean {
+        return super.contained(subRange, range);
+    }
+
+}
+
+/**
+ * NOOP navigation location updater for testing. Use this, if you want to avoid any
+ * location updates during the tests.
+ */
+export class NoopNavigationLocationUpdater extends NavigationLocationUpdater {
+
+    override affects(): false {
+        return false;
+    }
+
+}

package/src/browser/quick-editor-service.ts

@@ -1,94 +1,94 @@
-// *****************************************************************************
-// Copyright (C) 2021 SAP SE or an SAP affiliate company 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
-// *****************************************************************************
-
-import { injectable, inject } from '@theia/core/shared/inversify';
-import { CancellationToken, nls, QuickPickItemOrSeparator } from '@theia/core/lib/common';
-import { LabelProvider } from '@theia/core/lib/browser/label-provider';
-import { QuickAccessProvider, QuickAccessRegistry, QuickAccessContribution } from '@theia/core/lib/browser/quick-input/quick-access';
-import { filterItems, QuickPickItem, QuickPickSeparator } from '@theia/core/lib/browser/quick-input/quick-input-service';
-import { ApplicationShell, NavigatableWidget, TabBar, Widget } from '@theia/core/lib/browser';
-
-@injectable()
-export class QuickEditorService implements QuickAccessContribution, QuickAccessProvider {
-    static PREFIX = 'edt ';
-
-    @inject(LabelProvider) protected readonly labelProvider: LabelProvider;
-    @inject(QuickAccessRegistry) protected readonly quickAccessRegistry: QuickAccessRegistry;
-    @inject(ApplicationShell) protected readonly shell: ApplicationShell;
-
-    protected groupLocalizations: string[] = [];
-
-    registerQuickAccessProvider(): void {
-        this.quickAccessRegistry.registerQuickAccessProvider({
-            getInstance: () => this,
-            prefix: QuickEditorService.PREFIX,
-            placeholder: '',
-            helpEntries: [{ description: 'Show All Opened Editors', needsEditor: false }]
-        });
-    }
-
-    getPicks(filter: string, token: CancellationToken): (QuickPickItem | QuickPickSeparator)[] {
-        const editorItems: QuickPickItemOrSeparator[] = [];
-        const hasUri = (widget: Widget): widget is NavigatableWidget => Boolean(NavigatableWidget.getUri(widget));
-        const handleWidgets = (widgets: NavigatableWidget[], label: string) => {
-            if (widgets.length) {
-                editorItems.push({ type: 'separator', label });
-            }
-            editorItems.push(...widgets.map(widget => this.toItem(widget)));
-        };
-        const handleSplittableArea = (tabbars: TabBar<Widget>[], labelPrefix: string) => {
-            tabbars.forEach((tabbar, index) => {
-                const editorsOnTabbar = tabbar.titles.reduce<NavigatableWidget[]>((widgets, title) => {
-                    if (hasUri(title.owner)) {
-                        widgets.push(title.owner);
-                    }
-                    return widgets;
-                }, []);
-                const label = tabbars.length > 1 ? `${labelPrefix} ${this.getGroupLocalization(index)}` : labelPrefix;
-                handleWidgets(editorsOnTabbar, label);
-            });
-        };
-
-        handleSplittableArea(this.shell.mainAreaTabBars, ApplicationShell.areaLabels.main);
-        handleSplittableArea(this.shell.bottomAreaTabBars, ApplicationShell.areaLabels.bottom);
-
-        for (const area of ['left', 'right'] as ApplicationShell.Area[]) {
-            const editorsInArea = this.shell.getWidgets(area).filter(hasUri);
-            handleWidgets(editorsInArea, ApplicationShell.areaLabels[area]);
-        }
-
-        return filterItems(editorItems.slice(), filter);
-    }
-
-    protected getGroupLocalization(index: number): string {
-        return this.groupLocalizations[index] || nls.localizeByDefault('Group {0}', index + 1);
-    }
-
-    protected toItem(widget: NavigatableWidget): QuickPickItem {
-        const uri = NavigatableWidget.getUri(widget)!;
-        const icon = this.labelProvider.getIcon(uri);
-        const iconClasses = icon === '' ? undefined : [icon + ' file-icon'];
-
-        return {
-            label: this.labelProvider.getName(uri),
-            description: this.labelProvider.getDetails(uri),
-            iconClasses,
-            ariaLabel: uri.path.fsPath(),
-            alwaysShow: true,
-            execute: () => this.shell.activateWidget(widget.id),
-        };
-    }
-}
+// *****************************************************************************
+// Copyright (C) 2021 SAP SE or an SAP affiliate company 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
+// *****************************************************************************
+
+import { injectable, inject } from '@theia/core/shared/inversify';
+import { CancellationToken, nls, QuickPickItemOrSeparator } from '@theia/core/lib/common';
+import { LabelProvider } from '@theia/core/lib/browser/label-provider';
+import { QuickAccessProvider, QuickAccessRegistry, QuickAccessContribution } from '@theia/core/lib/browser/quick-input/quick-access';
+import { filterItems, QuickPickItem, QuickPickSeparator } from '@theia/core/lib/browser/quick-input/quick-input-service';
+import { ApplicationShell, NavigatableWidget, TabBar, Widget } from '@theia/core/lib/browser';
+
+@injectable()
+export class QuickEditorService implements QuickAccessContribution, QuickAccessProvider {
+    static PREFIX = 'edt ';
+
+    @inject(LabelProvider) protected readonly labelProvider: LabelProvider;
+    @inject(QuickAccessRegistry) protected readonly quickAccessRegistry: QuickAccessRegistry;
+    @inject(ApplicationShell) protected readonly shell: ApplicationShell;
+
+    protected groupLocalizations: string[] = [];
+
+    registerQuickAccessProvider(): void {
+        this.quickAccessRegistry.registerQuickAccessProvider({
+            getInstance: () => this,
+            prefix: QuickEditorService.PREFIX,
+            placeholder: '',
+            helpEntries: [{ description: 'Show All Opened Editors', needsEditor: false }]
+        });
+    }
+
+    getPicks(filter: string, token: CancellationToken): (QuickPickItem | QuickPickSeparator)[] {
+        const editorItems: QuickPickItemOrSeparator[] = [];
+        const hasUri = (widget: Widget): widget is NavigatableWidget => Boolean(NavigatableWidget.getUri(widget));
+        const handleWidgets = (widgets: NavigatableWidget[], label: string) => {
+            if (widgets.length) {
+                editorItems.push({ type: 'separator', label });
+            }
+            editorItems.push(...widgets.map(widget => this.toItem(widget)));
+        };
+        const handleSplittableArea = (tabbars: TabBar<Widget>[], labelPrefix: string) => {
+            tabbars.forEach((tabbar, index) => {
+                const editorsOnTabbar = tabbar.titles.reduce<NavigatableWidget[]>((widgets, title) => {
+                    if (hasUri(title.owner)) {
+                        widgets.push(title.owner);
+                    }
+                    return widgets;
+                }, []);
+                const label = tabbars.length > 1 ? `${labelPrefix} ${this.getGroupLocalization(index)}` : labelPrefix;
+                handleWidgets(editorsOnTabbar, label);
+            });
+        };
+
+        handleSplittableArea(this.shell.mainAreaTabBars, ApplicationShell.areaLabels.main);
+        handleSplittableArea(this.shell.bottomAreaTabBars, ApplicationShell.areaLabels.bottom);
+
+        for (const area of ['left', 'right'] as ApplicationShell.Area[]) {
+            const editorsInArea = this.shell.getWidgets(area).filter(hasUri);
+            handleWidgets(editorsInArea, ApplicationShell.areaLabels[area]);
+        }
+
+        return filterItems(editorItems.slice(), filter);
+    }
+
+    protected getGroupLocalization(index: number): string {
+        return this.groupLocalizations[index] || nls.localizeByDefault('Group {0}', index + 1);
+    }
+
+    protected toItem(widget: NavigatableWidget): QuickPickItem {
+        const uri = NavigatableWidget.getUri(widget)!;
+        const icon = this.labelProvider.getIcon(uri);
+        const iconClasses = icon === '' ? undefined : [icon + ' file-icon'];
+
+        return {
+            label: this.labelProvider.getName(uri),
+            description: this.labelProvider.getDetails(uri),
+            iconClasses,
+            ariaLabel: uri.path.fsPath(),
+            alwaysShow: true,
+            execute: () => this.shell.activateWidget(widget.id),
+        };
+    }
+}

package/src/browser/style/index.css

@@ -1,19 +1,19 @@
-/********************************************************************************
- * Copyright (C) 2020 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 WITH Classpath-exception-2.0
- ********************************************************************************/
-
-.theia-editor {
-    height: 100%;
-}
+/********************************************************************************
+ * Copyright (C) 2020 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 WITH Classpath-exception-2.0
+ ********************************************************************************/
+
+.theia-editor {
+    height: 100%;
+}

package/src/common/language-selector.ts

@@ -1,104 +1,104 @@
-// *****************************************************************************
-// Copyright (C) 2020 Red Hat, Inc. 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
-// *****************************************************************************
-
-import { match as matchGlobPattern } from '@theia/core/lib/common/glob';
-
-export interface RelativePattern {
-    base: string;
-    pattern: string;
-    pathToRelative(from: string, to: string): string;
-}
-
-export interface LanguageFilter {
-    language?: string;
-    scheme?: string;
-    pattern?: string | RelativePattern;
-    hasAccessToAllModels?: boolean;
-}
-export type LanguageSelector = string | LanguageFilter | (string | LanguageFilter)[];
-
-export function score(selector: LanguageSelector | undefined, uriScheme: string, path: string, candidateLanguage: string, candidateIsSynchronized: boolean): number {
-
-    if (Array.isArray(selector)) {
-        let ret = 0;
-        for (const filter of selector) {
-            const value = score(filter, uriScheme, path, candidateLanguage, candidateIsSynchronized);
-            if (value === 10) {
-                return value;
-            }
-            if (value > ret) {
-                ret = value;
-            }
-        }
-        return ret;
-
-    } else if (typeof selector === 'string') {
-
-        if (!candidateIsSynchronized) {
-            return 0;
-        }
-
-        if (selector === '*') {
-            return 5;
-        } else if (selector === candidateLanguage) {
-            return 10;
-        } else {
-            return 0;
-        }
-
-    } else if (selector) {
-        const { language, pattern, scheme, hasAccessToAllModels } = selector;
-
-        if (!candidateIsSynchronized && !hasAccessToAllModels) {
-            return 0;
-        }
-
-        let result = 0;
-
-        if (scheme) {
-            if (scheme === uriScheme) {
-                result = 10;
-            } else if (scheme === '*') {
-                result = 5;
-            } else {
-                return 0;
-            }
-        }
-
-        if (language) {
-            if (language === candidateLanguage) {
-                result = 10;
-            } else if (language === '*') {
-                result = Math.max(result, 5);
-            } else {
-                return 0;
-            }
-        }
-
-        if (pattern) {
-            if (pattern === path || matchGlobPattern(pattern, path)) {
-                result = 10;
-            } else {
-                return 0;
-            }
-        }
-
-        return result;
-
-    } else {
-        return 0;
-    }
-}
+// *****************************************************************************
+// Copyright (C) 2020 Red Hat, Inc. 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
+// *****************************************************************************
+
+import { match as matchGlobPattern } from '@theia/core/lib/common/glob';
+
+export interface RelativePattern {
+    base: string;
+    pattern: string;
+    pathToRelative(from: string, to: string): string;
+}
+
+export interface LanguageFilter {
+    language?: string;
+    scheme?: string;
+    pattern?: string | RelativePattern;
+    hasAccessToAllModels?: boolean;
+}
+export type LanguageSelector = string | LanguageFilter | (string | LanguageFilter)[];
+
+export function score(selector: LanguageSelector | undefined, uriScheme: string, path: string, candidateLanguage: string, candidateIsSynchronized: boolean): number {
+
+    if (Array.isArray(selector)) {
+        let ret = 0;
+        for (const filter of selector) {
+            const value = score(filter, uriScheme, path, candidateLanguage, candidateIsSynchronized);
+            if (value === 10) {
+                return value;
+            }
+            if (value > ret) {
+                ret = value;
+            }
+        }
+        return ret;
+
+    } else if (typeof selector === 'string') {
+
+        if (!candidateIsSynchronized) {
+            return 0;
+        }
+
+        if (selector === '*') {
+            return 5;
+        } else if (selector === candidateLanguage) {
+            return 10;
+        } else {
+            return 0;
+        }
+
+    } else if (selector) {
+        const { language, pattern, scheme, hasAccessToAllModels } = selector;
+
+        if (!candidateIsSynchronized && !hasAccessToAllModels) {
+            return 0;
+        }
+
+        let result = 0;
+
+        if (scheme) {
+            if (scheme === uriScheme) {
+                result = 10;
+            } else if (scheme === '*') {
+                result = 5;
+            } else {
+                return 0;
+            }
+        }
+
+        if (language) {
+            if (language === candidateLanguage) {
+                result = 10;
+            } else if (language === '*') {
+                result = Math.max(result, 5);
+            } else {
+                return 0;
+            }
+        }
+
+        if (pattern) {
+            if (pattern === path || matchGlobPattern(pattern, path)) {
+                result = 10;
+            } else {
+                return 0;
+            }
+        }
+
+        return result;
+
+    } else {
+        return 0;
+    }
+}

package/src/package.spec.ts

@@ -1,28 +1,28 @@
-// *****************************************************************************
-// Copyright (C) 2017 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 WITH Classpath-exception-2.0
-// *****************************************************************************
-
-/* note: this bogus test file is required so that
-   we are able to run mocha unit tests on this
-   package, without having any actual unit tests in it.
-   This way a coverage report will be generated,
-   showing 0% coverage, instead of no report.
-   This file can be removed once we have real unit
-   tests in place. */
-
-describe('editor package', () => {
-
-    it('support code coverage statistics', () => true);
-});
+// *****************************************************************************
+// Copyright (C) 2017 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 WITH Classpath-exception-2.0
+// *****************************************************************************
+
+/* note: this bogus test file is required so that
+   we are able to run mocha unit tests on this
+   package, without having any actual unit tests in it.
+   This way a coverage report will be generated,
+   showing 0% coverage, instead of no report.
+   This file can be removed once we have real unit
+   tests in place. */
+
+describe('editor package', () => {
+
+    it('support code coverage statistics', () => true);
+});