@theia/console 1.34.2 → 1.34.3

package/src/browser/ansi-console-item.tsx

@@ -1,48 +1,48 @@
-// *****************************************************************************
-// 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 * as React from '@theia/core/shared/react';
-import * as DOMPurify from '@theia/core/shared/dompurify';
-import { ConsoleItem } from './console-session';
-import { Severity } from '@theia/core/lib/common/severity';
-import Anser = require('anser');
-
-export class AnsiConsoleItem implements ConsoleItem {
-
-    protected readonly htmlContent: string;
-
-    constructor(
-        public readonly content: string,
-        public readonly severity?: Severity
-    ) {
-        this.htmlContent = new Anser().ansiToHtml(this.content, {
-            use_classes: true,
-            remove_empty: true
-        });
-    }
-
-    get visible(): boolean {
-        return !!this.htmlContent;
-    }
-
-    render(): React.ReactNode {
-        return <div
-            className='theia-console-ansi-console-item'
-            dangerouslySetInnerHTML={{ __html: DOMPurify.sanitize(this.htmlContent) }} // eslint-disable-line react/no-danger
-        />;
-    }
-
-}
+// *****************************************************************************
+// 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 * as React from '@theia/core/shared/react';
+import * as DOMPurify from '@theia/core/shared/dompurify';
+import { ConsoleItem } from './console-session';
+import { Severity } from '@theia/core/lib/common/severity';
+import Anser = require('anser');
+
+export class AnsiConsoleItem implements ConsoleItem {
+
+    protected readonly htmlContent: string;
+
+    constructor(
+        public readonly content: string,
+        public readonly severity?: Severity
+    ) {
+        this.htmlContent = new Anser().ansiToHtml(this.content, {
+            use_classes: true,
+            remove_empty: true
+        });
+    }
+
+    get visible(): boolean {
+        return !!this.htmlContent;
+    }
+
+    render(): React.ReactNode {
+        return <div
+            className='theia-console-ansi-console-item'
+            dangerouslySetInnerHTML={{ __html: DOMPurify.sanitize(this.htmlContent) }} // eslint-disable-line react/no-danger
+        />;
+    }
+
+}

package/src/browser/console-content-widget.tsx

