Rebind Go to Definition to ctrl+f11

Signed-off-by: svor <vsvydenk@redhat.com>
eclipse-theia · Oct 18, 2019 · 162a48a · 162a48a
1 parent e997351
commit 162a48a
Show file tree

Hide file tree

Showing 2 changed files with 11 additions and 4 deletions.
diff --git a/packages/monaco/src/browser/monaco-command.ts b/packages/monaco/src/browser/monaco-command.ts
@@ -56,6 +56,8 @@ export namespace MonacoCommands {
     export const SELECTION_ADD_PREVIOUS_OCCURRENCE = 'editor.action.addSelectionToPreviousFindMatch';
     export const SELECTION_SELECT_ALL_OCCURRENCES = 'editor.action.selectHighlights';
 
+    export const GO_TO_DEFINITION = 'editor.action.revealDefinition';
+
     export const ACTIONS = new Map<string, MonacoCommand>();
     ACTIONS.set(SELECTION_SELECT_ALL, { id: SELECTION_SELECT_ALL, label: 'Select All', delegate: 'editor.action.selectAll' });
     export const EXCLUDE_ACTIONS = new Set([

diff --git a/packages/monaco/src/browser/monaco-keybinding.ts b/packages/monaco/src/browser/monaco-keybinding.ts
@@ -20,7 +20,7 @@ import { EditorKeybindingContexts } from '@theia/editor/lib/browser';
 import { MonacoCommands } from './monaco-command';
 import { MonacoCommandRegistry } from './monaco-command-registry';
 import { KEY_CODE_MAP } from './monaco-keycode-map';
-import { isOSX } from '@theia/core';
+import { isOSX, environment } from '@theia/core';
 
 function monaco2BrowserKeyCode(keyCode: monaco.KeyCode): number {
     for (let i = 0; i < KEY_CODE_MAP.length; i++) {
@@ -47,9 +47,14 @@ export class MonacoKeybindingContribution implements KeybindingContribution {
             if (command) {
                 const raw = item.keybinding;
                 const when = item.when && item.when.serialize();
-                const keybinding = raw instanceof monaco.keybindings.SimpleKeybinding
-                    ? this.keyCode(raw).toString()
-                    : this.keySequence(raw as monaco.keybindings.ChordKeybinding).join(' ');
+                let keybinding;
+                if (item.command === MonacoCommands.GO_TO_DEFINITION && !environment.electron.is()) {
+                    keybinding = 'ctrlcmd+f11';
+                } else {
+                    keybinding = raw instanceof monaco.keybindings.SimpleKeybinding
+                        ? this.keyCode(raw).toString()
+                        : this.keySequence(raw as monaco.keybindings.ChordKeybinding).join(' ');
+                }
                 registry.registerKeybinding({ command, keybinding, when });
             }
         }