@theia/editor 1.18.0 → 1.21.0-next.12

package/src/browser/editor-contribution.ts

@@ -18,21 +18,27 @@ 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 } from '@theia/core/lib/browser';
+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 } from '@theia/core';
+import { CommandHandler, DisposableCollection, MenuContribution, MenuModelRegistry } from '@theia/core';
 import { EditorCommands } from './editor-command';
 import { CommandRegistry, CommandContribution } from '@theia/core/lib/common';
-import { KeybindingRegistry, KeybindingContribution } from '@theia/core/lib/browser';
 import { LanguageService } from '@theia/core/lib/browser/language-service';
 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';
 
 @injectable()
-export class EditorContribution implements FrontendApplicationContribution, CommandContribution, KeybindingContribution {
+export class EditorContribution implements FrontendApplicationContribution, CommandContribution, KeybindingContribution, MenuContribution {
 
     @inject(StatusBar) protected readonly statusBar: StatusBar;
     @inject(EditorManager) protected readonly editorManager: EditorManager;
     @inject(LanguageService) protected readonly languages: LanguageService;
+    @inject(ApplicationShell) protected readonly shell: ApplicationShell;
 
     @inject(ContextKeyService)
     protected readonly contextKeyService: ContextKeyService;
@@ -95,7 +101,7 @@ export class EditorContribution implements FrontendApplicationContribution, Comm
             alignment: StatusBarAlignment.RIGHT,
             priority: 1,
             command: EditorCommands.CHANGE_LANGUAGE.id,
-            tooltip: 'Select Language Mode'
+            tooltip: nls.localizeByDefault('Select Language Mode')
         });
     }
 
@@ -109,7 +115,7 @@ export class EditorContribution implements FrontendApplicationContribution, Comm
             alignment: StatusBarAlignment.RIGHT,
             priority: 10,
             command: EditorCommands.CHANGE_ENCODING.id,
-            tooltip: 'Select Encoding'
+            tooltip: nls.localizeByDefault('Select Encoding')
         });
     }
 
@@ -120,11 +126,11 @@ export class EditorContribution implements FrontendApplicationContribution, Comm
         }
         const { cursor } = editor;
         this.statusBar.setElement('editor-status-cursor-position', {
-            text: `Ln ${cursor.line + 1}, Col ${editor.getVisibleColumn(cursor)}`,
+            text: nls.localizeByDefault('Ln {0}, Col {1}', cursor.line + 1, editor.getVisibleColumn(cursor)),
             alignment: StatusBarAlignment.RIGHT,
             priority: 100,
-            tooltip: 'Go To Line',
-            command: 'editor.action.gotoLine'
+            tooltip: EditorCommands.GOTO_LINE_COLUMN.label,
+            command: EditorCommands.GOTO_LINE_COLUMN.id
         });
     }
 
@@ -132,15 +138,14 @@ export class EditorContribution implements FrontendApplicationContribution, Comm
         commands.registerCommand(EditorCommands.SHOW_ALL_OPENED_EDITORS, {
             execute: () => this.quickInputService?.open('edt ')
         });
