@theia/editor 1.53.0-next.4 → 1.53.0-next.55

package/src/browser/editor-contribution.ts

@@ -1,185 +1,185 @@
-// *****************************************************************************
-// Copyright (C) 2017 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 { EditorManager } from './editor-manager';
-import { TextEditor } from './editor';
-import { injectable, inject, optional } from '@theia/core/shared/inversify';
-import { StatusBarAlignment, StatusBar } from '@theia/core/lib/browser/status-bar/status-bar';
-import {
-    FrontendApplicationContribution, DiffUris, DockLayout,
-    QuickInputService, KeybindingRegistry, KeybindingContribution, SHELL_TABBAR_CONTEXT_SPLIT, ApplicationShell
-} from '@theia/core/lib/browser';
-import { ContextKeyService } from '@theia/core/lib/browser/context-key-service';
-import { CommandHandler, DisposableCollection, MenuContribution, MenuModelRegistry } from '@theia/core';
-import { EditorCommands } from './editor-command';
-import { CommandRegistry, CommandContribution } from '@theia/core/lib/common';
-import { SUPPORTED_ENCODINGS } from '@theia/core/lib/browser/supported-encodings';
-import { nls } from '@theia/core/lib/common/nls';
-import { CurrentWidgetCommandAdapter } from '@theia/core/lib/browser/shell/current-widget-command-adapter';
-import { EditorWidget } from './editor-widget';
-import { EditorLanguageStatusService } from './language-status/editor-language-status-service';
-
-@injectable()
-export class EditorContribution implements FrontendApplicationContribution, CommandContribution, KeybindingContribution, MenuContribution {
-
-    @inject(StatusBar) protected readonly statusBar: StatusBar;
-    @inject(EditorManager) protected readonly editorManager: EditorManager;
-    @inject(EditorLanguageStatusService) protected readonly languageStatusService: EditorLanguageStatusService;
-    @inject(ApplicationShell) protected readonly shell: ApplicationShell;
-
-    @inject(ContextKeyService)
-    protected readonly contextKeyService: ContextKeyService;
-
-    @inject(QuickInputService) @optional()
-    protected readonly quickInputService: QuickInputService;
-
-    onStart(): void {
-        this.initEditorContextKeys();
-
-        this.updateStatusBar();
-        this.editorManager.onCurrentEditorChanged(() => this.updateStatusBar());
-    }
-
-    protected initEditorContextKeys(): void {
-        const editorIsOpen = this.contextKeyService.createKey<boolean>('editorIsOpen', false);
-        const textCompareEditorVisible = this.contextKeyService.createKey<boolean>('textCompareEditorVisible', false);
-        const updateContextKeys = () => {
-            const widgets = this.editorManager.all;
-            editorIsOpen.set(!!widgets.length);
-            textCompareEditorVisible.set(widgets.some(widget => DiffUris.isDiffUri(widget.editor.uri)));
-        };
-        updateContextKeys();
-        for (const widget of this.editorManager.all) {
-            widget.disposed.connect(updateContextKeys);
-        }
-        this.editorManager.onCreated(widget => {
-            updateContextKeys();
-            widget.disposed.connect(updateContextKeys);
-        });
-    }
-
-    protected readonly toDisposeOnCurrentEditorChanged = new DisposableCollection();
-    protected updateStatusBar(): void {
-        this.toDisposeOnCurrentEditorChanged.dispose();
-
-        const widget = this.editorManager.currentEditor;
-        const editor = widget && widget.editor;
-        this.updateLanguageStatus(editor);
-        this.updateEncodingStatus(editor);
-        this.setCursorPositionStatus(editor);
-        if (editor) {
-            this.toDisposeOnCurrentEditorChanged.pushAll([
-                editor.onLanguageChanged(() => this.updateLanguageStatus(editor)),
-                editor.onEncodingChanged(() => this.updateEncodingStatus(editor)),
-                editor.onCursorPositionChanged(() => this.setCursorPositionStatus(editor))
-            ]);
-        }
-    }
-
-    protected updateLanguageStatus(editor: TextEditor | undefined): void {
-        this.languageStatusService.updateLanguageStatus(editor);
-    }
-
-    protected updateEncodingStatus(editor: TextEditor | undefined): void {
-        if (!editor) {
-            this.statusBar.removeElement('editor-status-encoding');
-            return;
-        }
-        this.statusBar.setElement('editor-status-encoding', {
-            text: SUPPORTED_ENCODINGS[editor.getEncoding()].labelShort,
-            alignment: StatusBarAlignment.RIGHT,
-            priority: 10,
-            command: EditorCommands.CHANGE_ENCODING.id,
-            tooltip: nls.localizeByDefault('Select Encoding')
-        });
-    }
-
-    protected setCursorPositionStatus(editor: TextEditor | undefined): void {
-        if (!editor) {
-            this.statusBar.removeElement('editor-status-cursor-position');
-            return;
-        }
-        const { cursor } = editor;
-        this.statusBar.setElement('editor-status-cursor-position', {
-            text: nls.localizeByDefault('Ln {0}, Col {1}', cursor.line + 1, editor.getVisibleColumn(cursor)),
-            alignment: StatusBarAlignment.RIGHT,
-            priority: 100,
-            tooltip: EditorCommands.GOTO_LINE_COLUMN.label,
-            command: EditorCommands.GOTO_LINE_COLUMN.id
-        });
-    }
-
-    registerCommands(commands: CommandRegistry): void {
-        commands.registerCommand(EditorCommands.SHOW_ALL_OPENED_EDITORS, {
-            execute: () => this.quickInputService?.open('edt ')
-        });
-        const splitHandlerFactory = (splitMode: DockLayout.InsertMode): CommandHandler => new CurrentWidgetCommandAdapter(this.shell, {
-            isEnabled: title => title?.owner instanceof EditorWidget,
-            execute: async title => {
-                if (title?.owner instanceof EditorWidget) {
-                    const selection = title.owner.editor.selection;
-                    const newEditor = await this.editorManager.openToSide(title.owner.editor.uri, { selection, widgetOptions: { mode: splitMode, ref: title.owner } });
-                    const oldEditorState = title.owner.editor.storeViewState();
-                    newEditor.editor.restoreViewState(oldEditorState);
-                }
-            }
-        });
-        commands.registerCommand(EditorCommands.SPLIT_EDITOR_HORIZONTAL, splitHandlerFactory('split-right'));
-        commands.registerCommand(EditorCommands.SPLIT_EDITOR_VERTICAL, splitHandlerFactory('split-bottom'));
-        commands.registerCommand(EditorCommands.SPLIT_EDITOR_RIGHT, splitHandlerFactory('split-right'));
-        commands.registerCommand(EditorCommands.SPLIT_EDITOR_DOWN, splitHandlerFactory('split-bottom'));
-        commands.registerCommand(EditorCommands.SPLIT_EDITOR_UP, splitHandlerFactory('split-top'));
-        commands.registerCommand(EditorCommands.SPLIT_EDITOR_LEFT, splitHandlerFactory('split-left'));
-    }
-
-    registerKeybindings(keybindings: KeybindingRegistry): void {
-        keybindings.registerKeybinding({
-            command: EditorCommands.SHOW_ALL_OPENED_EDITORS.id,
-            keybinding: 'ctrlcmd+k ctrlcmd+p'
-        });
-        keybindings.registerKeybinding({
-            command: EditorCommands.SPLIT_EDITOR_HORIZONTAL.id,
-            keybinding: 'ctrlcmd+\\',
-        });
-        keybindings.registerKeybinding({
-            command: EditorCommands.SPLIT_EDITOR_VERTICAL.id,
-            keybinding: 'ctrlcmd+k ctrlcmd+\\',
-        });
-    }
-
-    registerMenus(registry: MenuModelRegistry): void {
-        registry.registerMenuAction(SHELL_TABBAR_CONTEXT_SPLIT, {
-            commandId: EditorCommands.SPLIT_EDITOR_UP.id,
-            label: nls.localizeByDefault('Split Up'),
-            order: '1',
-        });
-        registry.registerMenuAction(SHELL_TABBAR_CONTEXT_SPLIT, {
-            commandId: EditorCommands.SPLIT_EDITOR_DOWN.id,
-            label: nls.localizeByDefault('Split Down'),
-            order: '2',
-        });
-        registry.registerMenuAction(SHELL_TABBAR_CONTEXT_SPLIT, {
-            commandId: EditorCommands.SPLIT_EDITOR_LEFT.id,
-            label: nls.localizeByDefault('Split Left'),
-            order: '3',
-        });
-        registry.registerMenuAction(SHELL_TABBAR_CONTEXT_SPLIT, {
-            commandId: EditorCommands.SPLIT_EDITOR_RIGHT.id,
-            label: nls.localizeByDefault('Split Right'),
-            order: '4',
-        });
-    }
-}
+// *****************************************************************************
+// Copyright (C) 2017 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 { EditorManager } from './editor-manager';
+import { TextEditor } from './editor';
+import { injectable, inject, optional } from '@theia/core/shared/inversify';
+import { StatusBarAlignment, StatusBar } from '@theia/core/lib/browser/status-bar/status-bar';
+import {
+    FrontendApplicationContribution, DiffUris, DockLayout,
+    QuickInputService, KeybindingRegistry, KeybindingContribution, SHELL_TABBAR_CONTEXT_SPLIT, ApplicationShell
+} from '@theia/core/lib/browser';
+import { ContextKeyService } from '@theia/core/lib/browser/context-key-service';
+import { CommandHandler, DisposableCollection, MenuContribution, MenuModelRegistry } from '@theia/core';
+import { EditorCommands } from './editor-command';
+import { CommandRegistry, CommandContribution } from '@theia/core/lib/common';
+import { SUPPORTED_ENCODINGS } from '@theia/core/lib/browser/supported-encodings';
+import { nls } from '@theia/core/lib/common/nls';
+import { CurrentWidgetCommandAdapter } from '@theia/core/lib/browser/shell/current-widget-command-adapter';
+import { EditorWidget } from './editor-widget';
+import { EditorLanguageStatusService } from './language-status/editor-language-status-service';
+
+@injectable()
+export class EditorContribution implements FrontendApplicationContribution, CommandContribution, KeybindingContribution, MenuContribution {
+
+    @inject(StatusBar) protected readonly statusBar: StatusBar;
+    @inject(EditorManager) protected readonly editorManager: EditorManager;
+    @inject(EditorLanguageStatusService) protected readonly languageStatusService: EditorLanguageStatusService;
+    @inject(ApplicationShell) protected readonly shell: ApplicationShell;
+
+    @inject(ContextKeyService)
+    protected readonly contextKeyService: ContextKeyService;
+
+    @inject(QuickInputService) @optional()
+    protected readonly quickInputService: QuickInputService;
+
+    onStart(): void {
+        this.initEditorContextKeys();
+
+        this.updateStatusBar();
+        this.editorManager.onCurrentEditorChanged(() => this.updateStatusBar());
+    }
+
+    protected initEditorContextKeys(): void {
+        const editorIsOpen = this.contextKeyService.createKey<boolean>('editorIsOpen', false);
+        const textCompareEditorVisible = this.contextKeyService.createKey<boolean>('textCompareEditorVisible', false);
+        const updateContextKeys = () => {
+            const widgets = this.editorManager.all;
+            editorIsOpen.set(!!widgets.length);
+            textCompareEditorVisible.set(widgets.some(widget => DiffUris.isDiffUri(widget.editor.uri)));
+        };
+        updateContextKeys();
+        for (const widget of this.editorManager.all) {
+            widget.disposed.connect(updateContextKeys);
+        }
+        this.editorManager.onCreated(widget => {
+            updateContextKeys();
+            widget.disposed.connect(updateContextKeys);
+        });
+    }
+
+    protected readonly toDisposeOnCurrentEditorChanged = new DisposableCollection();
+    protected updateStatusBar(): void {
+        this.toDisposeOnCurrentEditorChanged.dispose();
+
+        const widget = this.editorManager.currentEditor;
+        const editor = widget && widget.editor;
+        this.updateLanguageStatus(editor);
+        this.updateEncodingStatus(editor);
+        this.setCursorPositionStatus(editor);
+        if (editor) {
+            this.toDisposeOnCurrentEditorChanged.pushAll([
+                editor.onLanguageChanged(() => this.updateLanguageStatus(editor)),
+                editor.onEncodingChanged(() => this.updateEncodingStatus(editor)),
+                editor.onCursorPositionChanged(() => this.setCursorPositionStatus(editor))
+            ]);
+        }
+    }
+
+    protected updateLanguageStatus(editor: TextEditor | undefined): void {
+        this.languageStatusService.updateLanguageStatus(editor);
+    }
+
+    protected updateEncodingStatus(editor: TextEditor | undefined): void {
+        if (!editor) {
+            this.statusBar.removeElement('editor-status-encoding');
+            return;
+        }
+        this.statusBar.setElement('editor-status-encoding', {
+            text: SUPPORTED_ENCODINGS[editor.getEncoding()].labelShort,
+            alignment: StatusBarAlignment.RIGHT,
+            priority: 10,
+            command: EditorCommands.CHANGE_ENCODING.id,
+            tooltip: nls.localizeByDefault('Select Encoding')
+        });
+    }
+
+    protected setCursorPositionStatus(editor: TextEditor | undefined): void {
+        if (!editor) {
+            this.statusBar.removeElement('editor-status-cursor-position');
+            return;
+        }
+        const { cursor } = editor;
+        this.statusBar.setElement('editor-status-cursor-position', {
+            text: nls.localizeByDefault('Ln {0}, Col {1}', cursor.line + 1, editor.getVisibleColumn(cursor)),
+            alignment: StatusBarAlignment.RIGHT,
+            priority: 100,
+            tooltip: EditorCommands.GOTO_LINE_COLUMN.label,
+            command: EditorCommands.GOTO_LINE_COLUMN.id
+        });
+    }
+
+    registerCommands(commands: CommandRegistry): void {
+        commands.registerCommand(EditorCommands.SHOW_ALL_OPENED_EDITORS, {
+            execute: () => this.quickInputService?.open('edt ')
+        });
+        const splitHandlerFactory = (splitMode: DockLayout.InsertMode): CommandHandler => new CurrentWidgetCommandAdapter(this.shell, {
+            isEnabled: title => title?.owner instanceof EditorWidget,
+            execute: async title => {
+                if (title?.owner instanceof EditorWidget) {
+                    const selection = title.owner.editor.selection;
+                    const newEditor = await this.editorManager.openToSide(title.owner.editor.uri, { selection, widgetOptions: { mode: splitMode, ref: title.owner } });
+                    const oldEditorState = title.owner.editor.storeViewState();
+                    newEditor.editor.restoreViewState(oldEditorState);
+                }
+            }
+        });
+        commands.registerCommand(EditorCommands.SPLIT_EDITOR_HORIZONTAL, splitHandlerFactory('split-right'));
+        commands.registerCommand(EditorCommands.SPLIT_EDITOR_VERTICAL, splitHandlerFactory('split-bottom'));
+        commands.registerCommand(EditorCommands.SPLIT_EDITOR_RIGHT, splitHandlerFactory('split-right'));
+        commands.registerCommand(EditorCommands.SPLIT_EDITOR_DOWN, splitHandlerFactory('split-bottom'));
+        commands.registerCommand(EditorCommands.SPLIT_EDITOR_UP, splitHandlerFactory('split-top'));
+        commands.registerCommand(EditorCommands.SPLIT_EDITOR_LEFT, splitHandlerFactory('split-left'));
+    }
+
+    registerKeybindings(keybindings: KeybindingRegistry): void {
+        keybindings.registerKeybinding({
+            command: EditorCommands.SHOW_ALL_OPENED_EDITORS.id,
+            keybinding: 'ctrlcmd+k ctrlcmd+p'
+        });
+        keybindings.registerKeybinding({
+            command: EditorCommands.SPLIT_EDITOR_HORIZONTAL.id,
+            keybinding: 'ctrlcmd+\\',
+        });
+        keybindings.registerKeybinding({
+            command: EditorCommands.SPLIT_EDITOR_VERTICAL.id,
+            keybinding: 'ctrlcmd+k ctrlcmd+\\',
+        });
+    }
+
+    registerMenus(registry: MenuModelRegistry): void {
+        registry.registerMenuAction(SHELL_TABBAR_CONTEXT_SPLIT, {
+            commandId: EditorCommands.SPLIT_EDITOR_UP.id,
+            label: nls.localizeByDefault('Split Up'),
+            order: '1',
+        });
+        registry.registerMenuAction(SHELL_TABBAR_CONTEXT_SPLIT, {
+            commandId: EditorCommands.SPLIT_EDITOR_DOWN.id,
+            label: nls.localizeByDefault('Split Down'),
+            order: '2',
+        });
+        registry.registerMenuAction(SHELL_TABBAR_CONTEXT_SPLIT, {
+            commandId: EditorCommands.SPLIT_EDITOR_LEFT.id,
+            label: nls.localizeByDefault('Split Left'),
+            order: '3',
+        });
+        registry.registerMenuAction(SHELL_TABBAR_CONTEXT_SPLIT, {
+            commandId: EditorCommands.SPLIT_EDITOR_RIGHT.id,
+            label: nls.localizeByDefault('Split Right'),
+            order: '4',
+        });
+    }
+}

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