@@ -1,91 +1,91 @@
-// *****************************************************************************
-// 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 { Message } from '@theia/core/shared/@phosphor/messaging';
-import { interfaces, Container, injectable } from '@theia/core/shared/inversify';
-import { MenuPath } from '@theia/core';
-import { TreeProps } from '@theia/core/lib/browser/tree';
-import { SourceTreeWidget, TreeSourceNode, TreeElementNode } from '@theia/core/lib/browser/source-tree';
-import { ConsoleItem } from './console-session';
-import { Severity } from '@theia/core/lib/common/severity';
-
-@injectable()
-export class ConsoleContentWidget extends SourceTreeWidget {
-
-    static CONTEXT_MENU: MenuPath = ['console-context-menu'];
-
-    protected _shouldScrollToEnd = true;
-
-    protected set shouldScrollToEnd(shouldScrollToEnd: boolean) {
-        this._shouldScrollToEnd = shouldScrollToEnd;
-        this.shouldScrollToRow = this._shouldScrollToEnd;
-    }
-
-    protected get shouldScrollToEnd(): boolean {
-        return this._shouldScrollToEnd;
-    }
-
-    static override createContainer(parent: interfaces.Container, props?: Partial<TreeProps>): Container {
-        const child = SourceTreeWidget.createContainer(parent, {
-            contextMenuPath: ConsoleContentWidget.CONTEXT_MENU,
-            ...props
-        });
-        child.unbind(SourceTreeWidget);
-        child.bind(ConsoleContentWidget).toSelf();
-        return child;
-    }
-
-    protected override onAfterAttach(msg: Message): void {
-        super.onAfterAttach(msg);
-        this.toDisposeOnDetach.push(this.onScrollUp(() => this.shouldScrollToEnd = false));
-        this.toDisposeOnDetach.push(this.onScrollYReachEnd(() => this.shouldScrollToEnd = true));
-        this.toDisposeOnDetach.push(this.model.onChanged(() => this.revealLastOutputIfNeeded()));
-    }
-
-    protected revealLastOutputIfNeeded(): void {
-        const { root } = this.model;
-        if (this.shouldScrollToEnd && TreeSourceNode.is(root)) {
-            this.model.selectNode(root.children[root.children.length - 1]);
-        }
-    }
-
-    protected override createTreeElementNodeClassNames(node: TreeElementNode): string[] {
-        const classNames = super.createTreeElementNodeClassNames(node);
-        if (node.element) {
-            const className = this.toClassName((node.element as ConsoleItem));
-            if (className) {
-                classNames.push(className);
-            }
-        }
-        return classNames;
-    }
-    protected toClassName(item: ConsoleItem): string | undefined {
-        if (item.severity === Severity.Error) {
-            return ConsoleItem.errorClassName;
-        }
-        if (item.severity === Severity.Warning) {
-            return ConsoleItem.warningClassName;
-        }
-        if (item.severity === Severity.Info) {
-            return ConsoleItem.infoClassName;
-        }
-        if (item.severity === Severity.Log) {
-            return ConsoleItem.logClassName;
-        }
-        return undefined;
-    }
-
-}
+// *****************************************************************************
+// 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 { Message } from '@theia/core/shared/@phosphor/messaging';
+import { interfaces, Container, injectable } from '@theia/core/shared/inversify';
+import { MenuPath } from '@theia/core';
+import { TreeProps } from '@theia/core/lib/browser/tree';
+import { SourceTreeWidget, TreeSourceNode, TreeElementNode } from '@theia/core/lib/browser/source-tree';
+import { ConsoleItem } from './console-session';
+import { Severity } from '@theia/core/lib/common/severity';
+
+@injectable()
+export class ConsoleContentWidget extends SourceTreeWidget {
+
+    static CONTEXT_MENU: MenuPath = ['console-context-menu'];
+
+    protected _shouldScrollToEnd = true;
+
+    protected set shouldScrollToEnd(shouldScrollToEnd: boolean) {
+        this._shouldScrollToEnd = shouldScrollToEnd;
+        this.shouldScrollToRow = this._shouldScrollToEnd;
+    }
+
+    protected get shouldScrollToEnd(): boolean {
+        return this._shouldScrollToEnd;
+    }
+
+    static override createContainer(parent: interfaces.Container, props?: Partial<TreeProps>): Container {
+        const child = SourceTreeWidget.createContainer(parent, {
+            contextMenuPath: ConsoleContentWidget.CONTEXT_MENU,
+            ...props
+        });
+        child.unbind(SourceTreeWidget);
+        child.bind(ConsoleContentWidget).toSelf();
+        return child;
+    }
+
+    protected override onAfterAttach(msg: Message): void {
+        super.onAfterAttach(msg);
+        this.toDisposeOnDetach.push(this.onScrollUp(() => this.shouldScrollToEnd = false));
+        this.toDisposeOnDetach.push(this.onScrollYReachEnd(() => this.shouldScrollToEnd = true));
+        this.toDisposeOnDetach.push(this.model.onChanged(() => this.revealLastOutputIfNeeded()));
+    }
+
+    protected revealLastOutputIfNeeded(): void {
+        const { root } = this.model;
+        if (this.shouldScrollToEnd && TreeSourceNode.is(root)) {
+            this.model.selectNode(root.children[root.children.length - 1]);
+        }
+    }
+
+    protected override createTreeElementNodeClassNames(node: TreeElementNode): string[] {
+        const classNames = super.createTreeElementNodeClassNames(node);
+        if (node.element) {
+            const className = this.toClassName((node.element as ConsoleItem));
+            if (className) {
+                classNames.push(className);
+            }
+        }
+        return classNames;
+    }
+    protected toClassName(item: ConsoleItem): string | undefined {
+        if (item.severity === Severity.Error) {
+            return ConsoleItem.errorClassName;
+        }
+        if (item.severity === Severity.Warning) {
+            return ConsoleItem.warningClassName;
+        }
+        if (item.severity === Severity.Info) {
+            return ConsoleItem.infoClassName;
+        }
+        if (item.severity === Severity.Log) {
+            return ConsoleItem.logClassName;
+        }
+        return undefined;
+    }
+
+}

package/src/browser/console-contribution.ts