-        const splitHandlerFactory = (splitMode: DockLayout.InsertMode): CommandHandler => ({
-            isEnabled: () => !!this.editorManager.currentEditor,
-            isVisible: () => !!this.editorManager.currentEditor,
-            execute: async () => {
-                const { currentEditor } = this.editorManager;
-                if (currentEditor) {
-                    const selection = currentEditor.editor.selection;
-                    const newEditor = await this.editorManager.openToSide(currentEditor.editor.uri, { selection, widgetOptions: { mode: splitMode } });
-                    const oldEditorState = currentEditor.editor.storeViewState();
+        const splitHandlerFactory = (splitMode: DockLayout.InsertMode): CommandHandler => new CurrentWidgetCommandAdapter(this.shell, {
+            isEnabled: title => title?.owner instanceof EditorWidget,
+            isVisible: 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);
                 }
             }
@@ -167,4 +172,27 @@ export class EditorContribution implements FrontendApplicationContribution, Comm
             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

@@ -69,7 +69,7 @@ export default new ContainerModule(bind => {
 
     bind(VariableContribution).to(EditorVariableContribution).inSingletonScope();
 
-    [CommandContribution, KeybindingContribution].forEach(serviceIdentifier => {
+    [CommandContribution, KeybindingContribution, MenuContribution].forEach(serviceIdentifier => {
         bind(serviceIdentifier).toService(EditorContribution);
     });
     bind(QuickEditorService).toSelf().inSingletonScope();

package/src/browser/editor-manager.ts

@@ -19,9 +19,8 @@ import URI from '@theia/core/lib/common/uri';
 import { RecursivePartial, Emitter, Event, MaybePromise } from '@theia/core/lib/common';
 import { WidgetOpenerOptions, NavigatableWidgetOpenHandler, NavigatableWidgetOptions, Widget } from '@theia/core/lib/browser';
 import { EditorWidget } from './editor-widget';
-import { Range, Position, Location } from './editor';
+import { Range, Position, Location, TextEditor } from './editor';
 import { EditorWidgetFactory } from './editor-widget-factory';
-import { TextEditor } from './editor';
 
 export interface WidgetId {
     id: number;

package/src/browser/editor-menu.ts

@@ -18,6 +18,7 @@ import { injectable } from '@theia/core/shared/inversify';
 import { MenuContribution, MenuModelRegistry, MenuPath, MAIN_MENU_BAR } from '@theia/core';
 import { CommonCommands, CommonMenus } from '@theia/core/lib/browser';
 import { EditorCommands } from './editor-command';
+import { nls } from '@theia/core/lib/common/nls';
 
 export const EDITOR_CONTEXT_MENU: MenuPath = ['editor_context_menu'];
 
@@ -41,10 +42,24 @@ export namespace EditorMainMenu {
     export const GO = [...MAIN_MENU_BAR, '5_go'];
 
     /**
-     * Navigation menu group in the `Go` menu.
+     * Navigation menu group in the `Go` main-menu.
      */
     export const NAVIGATION_GROUP = [...GO, '1_navigation_group'];
 
+    /**
+     * Workspace menu group in the `Go` main-menu.
+     */
+    export const WORKSPACE_GROUP = [...GO, '2_workspace_group'];
+
+    /**
+     * Language features menu group in the `Go` main-menu.
+     */
+    export const LANGUAGE_FEATURES_GROUP = [...GO, '3_language_features_group'];
+
+    /**
+     * Location menu group in the `Go` main-menu.
+     */
+    export const LOCATION_GROUP = [...GO, '4_locations'];
 }
 
 @injectable()
@@ -72,18 +87,26 @@ export class EditorMenuContribution implements MenuContribution {
         });
 
         // Editor navigation. Go > Back and Go > Forward.
-        registry.registerSubmenu(EditorMainMenu.GO, 'Go');
+        registry.registerSubmenu(EditorMainMenu.GO, nls.localizeByDefault('Go'));
         registry.registerMenuAction(EditorMainMenu.NAVIGATION_GROUP, {
             commandId: EditorCommands.GO_BACK.id,
-            label: 'Back'
+            label: EditorCommands.GO_BACK.label,
+            order: '1'
         });
         registry.registerMenuAction(EditorMainMenu.NAVIGATION_GROUP, {
             commandId: EditorCommands.GO_FORWARD.id,
-            label: 'Forward'
+            label: EditorCommands.GO_FORWARD.label,
+            order: '2'
         });
         registry.registerMenuAction(EditorMainMenu.NAVIGATION_GROUP, {
             commandId: EditorCommands.GO_LAST_EDIT.id,
-            label: 'Last Edit Location'
+            label: nls.localizeByDefault('Last Edit Location'),
+            order: '3'
+        });
+
+        registry.registerMenuAction(EditorMainMenu.LOCATION_GROUP, {
+            commandId: EditorCommands.GOTO_LINE_COLUMN.id,
+            order: '1'
         });
 
         // Toggle Commands.
@@ -94,14 +117,19 @@ export class EditorMenuContribution implements MenuContribution {
         });
         registry.registerMenuAction(CommonMenus.VIEW_TOGGLE, {
             commandId: EditorCommands.TOGGLE_MINIMAP.id,
-            label: 'Show Minimap',
+            label: EditorCommands.TOGGLE_MINIMAP.label,
             order: '1',
         });
         registry.registerMenuAction(CommonMenus.VIEW_TOGGLE, {
             commandId: EditorCommands.TOGGLE_RENDER_WHITESPACE.id,
-            label: 'Render Whitespace',
+            label: EditorCommands.TOGGLE_RENDER_WHITESPACE.label,
             order: '2'
         });
+        registry.registerMenuAction(CommonMenus.FILE_CLOSE, {
+            commandId: CommonCommands.CLOSE_MAIN_TAB.id,
+            label: nls.localizeByDefault('Close Editor'),
+            order: '1'
+        });
     }
 
 }