Implement revert file command

Signed-off-by: Colin Grant <colin.grant@ericsson.com>

Author: Colin Grant

packages/editor/src/browser/editor-command.ts

@@ -69,6 +69,11 @@ export namespace EditorCommands {
         category: EDITOR_CATEGORY,
         label: 'Change File Encoding'
     };
+    export const REVERT_EDITOR: Command = {
+        id: 'workbench.action.files.revert',
+        category: 'File',
+        label: 'Revert File',
+    };
     export const REVERT_AND_CLOSE: Command = {
         id: 'workbench.action.revertAndCloseActiveEditor',
         category: 'View',
@@ -234,6 +239,7 @@ export class EditorCommandContribution implements CommandContribution {
         registry.registerCommand(EditorCommands.CONFIG_EOL);
         registry.registerCommand(EditorCommands.INDENT_USING_SPACES);
         registry.registerCommand(EditorCommands.INDENT_USING_TABS);
+        registry.registerCommand(EditorCommands.REVERT_EDITOR);
         registry.registerCommand(EditorCommands.REVERT_AND_CLOSE);
         registry.registerCommand(EditorCommands.CHANGE_LANGUAGE, {
             isEnabled: () => this.canConfigureLanguage(),

packages/editor/src/browser/editor-menu.ts

@@ -105,7 +105,7 @@ export class EditorMenuContribution implements MenuContribution {
         registry.registerMenuAction(CommonMenus.FILE_CLOSE, {
             commandId: CommonCommands.CLOSE_MAIN_TAB.id,
             label: 'Close Editor',
-            order: '0'
+            order: '1'
         });
     }
 

packages/monaco/src/browser/monaco-command.ts

@@ -18,7 +18,7 @@ import { injectable, inject, optional } from '@theia/core/shared/inversify';
 import { Position, Location } from '@theia/core/shared/vscode-languageserver-types';
 import { CommandContribution, CommandRegistry, CommandHandler } from '@theia/core/lib/common/command';
 import { CommonCommands, QuickInputService, ApplicationShell } from '@theia/core/lib/browser';
-import { EditorCommands, EditorManager } from '@theia/editor/lib/browser';
+import { EditorCommands, EditorManager, EditorWidget } from '@theia/editor/lib/browser';
 import { MonacoEditor } from './monaco-editor';
 import { MonacoCommandRegistry, MonacoEditorCommandHandler } from './monaco-command-registry';
 import { MonacoEditorService } from './monaco-editor-service';
@@ -191,6 +191,7 @@ export class MonacoEditorCommandHandlers implements CommandContribution {
         this.monacoCommandRegistry.registerHandler(EditorCommands.CONFIG_EOL.id, this.newConfigEolHandler());
         this.monacoCommandRegistry.registerHandler(EditorCommands.INDENT_USING_SPACES.id, this.newConfigTabSizeHandler(true));
         this.monacoCommandRegistry.registerHandler(EditorCommands.INDENT_USING_TABS.id, this.newConfigTabSizeHandler(false));
+        this.monacoCommandRegistry.registerHandler(EditorCommands.REVERT_EDITOR.id, this.newRevertActiveEditorHandler());
         this.monacoCommandRegistry.registerHandler(EditorCommands.REVERT_AND_CLOSE.id, this.newRevertAndCloseActiveEditorHandler());
     }
 
@@ -272,23 +273,36 @@ export class MonacoEditorCommandHandlers implements CommandContribution {
         }
     }
 
+    protected newRevertActiveEditorHandler(): MonacoEditorCommandHandler {
+        return {
+            execute: () => this.revertEditor(this.getActiveEditor().editor),
+        };
+    }
+
     protected newRevertAndCloseActiveEditorHandler(): MonacoEditorCommandHandler {
         return {
-            execute: async () => this.revertAndCloseActiveEditor()
+            execute: async () => this.revertAndCloseActiveEditor(this.getActiveEditor())
         };
     }
 
-    protected async revertAndCloseActiveEditor(): Promise<void> {
-        const editor = this.editorManager.currentEditor;
+    protected getActiveEditor(): { widget?: EditorWidget, editor?: MonacoEditor } {
+        const widget = this.editorManager.currentEditor;
+        return { widget, editor: widget && MonacoEditor.getCurrent(this.editorManager) };
+    }
+
+    protected async revertEditor(editor?: MonacoEditor): Promise<void> {
         if (editor) {
-            const monacoEditor = MonacoEditor.getCurrent(this.editorManager);
-            if (monacoEditor) {
-                try {
-                    await monacoEditor.document.revert();
-                    editor.close();
-                } catch (error) {
-                    await this.shell.closeWidget(editor.id, { save: false });
-                }
+            return editor.document.revert();
+        }
+    }
+
+    protected async revertAndCloseActiveEditor(current: { widget?: EditorWidget, editor?: MonacoEditor }): Promise<void> {
+        if (current.editor && current.widget) {
+            try {
+                await this.revertEditor(current.editor);
+                current.widget.close();
+            } catch (error) {
+                await this.shell.closeWidget(current.widget.id, { save: false });
             }
         }
     }