From 318defabd7f672911d9fbdaceb4acf0859a25a44 Mon Sep 17 00:00:00 2001 From: Josh Pinkney Date: Wed, 22 May 2019 11:12:10 -0400 Subject: [PATCH 1/3] Added wrapper for commands needed for vscode Signed-off-by: Josh Pinkney --- .../plugin-vscode-commands-contribution.ts | 16 ++++++++++++++++ 1 file changed, 16 insertions(+) diff --git a/packages/plugin-ext-vscode/src/browser/plugin-vscode-commands-contribution.ts b/packages/plugin-ext-vscode/src/browser/plugin-vscode-commands-contribution.ts index 21d196d0b7675..07e5ee3bbafbe 100644 --- a/packages/plugin-ext-vscode/src/browser/plugin-vscode-commands-contribution.ts +++ b/packages/plugin-ext-vscode/src/browser/plugin-vscode-commands-contribution.ts @@ -309,6 +309,22 @@ export class PluginVscodeCommandsContribution implements CommandContribution { * Show Opened File in New Window workbench.action.files.showOpenedFileInNewWindow * Compare Opened File With workbench.files.action.compareFileWith */ + + commands.registerCommand({ id: 'editor.action.rename' }, { + execute: () => { + commands.executeCommand('monaco.editor.action.rename'); + } + }); + commands.registerCommand({ id: 'editor.action.formatSelection' }, { + execute: () => { + commands.executeCommand('monaco.editor.action.formatSelection'); + } + }); + commands.registerCommand({ id: 'editor.action.formatDocument' }, { + execute: () => { + commands.executeCommand('monaco.editor.action.formatDocument'); + } + }); } private getHtml(body: String) { From 3bf92b9e0578792938c434f373c5789a748f5569 Mon Sep 17 00:00:00 2001 From: Josh Pinkney Date: Wed, 22 May 2019 12:22:51 -0400 Subject: [PATCH 2/3] Fixup Signed-off-by: Josh Pinkney --- packages/editor/src/browser/editor-command.ts | 15 +++++++++++++++ packages/monaco/src/browser/monaco-command.ts | 3 +++ .../plugin-vscode-commands-contribution.ts | 15 --------------- 3 files changed, 18 insertions(+), 15 deletions(-) diff --git a/packages/editor/src/browser/editor-command.ts b/packages/editor/src/browser/editor-command.ts index 6dcf8f865c99e..75020e1859d6e 100644 --- a/packages/editor/src/browser/editor-command.ts +++ b/packages/editor/src/browser/editor-command.ts @@ -25,6 +25,18 @@ export namespace EditorCommands { const EDITOR_CATEGORY = 'Editor'; + export const RENAME: Command = { + id: 'editor.action.rename' + }; + + export const FORMAT_SELECTION: Command = { + id: 'editor.action.formatSelection' + }; + + export const FORMAT_DOCUMENT: Command = { + id: 'editor.action.formatDocument' + }; + /** * Show editor references */ @@ -115,6 +127,9 @@ export class EditorCommandContribution implements CommandContribution { protected readonly editorManager: EditorManager; registerCommands(registry: CommandRegistry): void { + registry.registerCommand(EditorCommands.RENAME); + registry.registerCommand(EditorCommands.FORMAT_SELECTION); + registry.registerCommand(EditorCommands.FORMAT_DOCUMENT); registry.registerCommand(EditorCommands.SHOW_REFERENCES); registry.registerCommand(EditorCommands.CONFIG_INDENTATION); registry.registerCommand(EditorCommands.CONFIG_EOL); diff --git a/packages/monaco/src/browser/monaco-command.ts b/packages/monaco/src/browser/monaco-command.ts index 86771baf42838..9a336a27df7b5 100644 --- a/packages/monaco/src/browser/monaco-command.ts +++ b/packages/monaco/src/browser/monaco-command.ts @@ -126,6 +126,9 @@ export class MonacoEditorCommandHandlers implements CommandContribution { this.registry.registerHandler(EditorCommands.CONFIG_EOL.id, this.newConfigEolHandler()); this.registry.registerHandler(EditorCommands.INDENT_USING_SPACES.id, this.newConfigTabSizeHandler(true)); this.registry.registerHandler(EditorCommands.INDENT_USING_TABS.id, this.newConfigTabSizeHandler(false)); + this.registry.registerHandler(EditorCommands.RENAME.id, this.newCommandHandler('monaco.editor.action.rename')); + this.registry.registerHandler(EditorCommands.FORMAT_SELECTION.id, this.newCommandHandler('monaco.editor.action.formatSelection')); + this.registry.registerHandler(EditorCommands.FORMAT_DOCUMENT.id, this.newCommandHandler('monaco.editor.action.formatDocument')); } protected newShowReferenceHandler(): MonacoEditorCommandHandler { diff --git a/packages/plugin-ext-vscode/src/browser/plugin-vscode-commands-contribution.ts b/packages/plugin-ext-vscode/src/browser/plugin-vscode-commands-contribution.ts index 07e5ee3bbafbe..b0640c0fe9f4d 100644 --- a/packages/plugin-ext-vscode/src/browser/plugin-vscode-commands-contribution.ts +++ b/packages/plugin-ext-vscode/src/browser/plugin-vscode-commands-contribution.ts @@ -310,21 +310,6 @@ export class PluginVscodeCommandsContribution implements CommandContribution { * Compare Opened File With workbench.files.action.compareFileWith */ - commands.registerCommand({ id: 'editor.action.rename' }, { - execute: () => { - commands.executeCommand('monaco.editor.action.rename'); - } - }); - commands.registerCommand({ id: 'editor.action.formatSelection' }, { - execute: () => { - commands.executeCommand('monaco.editor.action.formatSelection'); - } - }); - commands.registerCommand({ id: 'editor.action.formatDocument' }, { - execute: () => { - commands.executeCommand('monaco.editor.action.formatDocument'); - } - }); } private getHtml(body: String) { From a9f18c1f7be9cb53fa2be9f88884e170bd18e131 Mon Sep 17 00:00:00 2001 From: Josh Pinkney Date: Wed, 22 May 2019 12:26:38 -0400 Subject: [PATCH 3/3] Fixup Signed-off-by: Josh Pinkney --- .../src/browser/plugin-vscode-commands-contribution.ts | 1 - 1 file changed, 1 deletion(-) diff --git a/packages/plugin-ext-vscode/src/browser/plugin-vscode-commands-contribution.ts b/packages/plugin-ext-vscode/src/browser/plugin-vscode-commands-contribution.ts index b0640c0fe9f4d..21d196d0b7675 100644 --- a/packages/plugin-ext-vscode/src/browser/plugin-vscode-commands-contribution.ts +++ b/packages/plugin-ext-vscode/src/browser/plugin-vscode-commands-contribution.ts @@ -309,7 +309,6 @@ export class PluginVscodeCommandsContribution implements CommandContribution { * Show Opened File in New Window workbench.action.files.showOpenedFileInNewWindow * Compare Opened File With workbench.files.action.compareFileWith */ - } private getHtml(body: String) {