Add keymaps customization support

Author: fstasi

arduino-ide-extension/package.json

@@ -23,6 +23,7 @@
     "@theia/editor": "next",
     "@theia/filesystem": "next",
     "@theia/git": "next",
+    "@theia/keymaps": "next",
     "@theia/markers": "next",
     "@theia/monaco": "next",
     "@theia/navigator": "next",

arduino-ide-extension/src/browser/arduino-ide-frontend-module.ts

@@ -24,6 +24,8 @@ import { ProblemContribution as TheiaProblemContribution } from '@theia/markers/
 import { ProblemContribution } from './theia/markers/problem-contribution';
 import { FileNavigatorContribution } from './theia/navigator/navigator-contribution';
 import { FileNavigatorContribution as TheiaFileNavigatorContribution } from '@theia/navigator/lib/browser/navigator-contribution';
+import { KeymapsFrontendContribution } from './theia/keymaps/keymaps-frontend-contribution';
+import { KeymapsFrontendContribution as TheiaKeymapsFrontendContribution } from '@theia/keymaps/lib/browser/keymaps-frontend-contribution';
 import { ArduinoToolbarContribution } from './toolbar/arduino-toolbar-contribution';
 import { EditorContribution as TheiaEditorContribution } from '@theia/editor/lib/browser/editor-contribution';
 import { EditorContribution } from './theia/editor/editor-contribution';
@@ -278,6 +280,7 @@ export default new ContainerModule((bind, unbind, isBound, rebind) => {
     rebind(TheiaOutlineViewContribution).to(OutlineViewContribution).inSingletonScope();
     rebind(TheiaProblemContribution).to(ProblemContribution).inSingletonScope();
     rebind(TheiaFileNavigatorContribution).to(FileNavigatorContribution).inSingletonScope();
+    rebind(TheiaKeymapsFrontendContribution).to(KeymapsFrontendContribution).inSingletonScope();
     rebind(TheiaEditorContribution).to(EditorContribution).inSingletonScope();
     rebind(TheiaMonacoStatusBarContribution).to(MonacoStatusBarContribution).inSingletonScope();
     rebind(TheiaApplicationShell).to(ApplicationShell).inSingletonScope();

arduino-ide-extension/src/browser/contributions/settings.ts

@@ -33,9 +33,10 @@ export class Settings extends SketchContribution {
     }
 
     registerMenus(registry: MenuModelRegistry): void {
-        registry.registerMenuAction(ArduinoMenus.FILE__SETTINGS_GROUP, {
+        registry.registerSubmenu(ArduinoMenus.FILE__SETTINGS_SUBMENU, 'Preferences...', { order: '1' });
+        registry.registerMenuAction(ArduinoMenus.FILE__SETTINGS_SUBMENU, {
             commandId: Settings.Commands.OPEN.id,
-            label: 'Preferences...',
+            label: 'Settings...',
             order: '0'
         });
     }

arduino-ide-extension/src/browser/menu/arduino-menus.ts

@@ -25,6 +25,9 @@ export namespace ArduinoMenus {
     export const EXAMPLES__CURRENT_BOARD_GROUP = [...FILE__EXAMPLES_SUBMENU, '2_current_board'];
     export const EXAMPLES__USER_LIBS_GROUP = [...FILE__EXAMPLES_SUBMENU, '3_user_libs'];
 
+    // -- File / Preferences
+    export const FILE__SETTINGS_SUBMENU = [...FILE__SETTINGS_GROUP, '0_preferences'];
+
     // -- Edit
     // `Copy`, `Copy to Forum`, `Paste`, etc.
     // Note: `1_undo` is the first group from Theia, we start with `2`

arduino-ide-extension/src/browser/theia/keymaps/keymaps-frontend-contribution.ts

@@ -0,0 +1,50 @@
+import { injectable } from 'inversify';
+import { MenuModelRegistry } from '@theia/core';
+import { KeymapsFrontendContribution as TheiaKeymapsFrontendContribution, KeymapsCommands } from '@theia/keymaps/lib/browser/keymaps-frontend-contribution';
+import { ArduinoMenus } from '../../menu/arduino-menus';
+
+
+@injectable()
+export class KeymapsFrontendContribution extends TheiaKeymapsFrontendContribution {
+
+    constructor() {
+        super();
+    }
+
+    registerMenus(menus: MenuModelRegistry): void {
+
+        menus.registerMenuAction(ArduinoMenus.FILE__SETTINGS_SUBMENU, {
+            commandId: KeymapsCommands.OPEN_KEYMAPS.id,
+            order: 'a20'
+        });
+
+        // menus.registerMenuAction(CommonMenus.FILE_SETTINGS_SUBMENU_OPEN, {
+        //     commandId: KeymapsCommands.OPEN_KEYMAPS.id,
+        //     order: 'a20'
+        // });
+        // menus.registerMenuAction(CommonMenus.SETTINGS_OPEN, {
+        //     commandId: KeymapsCommands.OPEN_KEYMAPS.id,
+        //     order: 'a20'
+        // });
+    }
+
+    // CAN WE GET RID OF registerToolbarItems?
+
+    // async registerToolbarItems(toolbar: TabBarToolbarRegistry): Promise<void> {
+    //     const widget = await this.widget;
+    //     const onDidChange = widget.onDidUpdate;
+    //     toolbar.registerItem({
+    //         id: KeymapsCommands.OPEN_KEYMAPS_JSON_TOOLBAR.id,
+    //         command: KeymapsCommands.OPEN_KEYMAPS_JSON_TOOLBAR.id,
+    //         tooltip: 'Open Keyboard Shortcuts in JSON',
+    //         priority: 0,
+    //     });
+    //     toolbar.registerItem({
+    //         id: KeymapsCommands.CLEAR_KEYBINDINGS_SEARCH.id,
+    //         command: KeymapsCommands.CLEAR_KEYBINDINGS_SEARCH.id,
+    //         tooltip: 'Clear Keybindings Search Input',
+    //         priority: 1,
+    //         onDidChange,
+    //     });
+    // }
+}

browser-app/package.json

@@ -9,6 +9,7 @@
     "@theia/editor": "next",
     "@theia/file-search": "next",
     "@theia/filesystem": "next",
+    "@theia/keymaps": "next",
     "@theia/messages": "next",
     "@theia/monaco": "next",
     "@theia/navigator": "next",

electron-app/package.json

@@ -11,6 +11,7 @@
     "@theia/electron": "next",
     "@theia/file-search": "next",
     "@theia/filesystem": "next",
+    "@theia/keymaps": "next",
     "@theia/messages": "next",
     "@theia/monaco": "next",
     "@theia/navigator": "next",