@@ -1,144 +1,144 @@
-// *****************************************************************************
-// 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 { injectable, inject } from '@theia/core/shared/inversify';
-import { Command, CommandContribution, CommandRegistry, MenuContribution, MenuModelRegistry, CommandHandler } from '@theia/core';
-import { FrontendApplicationContribution, KeybindingContribution, KeybindingRegistry, CommonCommands } from '@theia/core/lib/browser';
-import { ConsoleManager } from './console-manager';
-import { ConsoleKeybindingContexts } from './console-keybinding-contexts';
-import { ConsoleWidget } from './console-widget';
-import { ConsoleContentWidget } from './console-content-widget';
-import { nls } from '@theia/core/lib/common/nls';
-
-export namespace ConsoleCommands {
-    export const SELECT_ALL: Command = {
-        id: 'console.selectAll'
-    };
-    export const COLLAPSE_ALL: Command = {
-        id: 'console.collapseAll'
-    };
-    export const CLEAR: Command = {
-        id: 'console.clear'
-    };
-    export const EXECUTE: Command = {
-        id: 'console.execute'
-    };
-    export const NAVIGATE_BACK: Command = {
-        id: 'console.navigatePrevious'
-    };
-    export const NAVIGATE_FORWARD: Command = {
-        id: 'console.navigateNext'
-    };
-}
-
-export namespace ConsoleContextMenu {
-    export const CLIPBOARD = [...ConsoleContentWidget.CONTEXT_MENU, '1_clipboard'];
-    export const CLEAR = [...ConsoleContentWidget.CONTEXT_MENU, '2_clear'];
-}
-
-@injectable()
-export class ConsoleContribution implements FrontendApplicationContribution, CommandContribution, KeybindingContribution, MenuContribution {
-
-    @inject(ConsoleManager)
-    protected readonly manager: ConsoleManager;
-
-    initialize(): void { }
-
-    registerCommands(commands: CommandRegistry): void {
-        commands.registerCommand(ConsoleCommands.SELECT_ALL, this.newCommandHandler(console => console.selectAll()));
-        commands.registerCommand(ConsoleCommands.COLLAPSE_ALL, this.newCommandHandler(console => console.collapseAll()));
-        commands.registerCommand(ConsoleCommands.CLEAR, this.newCommandHandler(console => console.clear()));
-        commands.registerCommand(ConsoleCommands.EXECUTE, this.newCommandHandler(console => console.execute()));
-        commands.registerCommand(ConsoleCommands.NAVIGATE_BACK, this.newCommandHandler(console => console.navigateBack()));
-        commands.registerCommand(ConsoleCommands.NAVIGATE_FORWARD, this.newCommandHandler(console => console.navigateForward()));
-    }
-
-    registerKeybindings(keybindings: KeybindingRegistry): void {
-        keybindings.registerKeybinding({
-            command: ConsoleCommands.SELECT_ALL.id,
-            keybinding: 'ctrlcmd+a',
-            context: ConsoleKeybindingContexts.consoleContentFocus
-        });
-        keybindings.registerKeybinding({
-            command: ConsoleCommands.EXECUTE.id,
-            keybinding: 'enter',
-            context: ConsoleKeybindingContexts.consoleInputFocus
-        });
-        keybindings.registerKeybinding({
-            command: ConsoleCommands.NAVIGATE_BACK.id,
-            keybinding: 'up',
-            context: ConsoleKeybindingContexts.consoleNavigationBackEnabled
-        });
-        keybindings.registerKeybinding({
-            command: ConsoleCommands.NAVIGATE_FORWARD.id,
-            keybinding: 'down',
-            context: ConsoleKeybindingContexts.consoleNavigationForwardEnabled
-        });
-    }
-
-    registerMenus(menus: MenuModelRegistry): void {
-        menus.registerMenuAction(ConsoleContextMenu.CLIPBOARD, {
-            commandId: CommonCommands.COPY.id,
-            label: CommonCommands.COPY.label,
-            order: 'a1',
-        });
-        menus.registerMenuAction(ConsoleContextMenu.CLIPBOARD, {
-            commandId: ConsoleCommands.SELECT_ALL.id,
-            label: CommonCommands.SELECT_ALL.label,
-            order: 'a2'
-        });
-        menus.registerMenuAction(ConsoleContextMenu.CLIPBOARD, {
-            commandId: ConsoleCommands.COLLAPSE_ALL.id,
-            label: nls.localizeByDefault('Collapse All'),
-            order: 'a3'
-        });
-        menus.registerMenuAction(ConsoleContextMenu.CLEAR, {
-            commandId: ConsoleCommands.CLEAR.id,
-            label: nls.localizeByDefault('Clear Console')
-        });
-    }
-
-    protected newCommandHandler(execute: ConsoleExecuteFunction): ConsoleCommandHandler {
-        return new ConsoleCommandHandler(this.manager, execute);
-    }
-
-}
-// eslint-disable-next-line @typescript-eslint/no-explicit-any
-export type ConsoleExecuteFunction = (console: ConsoleWidget, ...args: any[]) => any;
-export class ConsoleCommandHandler implements CommandHandler {
-
-    constructor(
-        protected readonly manager: ConsoleManager,
-        protected readonly doExecute: ConsoleExecuteFunction
-    ) { }
-
-    isEnabled(): boolean {
-        return !!this.manager.currentConsole;
-    }
-
-    isVisible(): boolean {
-        return !!this.manager.currentConsole;
-    }
-
-    // eslint-disable-next-line @typescript-eslint/no-explicit-any
-    execute(...args: any[]): any {
-        const { currentConsole } = this.manager;
-        if (currentConsole) {
-            return this.doExecute(currentConsole, ...args);
-        }
-    }
-
-}
+// *****************************************************************************
+// 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 { injectable, inject } from '@theia/core/shared/inversify';
+import { Command, CommandContribution, CommandRegistry, MenuContribution, MenuModelRegistry, CommandHandler } from '@theia/core';
+import { FrontendApplicationContribution, KeybindingContribution, KeybindingRegistry, CommonCommands } from '@theia/core/lib/browser';
+import { ConsoleManager } from './console-manager';
+import { ConsoleKeybindingContexts } from './console-keybinding-contexts';
+import { ConsoleWidget } from './console-widget';
+import { ConsoleContentWidget } from './console-content-widget';
+import { nls } from '@theia/core/lib/common/nls';
+
+export namespace ConsoleCommands {
+    export const SELECT_ALL: Command = {
+        id: 'console.selectAll'
+    };
+    export const COLLAPSE_ALL: Command = {
+        id: 'console.collapseAll'
+    };
+    export const CLEAR: Command = {
+        id: 'console.clear'
+    };
+    export const EXECUTE: Command = {
+        id: 'console.execute'
+    };
+    export const NAVIGATE_BACK: Command = {
+        id: 'console.navigatePrevious'
+    };
+    export const NAVIGATE_FORWARD: Command = {
+        id: 'console.navigateNext'
+    };
+}
+
+export namespace ConsoleContextMenu {
+    export const CLIPBOARD = [...ConsoleContentWidget.CONTEXT_MENU, '1_clipboard'];
+    export const CLEAR = [...ConsoleContentWidget.CONTEXT_MENU, '2_clear'];
+}
+
+@injectable()
+export class ConsoleContribution implements FrontendApplicationContribution, CommandContribution, KeybindingContribution, MenuContribution {
+
+    @inject(ConsoleManager)
+    protected readonly manager: ConsoleManager;
+
+    initialize(): void { }
+
+    registerCommands(commands: CommandRegistry): void {
+        commands.registerCommand(ConsoleCommands.SELECT_ALL, this.newCommandHandler(console => console.selectAll()));
+        commands.registerCommand(ConsoleCommands.COLLAPSE_ALL, this.newCommandHandler(console => console.collapseAll()));
+        commands.registerCommand(ConsoleCommands.CLEAR, this.newCommandHandler(console => console.clear()));
+        commands.registerCommand(ConsoleCommands.EXECUTE, this.newCommandHandler(console => console.execute()));
+        commands.registerCommand(ConsoleCommands.NAVIGATE_BACK, this.newCommandHandler(console => console.navigateBack()));
+        commands.registerCommand(ConsoleCommands.NAVIGATE_FORWARD, this.newCommandHandler(console => console.navigateForward()));
+    }
+
+    registerKeybindings(keybindings: KeybindingRegistry): void {
+        keybindings.registerKeybinding({
+            command: ConsoleCommands.SELECT_ALL.id,
+            keybinding: 'ctrlcmd+a',
+            context: ConsoleKeybindingContexts.consoleContentFocus
+        });
+        keybindings.registerKeybinding({
+            command: ConsoleCommands.EXECUTE.id,
+            keybinding: 'enter',
+            context: ConsoleKeybindingContexts.consoleInputFocus
+        });
+        keybindings.registerKeybinding({
+            command: ConsoleCommands.NAVIGATE_BACK.id,
+            keybinding: 'up',
+            context: ConsoleKeybindingContexts.consoleNavigationBackEnabled
+        });
+        keybindings.registerKeybinding({
+            command: ConsoleCommands.NAVIGATE_FORWARD.id,
+            keybinding: 'down',
+            context: ConsoleKeybindingContexts.consoleNavigationForwardEnabled
+        });
+    }
+
+    registerMenus(menus: MenuModelRegistry): void {
+        menus.registerMenuAction(ConsoleContextMenu.CLIPBOARD, {
+            commandId: CommonCommands.COPY.id,
+            label: CommonCommands.COPY.label,
+            order: 'a1',
+        });
+        menus.registerMenuAction(ConsoleContextMenu.CLIPBOARD, {
+            commandId: ConsoleCommands.SELECT_ALL.id,
+            label: CommonCommands.SELECT_ALL.label,
+            order: 'a2'
+        });
+        menus.registerMenuAction(ConsoleContextMenu.CLIPBOARD, {
+            commandId: ConsoleCommands.COLLAPSE_ALL.id,
+            label: nls.localizeByDefault('Collapse All'),
+            order: 'a3'
+        });
+        menus.registerMenuAction(ConsoleContextMenu.CLEAR, {
+            commandId: ConsoleCommands.CLEAR.id,
+            label: nls.localizeByDefault('Clear Console')
+        });
+    }
+
+    protected newCommandHandler(execute: ConsoleExecuteFunction): ConsoleCommandHandler {
+        return new ConsoleCommandHandler(this.manager, execute);
+    }
+
+}
+// eslint-disable-next-line @typescript-eslint/no-explicit-any
+export type ConsoleExecuteFunction = (console: ConsoleWidget, ...args: any[]) => any;
+export class ConsoleCommandHandler implements CommandHandler {
+
+    constructor(
+        protected readonly manager: ConsoleManager,
+        protected readonly doExecute: ConsoleExecuteFunction
+    ) { }
+
+    isEnabled(): boolean {
+        return !!this.manager.currentConsole;
+    }
+
+    isVisible(): boolean {
+        return !!this.manager.currentConsole;
+    }
+
+    // eslint-disable-next-line @typescript-eslint/no-explicit-any
+    execute(...args: any[]): any {
+        const { currentConsole } = this.manager;
+        if (currentConsole) {
+            return this.doExecute(currentConsole, ...args);
+        }
+    }
+
+}

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

