@theia/editor 1.45.1 → 1.46.0-next.72

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-only 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-only 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-only 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-only 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-only 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-only WITH Classpath-exception-2.0
+ ********************************************************************************/
+
+.theia-editor {
+  height: 100%;
+}

package/src/browser/undo-redo-service.ts

@@ -1,120 +1,120 @@
-// *****************************************************************************
-// 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-only WITH Classpath-exception-2.0
-// *****************************************************************************
-/*---------------------------------------------------------------------------------------------
- *  Copyright (c) Microsoft Corporation. All rights reserved.
- *  Licensed under the MIT License. See License.txt in the project root for license information.
- *--------------------------------------------------------------------------------------------*/
-// copied and modified from https://github.com/microsoft/vscode/blob/53eac52308c4611000a171cc7bf1214293473c78/src/vs/platform/undoRedo/common/undoRedoService.ts#
-
-import { injectable } from '@theia/core/shared/inversify';
-import URI from '@theia/core/lib/common/uri';
-
-@injectable()
-export class UndoRedoService {
-    private readonly editStacks = new Map<string, ResourceEditStack>();
-
-    pushElement(resource: URI, undo: () => Promise<void>, redo: () => Promise<void>): void {
-        let editStack: ResourceEditStack;
-        if (this.editStacks.has(resource.toString())) {
-            editStack = this.editStacks.get(resource.toString())!;
-        } else {
-            editStack = new ResourceEditStack();
-            this.editStacks.set(resource.toString(), editStack);
-        }
-
-        editStack.pushElement({ undo, redo });
-    }
-
-    removeElements(resource: URI): void {
-        if (this.editStacks.has(resource.toString())) {
-            this.editStacks.delete(resource.toString());
-        }
-    }
-
-    undo(resource: URI): void {
-        if (!this.editStacks.has(resource.toString())) {
-            return;
-        }
-
-        const editStack = this.editStacks.get(resource.toString())!;
-        const element = editStack.getClosestPastElement();
-        if (!element) {
-            return;
-        }
-
-        editStack.moveBackward(element);
-        element.undo();
-    }
-
-    redo(resource: URI): void {
-        if (!this.editStacks.has(resource.toString())) {
-            return;
-        }
-
-        const editStack = this.editStacks.get(resource.toString())!;
-        const element = editStack.getClosestFutureElement();
-        if (!element) {
-            return;
-        }
-
-        editStack.moveForward(element);
-        element.redo();
-    }
-}
-
-interface StackElement {
-    undo(): Promise<void> | void;
-    redo(): Promise<void> | void;
-}
-
-export class ResourceEditStack {
-    private past: StackElement[];
-    private future: StackElement[];
-
-    constructor() {
-        this.past = [];
-        this.future = [];
-    }
-
-    pushElement(element: StackElement): void {
-        this.future = [];
-        this.past.push(element);
-    }
-
-    getClosestPastElement(): StackElement | undefined {
-        if (this.past.length === 0) {
-            return undefined;
-        }
-        return this.past[this.past.length - 1];
-    }
-
-    getClosestFutureElement(): StackElement | undefined {
-        if (this.future.length === 0) {
-            return undefined;
-        }
-        return this.future[this.future.length - 1];
-    }
-
-    moveBackward(element: StackElement): void {
-        this.past.pop();
-        this.future.push(element);
-    }
-
-    moveForward(element: StackElement): void {
-        this.future.pop();
-        this.past.push(element);
-    }
-}
+// *****************************************************************************
+// 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-only WITH Classpath-exception-2.0
+// *****************************************************************************
+/*---------------------------------------------------------------------------------------------
+ *  Copyright (c) Microsoft Corporation. All rights reserved.
+ *  Licensed under the MIT License. See License.txt in the project root for license information.
+ *--------------------------------------------------------------------------------------------*/
+// copied and modified from https://github.com/microsoft/vscode/blob/53eac52308c4611000a171cc7bf1214293473c78/src/vs/platform/undoRedo/common/undoRedoService.ts#
+
+import { injectable } from '@theia/core/shared/inversify';
+import URI from '@theia/core/lib/common/uri';
+
+@injectable()
+export class UndoRedoService {
+    private readonly editStacks = new Map<string, ResourceEditStack>();
+
+    pushElement(resource: URI, undo: () => Promise<void>, redo: () => Promise<void>): void {
+        let editStack: ResourceEditStack;
+        if (this.editStacks.has(resource.toString())) {
+            editStack = this.editStacks.get(resource.toString())!;
+        } else {
+            editStack = new ResourceEditStack();
+            this.editStacks.set(resource.toString(), editStack);
+        }
+
+        editStack.pushElement({ undo, redo });
+    }
+
+    removeElements(resource: URI): void {
+        if (this.editStacks.has(resource.toString())) {
+            this.editStacks.delete(resource.toString());
+        }
+    }
+
+    undo(resource: URI): void {
+        if (!this.editStacks.has(resource.toString())) {
+            return;
+        }
+
+        const editStack = this.editStacks.get(resource.toString())!;
+        const element = editStack.getClosestPastElement();
+        if (!element) {
+            return;
+        }
+
+        editStack.moveBackward(element);
+        element.undo();
+    }
+
+    redo(resource: URI): void {
+        if (!this.editStacks.has(resource.toString())) {
+            return;
+        }
+
+        const editStack = this.editStacks.get(resource.toString())!;
+        const element = editStack.getClosestFutureElement();
+        if (!element) {
+            return;
+        }
+
+        editStack.moveForward(element);
+        element.redo();
+    }
+}
+
+interface StackElement {
+    undo(): Promise<void> | void;
+    redo(): Promise<void> | void;
+}
+
+export class ResourceEditStack {
+    private past: StackElement[];
+    private future: StackElement[];
+
+    constructor() {
+        this.past = [];
+        this.future = [];
+    }
+
+    pushElement(element: StackElement): void {
+        this.future = [];
+        this.past.push(element);
+    }
+
+    getClosestPastElement(): StackElement | undefined {
+        if (this.past.length === 0) {
+            return undefined;
+        }
+        return this.past[this.past.length - 1];
+    }
+
+    getClosestFutureElement(): StackElement | undefined {
+        if (this.future.length === 0) {
+            return undefined;
+        }
+        return this.future[this.future.length - 1];
+    }
+
+    moveBackward(element: StackElement): void {
+        this.past.pop();
+        this.future.push(element);
+    }
+
+    moveForward(element: StackElement): void {
+        this.future.pop();
+        this.past.push(element);
+    }
+}