@theia/typehierarchy 1.53.0-next.5 → 1.53.0-next.55

package/src/browser/typehierarchy-contribution.ts

@@ -1,175 +1,175 @@
-// *****************************************************************************
-// Copyright (C) 2019 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, named, postConstruct } from '@theia/core/shared/inversify';
-import { MenuModelRegistry } from '@theia/core/lib/common/menu';
-import { ApplicationShell } from '@theia/core/lib/browser/shell';
-import { KeybindingRegistry } from '@theia/core/lib/browser/keybinding';
-import { Command, CommandRegistry } from '@theia/core/lib/common/command';
-import { EDITOR_CONTEXT_MENU } from '@theia/editor/lib/browser/editor-menu';
-import { EditorAccess, EditorManager } from '@theia/editor/lib/browser/editor-manager';
-import { AbstractViewContribution, OpenViewArguments } from '@theia/core/lib/browser/shell/view-contribution';
-import { TypeHierarchyTree } from './tree/typehierarchy-tree';
-import { TypeHierarchyTreeWidget } from './tree/typehierarchy-tree-widget';
-import { TypeHierarchyDirection } from './typehierarchy-provider';
-import { TypeHierarchyServiceProvider } from './typehierarchy-service';
-import URI from '@theia/core/lib/common/uri';
-
-import { ContextKey, ContextKeyService } from '@theia/core/lib/browser/context-key-service';
-
-@injectable()
-export class TypeHierarchyContribution extends AbstractViewContribution<TypeHierarchyTreeWidget> {
-
-    @inject(ApplicationShell)
-    protected override readonly shell: ApplicationShell;
-
-    @inject(EditorAccess)
-    @named(EditorAccess.CURRENT)
-    protected readonly editorAccess: EditorAccess;
-
-    @inject(EditorManager)
-    protected readonly editorManager: EditorManager;
-
-    @inject(ContextKeyService) protected readonly contextKeyService: ContextKeyService;
-    protected editorHasTypeHierarchyProvider!: ContextKey<boolean>;
-
-    @inject(TypeHierarchyServiceProvider)
-    protected readonly typeHierarchyServiceProvider: TypeHierarchyServiceProvider;
-
-    constructor() {
-        super({
-            widgetId: TypeHierarchyTreeWidget.WIDGET_ID,
-            widgetName: TypeHierarchyTreeWidget.WIDGET_LABEL,
-            defaultWidgetOptions: {
-                area: 'bottom'
-            },
-            toggleCommandId: TypeHierarchyCommands.TOGGLE_VIEW.id,
-            toggleKeybinding: 'ctrlcmd+shift+h'
-        });
-    }
-
-    @postConstruct()
-    protected init(): void {
-        this.editorHasTypeHierarchyProvider = this.contextKeyService.createKey('editorHasTypeHierarchyProvider', false);
-        this.editorManager.onCurrentEditorChanged(() => this.editorHasTypeHierarchyProvider.set(this.isTypeHierarchyAvailable()));
-        this.typeHierarchyServiceProvider.onDidChange(() => this.editorHasTypeHierarchyProvider.set(this.isTypeHierarchyAvailable()));
-    }
-
-    protected isTypeHierarchyAvailable(): boolean {
-        const { selection, languageId } = this.editorAccess;
-        return !!selection && !!languageId && !!this.typeHierarchyServiceProvider.get(languageId, new URI(selection.uri));
-    }
-
-    override async openView(args?: Partial<TypeHierarchyOpenViewArguments>): Promise<TypeHierarchyTreeWidget> {
-        const widget = await super.openView(args);
-        const { selection, languageId } = this.editorAccess;
-        const direction = this.getDirection(args);
-        await widget.initialize({ location: selection, languageId, direction });
-        return widget;
-    }
-
-    override registerCommands(commands: CommandRegistry): void {
-        super.registerCommands(commands);
-        commands.registerCommand(TypeHierarchyCommands.OPEN_SUBTYPE, {
-            execute: () => this.openViewOrFlipHierarchyDirection(TypeHierarchyDirection.Children),
-            isEnabled: this.isEnabled.bind(this)
-        });
-        commands.registerCommand(TypeHierarchyCommands.OPEN_SUPERTYPE, {
-            execute: () => this.openViewOrFlipHierarchyDirection(TypeHierarchyDirection.Parents),
-            isEnabled: this.isEnabled.bind(this)
-        });
-    }
-
-    override registerMenus(menus: MenuModelRegistry): void {
-        super.registerMenus(menus);
-        const menuPath = [...EDITOR_CONTEXT_MENU, 'type-hierarchy'];
-        menus.registerMenuAction(menuPath, {
-            commandId: TypeHierarchyCommands.OPEN_SUBTYPE.id
-        });
-        menus.registerMenuAction(menuPath, {
-            commandId: TypeHierarchyCommands.OPEN_SUPERTYPE.id
-        });
-    }
-
-    override registerKeybindings(keybindings: KeybindingRegistry): void {
-        super.registerKeybindings(keybindings);
-        keybindings.registerKeybinding({
-            command: TypeHierarchyCommands.OPEN_SUBTYPE.id,
-            keybinding: 'ctrlcmd+alt+h'
-        });
-    }
-
-    /**
-     * Flips the hierarchy direction in the `Type Hierarchy` view, if it is active and has a valid root.
-     * Otherwise, calculates the type hierarchy based on the selection of the current editor.
-     */
-    protected async openViewOrFlipHierarchyDirection(direction: TypeHierarchyDirection): Promise<void> {
-        if (this.isEnabled()) {
-            const { activeWidget } = this.shell;
-            if (activeWidget instanceof TypeHierarchyTreeWidget && TypeHierarchyTree.RootNode.is(activeWidget.model.root)) {
-                await activeWidget.model.flipDirection();
-            } else {
-                await this.openView({
-                    toggle: false,
-                    activate: true,
-                    direction
-                });
-            }
-        }
-    }
-
-    /**
-     * Enabled if the `current` editor has the `languageId` or the `Type Hierarchy` widget is the active one.
-     */
-    protected isEnabled(languageId: string | undefined = this.editorAccess.languageId): boolean {
-        return !!languageId || this.shell.activeWidget instanceof TypeHierarchyTreeWidget;
-    }
-
-    /**
-     * Extracts the type hierarchy direction from the argument. If the direction cannot be extracted, returns with the `Children` as the default type.
-     */
-    protected getDirection(args?: Partial<TypeHierarchyOpenViewArguments>): TypeHierarchyDirection {
-        return !!args && !!args.direction ? args.direction : TypeHierarchyDirection.Children;
-    }
-
-}
-
-export interface TypeHierarchyOpenViewArguments extends OpenViewArguments {
-
-    /**
-     * The type hierarchy direction for the view argument.
-     */
-    readonly direction: TypeHierarchyDirection;
-
-}
-
-export namespace TypeHierarchyCommands {
-
-    export const TOGGLE_VIEW: Command = {
-        id: 'typehierarchy:toggle'
-    };
-
-    export const OPEN_SUBTYPE = Command.toLocalizedCommand({
-        id: 'typehierarchy:open-subtype',
-        label: 'Subtype Hierarchy'
-    }, 'theia/typehierarchy/subtypeHierarchy');
-
-    export const OPEN_SUPERTYPE = Command.toLocalizedCommand({
-        id: 'typehierarchy:open-supertype',
-        label: 'Supertype Hierarchy'
-    }, 'theia/typehierarchy/supertypeHierarchy');
-
-}
+// *****************************************************************************
+// Copyright (C) 2019 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, named, postConstruct } from '@theia/core/shared/inversify';
+import { MenuModelRegistry } from '@theia/core/lib/common/menu';
+import { ApplicationShell } from '@theia/core/lib/browser/shell';
+import { KeybindingRegistry } from '@theia/core/lib/browser/keybinding';
+import { Command, CommandRegistry } from '@theia/core/lib/common/command';
+import { EDITOR_CONTEXT_MENU } from '@theia/editor/lib/browser/editor-menu';
+import { EditorAccess, EditorManager } from '@theia/editor/lib/browser/editor-manager';
+import { AbstractViewContribution, OpenViewArguments } from '@theia/core/lib/browser/shell/view-contribution';
+import { TypeHierarchyTree } from './tree/typehierarchy-tree';
+import { TypeHierarchyTreeWidget } from './tree/typehierarchy-tree-widget';
+import { TypeHierarchyDirection } from './typehierarchy-provider';
+import { TypeHierarchyServiceProvider } from './typehierarchy-service';
+import URI from '@theia/core/lib/common/uri';
+
+import { ContextKey, ContextKeyService } from '@theia/core/lib/browser/context-key-service';
+
+@injectable()
+export class TypeHierarchyContribution extends AbstractViewContribution<TypeHierarchyTreeWidget> {
+
+    @inject(ApplicationShell)
+    protected override readonly shell: ApplicationShell;
+
+    @inject(EditorAccess)
+    @named(EditorAccess.CURRENT)
+    protected readonly editorAccess: EditorAccess;
+
+    @inject(EditorManager)
+    protected readonly editorManager: EditorManager;
+
+    @inject(ContextKeyService) protected readonly contextKeyService: ContextKeyService;
+    protected editorHasTypeHierarchyProvider!: ContextKey<boolean>;
+
+    @inject(TypeHierarchyServiceProvider)
+    protected readonly typeHierarchyServiceProvider: TypeHierarchyServiceProvider;
+
+    constructor() {
+        super({
+            widgetId: TypeHierarchyTreeWidget.WIDGET_ID,
+            widgetName: TypeHierarchyTreeWidget.WIDGET_LABEL,
+            defaultWidgetOptions: {
+                area: 'bottom'
+            },
+            toggleCommandId: TypeHierarchyCommands.TOGGLE_VIEW.id,
+            toggleKeybinding: 'ctrlcmd+shift+h'
+        });
+    }
+
+    @postConstruct()
+    protected init(): void {
+        this.editorHasTypeHierarchyProvider = this.contextKeyService.createKey('editorHasTypeHierarchyProvider', false);
+        this.editorManager.onCurrentEditorChanged(() => this.editorHasTypeHierarchyProvider.set(this.isTypeHierarchyAvailable()));
+        this.typeHierarchyServiceProvider.onDidChange(() => this.editorHasTypeHierarchyProvider.set(this.isTypeHierarchyAvailable()));
+    }
+
+    protected isTypeHierarchyAvailable(): boolean {
+        const { selection, languageId } = this.editorAccess;
+        return !!selection && !!languageId && !!this.typeHierarchyServiceProvider.get(languageId, new URI(selection.uri));
+    }
+
+    override async openView(args?: Partial<TypeHierarchyOpenViewArguments>): Promise<TypeHierarchyTreeWidget> {
+        const widget = await super.openView(args);
+        const { selection, languageId } = this.editorAccess;
+        const direction = this.getDirection(args);
+        await widget.initialize({ location: selection, languageId, direction });
+        return widget;
+    }
+
+    override registerCommands(commands: CommandRegistry): void {
+        super.registerCommands(commands);
+        commands.registerCommand(TypeHierarchyCommands.OPEN_SUBTYPE, {
+            execute: () => this.openViewOrFlipHierarchyDirection(TypeHierarchyDirection.Children),
+            isEnabled: this.isEnabled.bind(this)
+        });
+        commands.registerCommand(TypeHierarchyCommands.OPEN_SUPERTYPE, {
+            execute: () => this.openViewOrFlipHierarchyDirection(TypeHierarchyDirection.Parents),
+            isEnabled: this.isEnabled.bind(this)
+        });
+    }
+
+    override registerMenus(menus: MenuModelRegistry): void {
+        super.registerMenus(menus);
+        const menuPath = [...EDITOR_CONTEXT_MENU, 'type-hierarchy'];
+        menus.registerMenuAction(menuPath, {
+            commandId: TypeHierarchyCommands.OPEN_SUBTYPE.id
+        });
+        menus.registerMenuAction(menuPath, {
+            commandId: TypeHierarchyCommands.OPEN_SUPERTYPE.id
+        });
+    }
+
+    override registerKeybindings(keybindings: KeybindingRegistry): void {
+        super.registerKeybindings(keybindings);
+        keybindings.registerKeybinding({
+            command: TypeHierarchyCommands.OPEN_SUBTYPE.id,
+            keybinding: 'ctrlcmd+alt+h'
+        });
+    }
+
+    /**
+     * Flips the hierarchy direction in the `Type Hierarchy` view, if it is active and has a valid root.
+     * Otherwise, calculates the type hierarchy based on the selection of the current editor.
+     */
+    protected async openViewOrFlipHierarchyDirection(direction: TypeHierarchyDirection): Promise<void> {
+        if (this.isEnabled()) {
+            const { activeWidget } = this.shell;
+            if (activeWidget instanceof TypeHierarchyTreeWidget && TypeHierarchyTree.RootNode.is(activeWidget.model.root)) {
+                await activeWidget.model.flipDirection();
+            } else {
+                await this.openView({
+                    toggle: false,
+                    activate: true,
+                    direction
+                });
+            }
+        }
+    }
+
+    /**
+     * Enabled if the `current` editor has the `languageId` or the `Type Hierarchy` widget is the active one.
+     */
+    protected isEnabled(languageId: string | undefined = this.editorAccess.languageId): boolean {
+        return !!languageId || this.shell.activeWidget instanceof TypeHierarchyTreeWidget;
+    }
+
+    /**
+     * Extracts the type hierarchy direction from the argument. If the direction cannot be extracted, returns with the `Children` as the default type.
+     */
+    protected getDirection(args?: Partial<TypeHierarchyOpenViewArguments>): TypeHierarchyDirection {
+        return !!args && !!args.direction ? args.direction : TypeHierarchyDirection.Children;
+    }
+
+}
+
+export interface TypeHierarchyOpenViewArguments extends OpenViewArguments {
+
+    /**
+     * The type hierarchy direction for the view argument.
+     */
+    readonly direction: TypeHierarchyDirection;
+
+}
+
+export namespace TypeHierarchyCommands {
+
+    export const TOGGLE_VIEW: Command = {
+        id: 'typehierarchy:toggle'
+    };
+
+    export const OPEN_SUBTYPE = Command.toLocalizedCommand({
+        id: 'typehierarchy:open-subtype',
+        label: 'Subtype Hierarchy'
+    }, 'theia/typehierarchy/subtypeHierarchy');
+
+    export const OPEN_SUPERTYPE = Command.toLocalizedCommand({
+        id: 'typehierarchy:open-supertype',
+        label: 'Supertype Hierarchy'
+    }, 'theia/typehierarchy/supertypeHierarchy');
+
+}