@@ -1,90 +1,90 @@
-// *****************************************************************************
-// 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 '../../src/browser/style/index.css';
-import '../../src/browser/language-status/editor-language-status.css';
-
-import { ContainerModule } from '@theia/core/shared/inversify';
-import { CommandContribution, MenuContribution } from '@theia/core/lib/common';
-import { OpenHandler, WidgetFactory, FrontendApplicationContribution, KeybindingContribution } from '@theia/core/lib/browser';
-import { VariableContribution } from '@theia/variable-resolver/lib/browser';
-import { EditorManager, EditorAccess, ActiveEditorAccess, CurrentEditorAccess } from './editor-manager';
-import { EditorContribution } from './editor-contribution';
-import { EditorMenuContribution } from './editor-menu';
-import { EditorCommandContribution } from './editor-command';
-import { EditorKeybindingContribution } from './editor-keybinding';
-import { bindEditorPreferences } from './editor-preferences';
-import { EditorWidgetFactory } from './editor-widget-factory';
-import { EditorNavigationContribution } from './editor-navigation-contribution';
-import { NavigationLocationUpdater } from './navigation/navigation-location-updater';
-import { NavigationLocationService } from './navigation/navigation-location-service';
-import { NavigationLocationSimilarity } from './navigation/navigation-location-similarity';
-import { EditorVariableContribution } from './editor-variable-contribution';
-import { QuickAccessContribution } from '@theia/core/lib/browser/quick-input/quick-access';
-import { QuickEditorService } from './quick-editor-service';
-import { EditorLanguageStatusService } from './language-status/editor-language-status-service';
-import { EditorLineNumberContribution } from './editor-linenumber-contribution';
-import { UndoRedoService } from './undo-redo-service';
-import { EditorLanguageQuickPickService } from './editor-language-quick-pick-service';
-
-export default new ContainerModule(bind => {
-    bindEditorPreferences(bind);
-
-    bind(EditorWidgetFactory).toSelf().inSingletonScope();
-    bind(WidgetFactory).toService(EditorWidgetFactory);
-
-    bind(EditorManager).toSelf().inSingletonScope();
-    bind(OpenHandler).toService(EditorManager);
-
-    bind(EditorCommandContribution).toSelf().inSingletonScope();
-    bind(CommandContribution).toService(EditorCommandContribution);
-
-    bind(EditorMenuContribution).toSelf().inSingletonScope();
-    bind(MenuContribution).toService(EditorMenuContribution);
-
-    bind(EditorKeybindingContribution).toSelf().inSingletonScope();
-    bind(KeybindingContribution).toService(EditorKeybindingContribution);
-
-    bind(EditorContribution).toSelf().inSingletonScope();
-    bind(FrontendApplicationContribution).toService(EditorContribution);
-    bind(EditorLanguageStatusService).toSelf().inSingletonScope();
-
-    bind(EditorLineNumberContribution).toSelf().inSingletonScope();
-    bind(FrontendApplicationContribution).toService(EditorLineNumberContribution);
-
-    bind(EditorNavigationContribution).toSelf().inSingletonScope();
-    bind(FrontendApplicationContribution).toService(EditorNavigationContribution);
-    bind(NavigationLocationService).toSelf().inSingletonScope();
-    bind(NavigationLocationUpdater).toSelf().inSingletonScope();
-    bind(NavigationLocationSimilarity).toSelf().inSingletonScope();
-
-    bind(VariableContribution).to(EditorVariableContribution).inSingletonScope();
-
-    [CommandContribution, KeybindingContribution, MenuContribution].forEach(serviceIdentifier => {
-        bind(serviceIdentifier).toService(EditorContribution);
-    });
-    bind(QuickEditorService).toSelf().inSingletonScope();
-    bind(QuickAccessContribution).to(QuickEditorService);
-
-    bind(CurrentEditorAccess).toSelf().inSingletonScope();
-    bind(ActiveEditorAccess).toSelf().inSingletonScope();
-    bind(EditorAccess).to(CurrentEditorAccess).inSingletonScope().whenTargetNamed(EditorAccess.CURRENT);
-    bind(EditorAccess).to(ActiveEditorAccess).inSingletonScope().whenTargetNamed(EditorAccess.ACTIVE);
-
-    bind(UndoRedoService).toSelf().inSingletonScope();
-
-    bind(EditorLanguageQuickPickService).toSelf().inSingletonScope();
-});
+// *****************************************************************************
+// 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 '../../src/browser/style/index.css';
+import '../../src/browser/language-status/editor-language-status.css';
+
+import { ContainerModule } from '@theia/core/shared/inversify';
+import { CommandContribution, MenuContribution } from '@theia/core/lib/common';
+import { OpenHandler, WidgetFactory, FrontendApplicationContribution, KeybindingContribution } from '@theia/core/lib/browser';
+import { VariableContribution } from '@theia/variable-resolver/lib/browser';
+import { EditorManager, EditorAccess, ActiveEditorAccess, CurrentEditorAccess } from './editor-manager';
+import { EditorContribution } from './editor-contribution';
+import { EditorMenuContribution } from './editor-menu';
+import { EditorCommandContribution } from './editor-command';
+import { EditorKeybindingContribution } from './editor-keybinding';
+import { bindEditorPreferences } from './editor-preferences';
+import { EditorWidgetFactory } from './editor-widget-factory';
+import { EditorNavigationContribution } from './editor-navigation-contribution';
+import { NavigationLocationUpdater } from './navigation/navigation-location-updater';
+import { NavigationLocationService } from './navigation/navigation-location-service';
+import { NavigationLocationSimilarity } from './navigation/navigation-location-similarity';
+import { EditorVariableContribution } from './editor-variable-contribution';
+import { QuickAccessContribution } from '@theia/core/lib/browser/quick-input/quick-access';
+import { QuickEditorService } from './quick-editor-service';
+import { EditorLanguageStatusService } from './language-status/editor-language-status-service';
+import { EditorLineNumberContribution } from './editor-linenumber-contribution';
+import { UndoRedoService } from './undo-redo-service';
+import { EditorLanguageQuickPickService } from './editor-language-quick-pick-service';
+
+export default new ContainerModule(bind => {
+    bindEditorPreferences(bind);
+
+    bind(EditorWidgetFactory).toSelf().inSingletonScope();
+    bind(WidgetFactory).toService(EditorWidgetFactory);
+
+    bind(EditorManager).toSelf().inSingletonScope();
+    bind(OpenHandler).toService(EditorManager);
+
+    bind(EditorCommandContribution).toSelf().inSingletonScope();
+    bind(CommandContribution).toService(EditorCommandContribution);
+
+    bind(EditorMenuContribution).toSelf().inSingletonScope();
+    bind(MenuContribution).toService(EditorMenuContribution);
+
+    bind(EditorKeybindingContribution).toSelf().inSingletonScope();
+    bind(KeybindingContribution).toService(EditorKeybindingContribution);
+
+    bind(EditorContribution).toSelf().inSingletonScope();
+    bind(FrontendApplicationContribution).toService(EditorContribution);
+    bind(EditorLanguageStatusService).toSelf().inSingletonScope();
+
+    bind(EditorLineNumberContribution).toSelf().inSingletonScope();
+    bind(FrontendApplicationContribution).toService(EditorLineNumberContribution);
+
+    bind(EditorNavigationContribution).toSelf().inSingletonScope();
+    bind(FrontendApplicationContribution).toService(EditorNavigationContribution);
+    bind(NavigationLocationService).toSelf().inSingletonScope();
+    bind(NavigationLocationUpdater).toSelf().inSingletonScope();
+    bind(NavigationLocationSimilarity).toSelf().inSingletonScope();
+
+    bind(VariableContribution).to(EditorVariableContribution).inSingletonScope();
+
+    [CommandContribution, KeybindingContribution, MenuContribution].forEach(serviceIdentifier => {
+        bind(serviceIdentifier).toService(EditorContribution);
+    });
+    bind(QuickEditorService).toSelf().inSingletonScope();
+    bind(QuickAccessContribution).to(QuickEditorService);
+
+    bind(CurrentEditorAccess).toSelf().inSingletonScope();
+    bind(ActiveEditorAccess).toSelf().inSingletonScope();
+    bind(EditorAccess).to(CurrentEditorAccess).inSingletonScope().whenTargetNamed(EditorAccess.CURRENT);
+    bind(EditorAccess).to(ActiveEditorAccess).inSingletonScope().whenTargetNamed(EditorAccess.ACTIVE);
+
+    bind(UndoRedoService).toSelf().inSingletonScope();
+
+    bind(EditorLanguageQuickPickService).toSelf().inSingletonScope();
+});