@theia/core 1.53.0-next.55 → 1.53.0-next.64

package/src/browser/shell/view-column-service.ts

@@ -1,125 +1,125 @@
-// *****************************************************************************
-// Copyright (C) 2019 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-only WITH Classpath-exception-2.0
-// *****************************************************************************
-
-import { injectable, inject } from 'inversify';
-import { Emitter, Event } from '../../common/event';
-import { ApplicationShell } from './application-shell';
-import { toArray } from '@phosphor/algorithm';
-import { TabBar, Widget } from '@phosphor/widgets';
-
-@injectable()
-export class ViewColumnService {
-    private readonly columnValues = new Map<string, number>();
-    private readonly viewColumnIds = new Map<number, string[]>();
-
-    protected readonly onViewColumnChangedEmitter = new Emitter<{ id: string, viewColumn: number }>();
-
-    constructor(
-        @inject(ApplicationShell) private readonly shell: ApplicationShell,
-    ) {
-        let oldColumnValues = new Map<string, number>();
-        const update = async () => {
-            await new Promise<void>((resolve => setTimeout(resolve)));
-            this.updateViewColumns();
-            this.viewColumnIds.forEach((ids: string[], viewColumn: number) => {
-                ids.forEach((id: string) => {
-                    if (!oldColumnValues.has(id) || oldColumnValues.get(id) !== viewColumn) {
-                        this.onViewColumnChangedEmitter.fire({ id, viewColumn });
-                    }
-                });
-            });
-            oldColumnValues = new Map(this.columnValues.entries());
-        };
-        this.shell.mainPanel.widgetAdded.connect(() => update());
-        this.shell.mainPanel.widgetRemoved.connect(() => update());
-    }
-
-    get onViewColumnChanged(): Event<{ id: string, viewColumn: number }> {
-        return this.onViewColumnChangedEmitter.event;
-    }
-
-    updateViewColumns(): void {
-        this.columnValues.clear();
-        this.viewColumnIds.clear();
-
-        const rows = new Map<number, Set<number>>();
-        const columns = new Map<number, Map<number, TabBar<Widget>>>();
-        for (const tabBar of toArray(this.shell.mainPanel.tabBars())) {
-            if (!tabBar.node.style.top || !tabBar.node.style.left) {
-                continue;
-            }
-            const top = parseInt(tabBar.node.style.top);
-            const left = parseInt(tabBar.node.style.left);
-
-            const row = rows.get(top) || new Set<number>();
-            row.add(left);
-            rows.set(top, row);
-
-            const column = columns.get(left) || new Map<number, TabBar<Widget>>();
-            column.set(top, tabBar);
-            columns.set(left, column);
-        }
-        const firstRow = rows.get([...rows.keys()].sort()[0]);
-        if (!firstRow) {
-            return;
-        }
-        const lefts = [...firstRow.keys()].sort();
-        for (let i = 0; i < lefts.length; i++) {
-            const column = columns.get(lefts[i]);
-            if (!column) {
-                break;
-            }
-            const cellIndexes = [...column.keys()].sort();
-            let viewColumn = Math.min(i, 2);
-            for (let j = 0; j < cellIndexes.length; j++) {
-                const cell = column.get(cellIndexes[j]);
-                if (!cell) {
-                    break;
-                }
-                this.setViewColumn(cell, viewColumn);
-                if (viewColumn < 7) {
-                    viewColumn += 3;
-                }
-            }
-        }
-    }
-
-    protected setViewColumn(tabBar: TabBar<Widget>, viewColumn: number): void {
-        const ids = [];
-        for (const title of tabBar.titles) {
-            const id = title.owner.id;
-            ids.push(id);
-            this.columnValues.set(id, viewColumn);
-        }
-        this.viewColumnIds.set(viewColumn, ids);
-    }
-
-    getViewColumnIds(viewColumn: number): string[] {
-        return this.viewColumnIds.get(viewColumn) || [];
-    }
-
-    getViewColumn(id: string): number | undefined {
-        return this.columnValues.get(id);
-    }
-
-    hasViewColumn(id: string): boolean {
-        return this.columnValues.has(id);
-    }
-
-    viewColumnsSize(): number {
-        return this.viewColumnIds.size;
-    }
-}
+// *****************************************************************************
+// Copyright (C) 2019 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-only WITH Classpath-exception-2.0
+// *****************************************************************************
+
+import { injectable, inject } from 'inversify';
+import { Emitter, Event } from '../../common/event';
+import { ApplicationShell } from './application-shell';
+import { toArray } from '@phosphor/algorithm';
+import { TabBar, Widget } from '@phosphor/widgets';
+
+@injectable()
+export class ViewColumnService {
+    private readonly columnValues = new Map<string, number>();
+    private readonly viewColumnIds = new Map<number, string[]>();
+
+    protected readonly onViewColumnChangedEmitter = new Emitter<{ id: string, viewColumn: number }>();
+
+    constructor(
+        @inject(ApplicationShell) private readonly shell: ApplicationShell,
+    ) {
+        let oldColumnValues = new Map<string, number>();
+        const update = async () => {
+            await new Promise<void>((resolve => setTimeout(resolve)));
+            this.updateViewColumns();
+            this.viewColumnIds.forEach((ids: string[], viewColumn: number) => {
+                ids.forEach((id: string) => {
+                    if (!oldColumnValues.has(id) || oldColumnValues.get(id) !== viewColumn) {
+                        this.onViewColumnChangedEmitter.fire({ id, viewColumn });
+                    }
+                });
+            });
+            oldColumnValues = new Map(this.columnValues.entries());
+        };
+        this.shell.mainPanel.widgetAdded.connect(() => update());
+        this.shell.mainPanel.widgetRemoved.connect(() => update());
+    }
+
+    get onViewColumnChanged(): Event<{ id: string, viewColumn: number }> {
+        return this.onViewColumnChangedEmitter.event;
+    }
+
+    updateViewColumns(): void {
+        this.columnValues.clear();
+        this.viewColumnIds.clear();
+
+        const rows = new Map<number, Set<number>>();
+        const columns = new Map<number, Map<number, TabBar<Widget>>>();
+        for (const tabBar of toArray(this.shell.mainPanel.tabBars())) {
+            if (!tabBar.node.style.top || !tabBar.node.style.left) {
+                continue;
+            }
+            const top = parseInt(tabBar.node.style.top);
+            const left = parseInt(tabBar.node.style.left);
+
+            const row = rows.get(top) || new Set<number>();
+            row.add(left);
+            rows.set(top, row);
+
+            const column = columns.get(left) || new Map<number, TabBar<Widget>>();
+            column.set(top, tabBar);
+            columns.set(left, column);
+        }
+        const firstRow = rows.get([...rows.keys()].sort()[0]);
+        if (!firstRow) {
+            return;
+        }
+        const lefts = [...firstRow.keys()].sort();
+        for (let i = 0; i < lefts.length; i++) {
+            const column = columns.get(lefts[i]);
+            if (!column) {
+                break;
+            }
+            const cellIndexes = [...column.keys()].sort();
+            let viewColumn = Math.min(i, 2);
+            for (let j = 0; j < cellIndexes.length; j++) {
+                const cell = column.get(cellIndexes[j]);
+                if (!cell) {
+                    break;
+                }
+                this.setViewColumn(cell, viewColumn);
+                if (viewColumn < 7) {
+                    viewColumn += 3;
+                }
+            }
+        }
+    }
+
+    protected setViewColumn(tabBar: TabBar<Widget>, viewColumn: number): void {
+        const ids = [];
+        for (const title of tabBar.titles) {
+            const id = title.owner.id;
+            ids.push(id);
+            this.columnValues.set(id, viewColumn);
+        }
+        this.viewColumnIds.set(viewColumn, ids);
+    }
+
+    getViewColumnIds(viewColumn: number): string[] {
+        return this.viewColumnIds.get(viewColumn) || [];
+    }
+
+    getViewColumn(id: string): number | undefined {
+        return this.columnValues.get(id);
+    }
+
+    hasViewColumn(id: string): boolean {
+        return this.columnValues.has(id);
+    }
+
+    viewColumnsSize(): number {
+        return this.viewColumnIds.size;
+    }
+}