package/src/browser/typehierarchy-frontend-module.ts

@@ -1,38 +1,38 @@
-// *****************************************************************************
-// Copyright (C) 2019 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 { bindContributionProvider } from '@theia/core/lib/common';
-import { ContainerModule } from '@theia/core/shared/inversify';
-import { WidgetFactory } from '@theia/core/lib/browser/widget-manager';
-import { bindViewContribution } from '@theia/core/lib/browser/shell/view-contribution';
-import { TypeHierarchyRegistry } from './typehierarchy-provider';
-import { TypeHierarchyContribution } from './typehierarchy-contribution';
-import { TypeHierarchyTreeWidget } from './tree/typehierarchy-tree-widget';
-import { TypeHierarchyService, TypeHierarchyServiceProvider } from './typehierarchy-service';
-import { createHierarchyTreeWidget } from './tree/typehierarchy-tree-container';
-
-import '../../src/browser/style/index.css';
-
-export default new ContainerModule(bind => {
-    bindContributionProvider(bind, TypeHierarchyService);
-    bind(TypeHierarchyServiceProvider).to(TypeHierarchyServiceProvider).inSingletonScope();
-
-    bind(TypeHierarchyRegistry).toSelf().inSingletonScope();
-    bindViewContribution(bind, TypeHierarchyContribution);
-    bind(WidgetFactory).toDynamicValue(context => ({
-        id: TypeHierarchyTreeWidget.WIDGET_ID,
-        createWidget: () => createHierarchyTreeWidget(context.container)
-    }));
-});
+// *****************************************************************************
+// Copyright (C) 2019 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 { bindContributionProvider } from '@theia/core/lib/common';
+import { ContainerModule } from '@theia/core/shared/inversify';
+import { WidgetFactory } from '@theia/core/lib/browser/widget-manager';
+import { bindViewContribution } from '@theia/core/lib/browser/shell/view-contribution';
+import { TypeHierarchyRegistry } from './typehierarchy-provider';
+import { TypeHierarchyContribution } from './typehierarchy-contribution';
+import { TypeHierarchyTreeWidget } from './tree/typehierarchy-tree-widget';
+import { TypeHierarchyService, TypeHierarchyServiceProvider } from './typehierarchy-service';
+import { createHierarchyTreeWidget } from './tree/typehierarchy-tree-container';
+
+import '../../src/browser/style/index.css';
+
+export default new ContainerModule(bind => {
+    bindContributionProvider(bind, TypeHierarchyService);
+    bind(TypeHierarchyServiceProvider).to(TypeHierarchyServiceProvider).inSingletonScope();
+
+    bind(TypeHierarchyRegistry).toSelf().inSingletonScope();
+    bindViewContribution(bind, TypeHierarchyContribution);
+    bind(WidgetFactory).toDynamicValue(context => ({
+        id: TypeHierarchyTreeWidget.WIDGET_ID,
+        createWidget: () => createHierarchyTreeWidget(context.container)
+    }));
+});