diff --git a/arduino-ide-extension/src/browser/contributions/edit-contributions.ts b/arduino-ide-extension/src/browser/contributions/edit-contributions.ts index 91815fc3..3b938da9 100644 --- a/arduino-ide-extension/src/browser/contributions/edit-contributions.ts +++ b/arduino-ide-extension/src/browser/contributions/edit-contributions.ts @@ -26,6 +26,7 @@ export class EditContributions extends Contribution { registry.registerCommand(EditContributions.Commands.FIND_NEXT, { execute: () => this.run('actions.findWithSelection') }); registry.registerCommand(EditContributions.Commands.FIND_PREVIOUS, { execute: () => this.run('editor.action.nextMatchFindAction') }); registry.registerCommand(EditContributions.Commands.USE_FOR_FIND, { execute: () => this.run('editor.action.previousSelectionMatchFindAction') }); + /* Tools */registry.registerCommand(EditContributions.Commands.AUTO_FORMAT, { execute: () => this.run('editor.action.formatDocument') }); registry.registerCommand(EditContributions.Commands.COPY_FOR_FORUM, { execute: async () => { const value = await this.currentValue(); @@ -117,6 +118,13 @@ ${value} label: 'Use Selection for Find', // 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: 'Auto Format', // XXX: The Java IDE uses `Use Selection For Find`. + order: '0' + }); } registerKeybindings(registry: KeybindingRegistry): void { @@ -162,6 +170,12 @@ ${value} command: EditContributions.Commands.USE_FOR_FIND.id, keybinding: 'CtrlCmd+E' }); + + // `Tools` + registry.registerKeybinding({ + command: EditContributions.Commands.AUTO_FORMAT.id, + keybinding: 'CtrlCmd+T' + }); } protected async current(): Promise { @@ -217,5 +231,9 @@ export namespace EditContributions { export const USE_FOR_FIND: Command = { id: 'arduino-for-find' }; + // `Auto Format` does not belong here. + export const AUTO_FORMAT: Command = { + id: 'arduino-auto-format' + }; } } diff --git a/arduino-ide-extension/src/browser/library/library-widget-frontend-contribution.ts b/arduino-ide-extension/src/browser/library/library-widget-frontend-contribution.ts index 17f430ee..1d2a74b8 100644 --- a/arduino-ide-extension/src/browser/library/library-widget-frontend-contribution.ts +++ b/arduino-ide-extension/src/browser/library/library-widget-frontend-contribution.ts @@ -17,7 +17,7 @@ export class LibraryListWidgetFrontendContribution extends AbstractViewContribut rank: 700 }, toggleCommandId: `${LibraryListWidget.WIDGET_ID}:toggle`, - toggleKeybinding: 'ctrlcmd+shift+l' + toggleKeybinding: 'CtrlCmd+Shift+I' }); } @@ -29,7 +29,8 @@ export class LibraryListWidgetFrontendContribution extends AbstractViewContribut if (this.toggleCommand) { menus.registerMenuAction(ArduinoMenus.TOOLS, { commandId: this.toggleCommand.id, - label: 'Manage Libraries...' + label: 'Manage Libraries...', + order: '3' }); } } diff --git a/arduino-ide-extension/src/browser/monitor/monitor-view-contribution.tsx b/arduino-ide-extension/src/browser/monitor/monitor-view-contribution.tsx index b911a32f..3125d170 100644 --- a/arduino-ide-extension/src/browser/monitor/monitor-view-contribution.tsx +++ b/arduino-ide-extension/src/browser/monitor/monitor-view-contribution.tsx @@ -50,7 +50,8 @@ export class MonitorViewContribution extends AbstractViewContribution