package/src/browser/shell/view-contribution.ts

@@ -1,178 +1,178 @@
-// *****************************************************************************
-// 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 { injectable, inject, interfaces, optional } from 'inversify';
-import { Widget } from '@phosphor/widgets';
-import {
-    MenuModelRegistry, Command, CommandContribution,
-    MenuContribution, CommandRegistry, nls
-} from '../../common';
-import { KeybindingContribution, KeybindingRegistry } from '../keybinding';
-import { WidgetManager } from '../widget-manager';
-import { CommonMenus } from '../common-frontend-contribution';
-import { ApplicationShell } from './application-shell';
-import { QuickViewService } from '../quick-input';
-
-export interface OpenViewArguments extends ApplicationShell.WidgetOptions {
-    toggle?: boolean
-    activate?: boolean;
-    reveal?: boolean;
-}
-
-export interface ViewContributionOptions {
-    widgetId: string;
-    viewContainerId?: string;
-    widgetName: string;
-    defaultWidgetOptions: ApplicationShell.WidgetOptions;
-    toggleCommandId?: string;
-    toggleKeybinding?: string;
-}
-
-export function bindViewContribution<T extends AbstractViewContribution<Widget>>(bind: interfaces.Bind, identifier: interfaces.Newable<T>): interfaces.BindingWhenOnSyntax<T> {
-    const syntax = bind<T>(identifier).toSelf().inSingletonScope();
-    bind(CommandContribution).toService(identifier);
-    bind(KeybindingContribution).toService(identifier);
-    bind(MenuContribution).toService(identifier);
-    return syntax;
-}
-
-/**
- * An abstract superclass for frontend contributions that add a view to the application shell.
- */
-@injectable()
-export abstract class AbstractViewContribution<T extends Widget> implements CommandContribution, MenuContribution, KeybindingContribution {
-
-    @inject(WidgetManager) protected readonly widgetManager: WidgetManager;
-    @inject(ApplicationShell) protected readonly shell: ApplicationShell;
-
-    @inject(QuickViewService) @optional()
-    protected readonly quickView: QuickViewService;
-
-    readonly toggleCommand?: Command;
-
-    constructor(
-        protected readonly options: ViewContributionOptions
-    ) {
-        if (options.toggleCommandId) {
-            this.toggleCommand = {
-                id: options.toggleCommandId,
-                category: nls.localizeByDefault('View'),
-                label: nls.localizeByDefault('Toggle {0}', this.viewLabel)
-            };
-        }
-    }
-
-    get viewId(): string {
-        return this.options.widgetId;
-    }
-
-    get viewLabel(): string {
-        return this.options.widgetName;
-    }
-
-    get defaultViewOptions(): ApplicationShell.WidgetOptions {
-        return this.options.defaultWidgetOptions;
-    }
-
-    get widget(): Promise<T> {
-        return this.widgetManager.getOrCreateWidget(this.viewId);
-    }
-
-    tryGetWidget(): T | undefined {
-        return this.widgetManager.tryGetWidget(this.viewId);
-    }
-
-    async openView(args: Partial<OpenViewArguments> = {}): Promise<T> {
-        const shell = this.shell;
-        const widget = await this.widgetManager.getOrCreateWidget(this.options.viewContainerId || this.viewId);
-        const tabBar = shell.getTabBarFor(widget);
-        const area = shell.getAreaFor(widget);
-        if (!tabBar) {
-            // The widget is not attached yet, so add it to the shell
-            const widgetArgs: OpenViewArguments = {
-                ...this.defaultViewOptions,
-                ...args
-            };
-            await shell.addWidget(widget, widgetArgs);
-        } else if (args.toggle && area && shell.isExpanded(area) && tabBar.currentTitle === widget.title) {
-            // The widget is attached and visible, so collapse the containing panel (toggle)
-            switch (area) {
-                case 'left':
-                case 'right':
-                    await shell.collapsePanel(area);
-                    break;
-                case 'bottom':
-                    // Don't collapse the bottom panel if it's currently split
-                    if (shell.bottomAreaTabBars.length === 1) {
-                        await shell.collapsePanel('bottom');
-                    }
-                    break;
-                default:
-                    // The main area cannot be collapsed, so close the widget
-                    await this.closeView();
-            }
-            return this.widget;
-        }
-        if (widget.isAttached && args.activate) {
-            await shell.activateWidget(this.viewId);
-        } else if (widget.isAttached && args.reveal) {
-            await shell.revealWidget(this.viewId);
-        }
-        return this.widget;
-    }
-
-    registerCommands(commands: CommandRegistry): void {
-        if (this.toggleCommand) {
-            commands.registerCommand(this.toggleCommand, {
-                execute: () => this.toggleView()
-            });
-        }
-        this.quickView?.registerItem({
-            label: this.viewLabel,
-            open: () => this.openView({ activate: true })
-        });
-    }
-
-    async closeView(): Promise<T | undefined> {
-        const widget = await this.shell.closeWidget(this.viewId);
-        return widget as T | undefined;
-    }
-
-    toggleView(): Promise<T> {
-        return this.openView({
-            toggle: true,
-            activate: true
-        });
-    }
-
-    registerMenus(menus: MenuModelRegistry): void {
-        if (this.toggleCommand) {
-            menus.registerMenuAction(CommonMenus.VIEW_VIEWS, {
-                commandId: this.toggleCommand.id,
-                label: this.viewLabel
-            });
-        }
-    }
-
-    registerKeybindings(keybindings: KeybindingRegistry): void {
-        if (this.toggleCommand && this.options.toggleKeybinding) {
-            keybindings.registerKeybinding({
-                command: this.toggleCommand.id,
-                keybinding: this.options.toggleKeybinding
-            });
-        }
-    }
-}
+// *****************************************************************************
+// 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 { injectable, inject, interfaces, optional } from 'inversify';
+import { Widget } from '@phosphor/widgets';
+import {
+    MenuModelRegistry, Command, CommandContribution,
+    MenuContribution, CommandRegistry, nls
+} from '../../common';
+import { KeybindingContribution, KeybindingRegistry } from '../keybinding';
+import { WidgetManager } from '../widget-manager';
+import { CommonMenus } from '../common-frontend-contribution';
+import { ApplicationShell } from './application-shell';
+import { QuickViewService } from '../quick-input';
+
+export interface OpenViewArguments extends ApplicationShell.WidgetOptions {
+    toggle?: boolean
+    activate?: boolean;
+    reveal?: boolean;
+}
+
+export interface ViewContributionOptions {
+    widgetId: string;
+    viewContainerId?: string;
+    widgetName: string;
+    defaultWidgetOptions: ApplicationShell.WidgetOptions;
+    toggleCommandId?: string;
+    toggleKeybinding?: string;
+}
+
+export function bindViewContribution<T extends AbstractViewContribution<Widget>>(bind: interfaces.Bind, identifier: interfaces.Newable<T>): interfaces.BindingWhenOnSyntax<T> {
+    const syntax = bind<T>(identifier).toSelf().inSingletonScope();
+    bind(CommandContribution).toService(identifier);
+    bind(KeybindingContribution).toService(identifier);
+    bind(MenuContribution).toService(identifier);
+    return syntax;
+}
+
+/**
+ * An abstract superclass for frontend contributions that add a view to the application shell.
+ */
+@injectable()
+export abstract class AbstractViewContribution<T extends Widget> implements CommandContribution, MenuContribution, KeybindingContribution {
+
+    @inject(WidgetManager) protected readonly widgetManager: WidgetManager;
+    @inject(ApplicationShell) protected readonly shell: ApplicationShell;
+
+    @inject(QuickViewService) @optional()
+    protected readonly quickView: QuickViewService;
+
+    readonly toggleCommand?: Command;
+
+    constructor(
+        protected readonly options: ViewContributionOptions
+    ) {
+        if (options.toggleCommandId) {
+            this.toggleCommand = {
+                id: options.toggleCommandId,
+                category: nls.localizeByDefault('View'),
+                label: nls.localizeByDefault('Toggle {0}', this.viewLabel)
+            };
+        }
+    }
+
+    get viewId(): string {
+        return this.options.widgetId;
+    }
+
+    get viewLabel(): string {
+        return this.options.widgetName;
+    }
+
+    get defaultViewOptions(): ApplicationShell.WidgetOptions {
+        return this.options.defaultWidgetOptions;
+    }
+
+    get widget(): Promise<T> {
+        return this.widgetManager.getOrCreateWidget(this.viewId);
+    }
+
+    tryGetWidget(): T | undefined {
+        return this.widgetManager.tryGetWidget(this.viewId);
+    }
+
+    async openView(args: Partial<OpenViewArguments> = {}): Promise<T> {
+        const shell = this.shell;
+        const widget = await this.widgetManager.getOrCreateWidget(this.options.viewContainerId || this.viewId);
+        const tabBar = shell.getTabBarFor(widget);
+        const area = shell.getAreaFor(widget);
+        if (!tabBar) {
+            // The widget is not attached yet, so add it to the shell
+            const widgetArgs: OpenViewArguments = {
+                ...this.defaultViewOptions,
+                ...args
+            };
+            await shell.addWidget(widget, widgetArgs);
+        } else if (args.toggle && area && shell.isExpanded(area) && tabBar.currentTitle === widget.title) {
+            // The widget is attached and visible, so collapse the containing panel (toggle)
+            switch (area) {
+                case 'left':
+                case 'right':
+                    await shell.collapsePanel(area);
+                    break;
+                case 'bottom':
+                    // Don't collapse the bottom panel if it's currently split
+                    if (shell.bottomAreaTabBars.length === 1) {
+                        await shell.collapsePanel('bottom');
+                    }
+                    break;
+                default:
+                    // The main area cannot be collapsed, so close the widget
+                    await this.closeView();
+            }
+            return this.widget;
+        }
+        if (widget.isAttached && args.activate) {
+            await shell.activateWidget(this.viewId);
+        } else if (widget.isAttached && args.reveal) {
+            await shell.revealWidget(this.viewId);
+        }
+        return this.widget;
+    }
+
+    registerCommands(commands: CommandRegistry): void {
+        if (this.toggleCommand) {
+            commands.registerCommand(this.toggleCommand, {
+                execute: () => this.toggleView()
+            });
+        }
+        this.quickView?.registerItem({
+            label: this.viewLabel,
+            open: () => this.openView({ activate: true })
+        });
+    }
+
+    async closeView(): Promise<T | undefined> {
+        const widget = await this.shell.closeWidget(this.viewId);
+        return widget as T | undefined;
+    }
+
+    toggleView(): Promise<T> {
+        return this.openView({
+            toggle: true,
+            activate: true
+        });
+    }
+
+    registerMenus(menus: MenuModelRegistry): void {
+        if (this.toggleCommand) {
+            menus.registerMenuAction(CommonMenus.VIEW_VIEWS, {
+                commandId: this.toggleCommand.id,
+                label: this.viewLabel
+            });
+        }
+    }
+
+    registerKeybindings(keybindings: KeybindingRegistry): void {
+        if (this.toggleCommand && this.options.toggleKeybinding) {
+            keybindings.registerKeybinding({
+                command: this.toggleCommand.id,
+                keybinding: this.options.toggleKeybinding
+            });
+        }
+    }
+}

package/src/browser/source-tree/index.ts

@@ -1,19 +1,19 @@
-// *****************************************************************************
-// 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
-// *****************************************************************************
-
-export * from './tree-source';
-export * from './source-tree';
-export * from './source-tree-widget';
+// *****************************************************************************
+// 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
+// *****************************************************************************
+
+export * from './tree-source';
+export * from './source-tree';
+export * from './source-tree-widget';