From 295e724dc435cf9696ad077f44345128bfee94a3 Mon Sep 17 00:00:00 2001 From: Francesco Spissu Date: Wed, 20 Jul 2022 12:28:04 +0200 Subject: [PATCH 1/3] move auto format to the edit menu --- .../contributions/edit-contributions.ts | 19 ++++++++++--------- .../src/browser/menu/arduino-menus.ts | 2 +- 2 files changed, 11 insertions(+), 10 deletions(-) diff --git a/arduino-ide-extension/src/browser/contributions/edit-contributions.ts b/arduino-ide-extension/src/browser/contributions/edit-contributions.ts index c66b41865..b356142aa 100644 --- a/arduino-ide-extension/src/browser/contributions/edit-contributions.ts +++ b/arduino-ide-extension/src/browser/contributions/edit-contributions.ts @@ -141,6 +141,11 @@ ${value} label: nls.localize('arduino/editor/decreaseIndent', 'Decrease Indent'), order: '2', }); + registry.registerMenuAction(ArduinoMenus.EDIT__CODE_CONTROL_GROUP, { + commandId: EditContributions.Commands.AUTO_FORMAT.id, + label: nls.localize('arduino/editor/autoFormat', 'Auto Format'), // XXX: The Java IDE uses `Use Selection For Find`. + order: '3', + }); registry.registerMenuAction(ArduinoMenus.EDIT__FONT_CONTROL_GROUP, { commandId: EditContributions.Commands.INCREASE_FONT_SIZE.id, @@ -188,13 +193,6 @@ ${value} ), // XXX: The Java IDE uses `Use Selection For Find`. order: '3', }); - - // `Tools` - registry.registerMenuAction(ArduinoMenus.TOOLS__MAIN_GROUP, { - commandId: EditContributions.Commands.AUTO_FORMAT.id, - label: nls.localize('arduino/editor/autoFormat', 'Auto Format'), // XXX: The Java IDE uses `Use Selection For Find`. - order: '0', - }); } override registerKeybindings(registry: KeybindingRegistry): void { @@ -248,10 +246,13 @@ ${value} }); } - protected async current(): Promise { + protected async current(): Promise< + ICodeEditor | StandaloneCodeEditor | undefined + > { return ( this.codeEditorService.getFocusedCodeEditor() || - this.codeEditorService.getActiveCodeEditor() || undefined + this.codeEditorService.getActiveCodeEditor() || + undefined ); } diff --git a/arduino-ide-extension/src/browser/menu/arduino-menus.ts b/arduino-ide-extension/src/browser/menu/arduino-menus.ts index 500bdf124..7521f0e74 100644 --- a/arduino-ide-extension/src/browser/menu/arduino-menus.ts +++ b/arduino-ide-extension/src/browser/menu/arduino-menus.ts @@ -86,7 +86,7 @@ export namespace ArduinoMenus { // -- Tools export const TOOLS = [...MAIN_MENU_BAR, '4_tools']; - // `Auto Format`, `Archive Sketch`, `Manage Libraries...`, `Serial Monitor`, Serial Plotter + // `Archive Sketch`, `Manage Libraries...`, `Serial Monitor`, Serial Plotter export const TOOLS__MAIN_GROUP = [...TOOLS, '0_main']; // `WiFi101 / WiFiNINA Firmware Updater` export const TOOLS__FIRMWARE_UPLOADER_GROUP = [ From 6b32e793d05fcc4dc72ad59dc353ab72741529d8 Mon Sep 17 00:00:00 2001 From: Francesco Spissu Date: Tue, 9 Aug 2022 17:35:25 +0200 Subject: [PATCH 2/3] restore Auto Format under Tools menu --- .../src/browser/contributions/edit-contributions.ts | 7 +++++++ arduino-ide-extension/src/browser/menu/arduino-menus.ts | 2 +- 2 files changed, 8 insertions(+), 1 deletion(-) diff --git a/arduino-ide-extension/src/browser/contributions/edit-contributions.ts b/arduino-ide-extension/src/browser/contributions/edit-contributions.ts index b356142aa..9350eeaa6 100644 --- a/arduino-ide-extension/src/browser/contributions/edit-contributions.ts +++ b/arduino-ide-extension/src/browser/contributions/edit-contributions.ts @@ -193,6 +193,13 @@ ${value} ), // XXX: The Java IDE uses `Use Selection For Find`. order: '3', }); + + // `Tools` + registry.registerMenuAction(ArduinoMenus.TOOLS__MAIN_GROUP, { + commandId: EditContributions.Commands.AUTO_FORMAT.id, + label: nls.localize('arduino/editor/autoFormat', 'Auto Format'), // XXX: The Java IDE uses `Use Selection For Find`. + order: '0', + }); } override registerKeybindings(registry: KeybindingRegistry): void { diff --git a/arduino-ide-extension/src/browser/menu/arduino-menus.ts b/arduino-ide-extension/src/browser/menu/arduino-menus.ts index 7521f0e74..500bdf124 100644 --- a/arduino-ide-extension/src/browser/menu/arduino-menus.ts +++ b/arduino-ide-extension/src/browser/menu/arduino-menus.ts @@ -86,7 +86,7 @@ export namespace ArduinoMenus { // -- Tools export const TOOLS = [...MAIN_MENU_BAR, '4_tools']; - // `Archive Sketch`, `Manage Libraries...`, `Serial Monitor`, Serial Plotter + // `Auto Format`, `Archive Sketch`, `Manage Libraries...`, `Serial Monitor`, Serial Plotter export const TOOLS__MAIN_GROUP = [...TOOLS, '0_main']; // `WiFi101 / WiFiNINA Firmware Updater` export const TOOLS__FIRMWARE_UPLOADER_GROUP = [ From 94d8e3c2c093406900824a554beec069619f1eb2 Mon Sep 17 00:00:00 2001 From: Francesco Spissu <94986937+francescospissu@users.noreply.github.com> Date: Wed, 10 Aug 2022 11:12:07 +0200 Subject: [PATCH 3/3] Remove useless comment Co-authored-by: per1234 --- .../src/browser/contributions/edit-contributions.ts | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/arduino-ide-extension/src/browser/contributions/edit-contributions.ts b/arduino-ide-extension/src/browser/contributions/edit-contributions.ts index 9350eeaa6..7c75c7225 100644 --- a/arduino-ide-extension/src/browser/contributions/edit-contributions.ts +++ b/arduino-ide-extension/src/browser/contributions/edit-contributions.ts @@ -143,7 +143,7 @@ ${value} }); registry.registerMenuAction(ArduinoMenus.EDIT__CODE_CONTROL_GROUP, { commandId: EditContributions.Commands.AUTO_FORMAT.id, - label: nls.localize('arduino/editor/autoFormat', 'Auto Format'), // XXX: The Java IDE uses `Use Selection For Find`. + label: nls.localize('arduino/editor/autoFormat', 'Auto Format'), order: '3', });