@@ -1,37 +1,37 @@
-// *****************************************************************************
-// 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 { ContainerModule } from '@theia/core/shared/inversify';
-import { CommandContribution, MenuContribution } from '@theia/core';
-import { FrontendApplicationContribution, KeybindingContext, KeybindingContribution } from '@theia/core/lib/browser';
-import { ConsoleContribution } from './console-contribution';
-import { ConsoleManager } from './console-manager';
-import { ConsoleInputFocusContext, ConsoleNavigationBackEnabled, ConsoleNavigationForwardEnabled, ConsoleContentFocusContext } from './console-keybinding-contexts';
-
-import '../../src/browser/style/index.css';
-
-export default new ContainerModule(bind => {
-    bind(ConsoleManager).toSelf().inSingletonScope();
-    bind(KeybindingContext).to(ConsoleInputFocusContext).inSingletonScope();
-    bind(KeybindingContext).to(ConsoleContentFocusContext).inSingletonScope();
-    bind(KeybindingContext).to(ConsoleNavigationBackEnabled).inSingletonScope();
-    bind(KeybindingContext).to(ConsoleNavigationForwardEnabled).inSingletonScope();
-    bind(ConsoleContribution).toSelf().inSingletonScope();
-    bind(FrontendApplicationContribution).toService(ConsoleContribution);
-    bind(CommandContribution).toService(ConsoleContribution);
-    bind(KeybindingContribution).toService(ConsoleContribution);
-    bind(MenuContribution).toService(ConsoleContribution);
-});
+// *****************************************************************************
+// 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 { ContainerModule } from '@theia/core/shared/inversify';
+import { CommandContribution, MenuContribution } from '@theia/core';
+import { FrontendApplicationContribution, KeybindingContext, KeybindingContribution } from '@theia/core/lib/browser';
+import { ConsoleContribution } from './console-contribution';
+import { ConsoleManager } from './console-manager';
+import { ConsoleInputFocusContext, ConsoleNavigationBackEnabled, ConsoleNavigationForwardEnabled, ConsoleContentFocusContext } from './console-keybinding-contexts';
+
+import '../../src/browser/style/index.css';
+
+export default new ContainerModule(bind => {
+    bind(ConsoleManager).toSelf().inSingletonScope();
+    bind(KeybindingContext).to(ConsoleInputFocusContext).inSingletonScope();
+    bind(KeybindingContext).to(ConsoleContentFocusContext).inSingletonScope();
+    bind(KeybindingContext).to(ConsoleNavigationBackEnabled).inSingletonScope();
+    bind(KeybindingContext).to(ConsoleNavigationForwardEnabled).inSingletonScope();
+    bind(ConsoleContribution).toSelf().inSingletonScope();
+    bind(FrontendApplicationContribution).toService(ConsoleContribution);
+    bind(CommandContribution).toService(ConsoleContribution);
+    bind(KeybindingContribution).toService(ConsoleContribution);
+    bind(MenuContribution).toService(ConsoleContribution);
+});