Implement Accel and use it as default to support ⌘ on Mac

Author: krassowski

README.md

@@ -27,7 +27,7 @@ over the underlined code to see a more detailed message
 
 ### Jump to Definition
 
-Use the context menu entry, or <kbd>Ctrl</kbd> + :computer_mouse: to jump to definitions (customizable); use <kbd>Alt</kbd> + <kbd>o</kbd> to jump back
+Use the context menu entry, or <kbd>Ctrl</kbd> + :computer_mouse: to jump to definitions (<kbd>⌘</kbd> on Mac; customizable); use <kbd>Alt</kbd> + <kbd>o</kbd> to jump back
 
 ![jump](https://raw.githubusercontent.com/krassowski/jupyterlab-lsp/master/examples/screenshots/jump_to_definition.png)
 

packages/jupyterlab-lsp/schema/jump_to.json

@@ -8,9 +8,9 @@
     "modifierKey": {
       "title": "Modifier key",
       "type": "string",
-      "enum": ["Alt", "Control", "Shift", "Meta", "AltGraph"],
-      "default": "Control",
-      "description": "Keyboard key which needs to be pressed with click to jump. The allowed keys are Alt, Control, Shift, and AltGraph. Linux user: Meta key is also supported. Safari users: Meta key is also supported, AltGraph is not supported. To see which physical keys are mapped, visit: https://developer.mozilla.org/en-US/docs/Web/API/KeyboardEvent/getModifierState"
+      "enum": ["Alt", "Control", "Shift", "Meta", "AltGraph", "Accel"],
+      "default": "Accel",
+      "description": "Keyboard key which needs to be pressed with click to jump. The allowed keys are Alt, Control, Shift, Accel, and AltGraph. Accel corresponds to Control or Meta (⌘ Command on Mac). Linux user: Meta key is also supported. Safari users: Meta key is also supported, AltGraph is not supported. To see which physical keys are mapped, visit: https://developer.mozilla.org/en-US/docs/Web/API/KeyboardEvent/getModifierState"
     }
   },
   "jupyter.lab.shortcuts": [

packages/jupyterlab-lsp/src/utils.ts

@@ -34,12 +34,20 @@ export function until_ready(
   });
 }
 
+export type ModifierKey =
+  | 'Shift'
+  | 'Alt'
+  | 'AltGraph'
+  | 'Control'
+  | 'Meta'
+  | 'Accel';
+
 /**
- * TODO: this is slightly modified copy paste from jupyterlab-go-to-definition/editors/codemirror/extension.ts;
+ * CodeMirror-proof implementation of event.getModifierState()
  */
 export function getModifierState(
   event: MouseEvent | KeyboardEvent,
-  modifierKey: string
+  modifierKey: ModifierKey
 ): boolean {
   // Note: Safari does not support getModifierState on MouseEvent, see:
   // https://github.com/krassowski/jupyterlab-go-to-definition/issues/3
@@ -59,12 +67,19 @@ export function getModifierState(
     case 'Alt':
       value = event.altKey || key == 'Alt';
       break;
+    case 'AltGraph':
+      value = key == 'AltGraph';
+      break;
     case 'Control':
       value = event.ctrlKey || key == 'Control';
       break;
     case 'Meta':
       value = event.metaKey || key == 'Meta';
       break;
+    case 'Accel':
+      value =
+        event.metaKey || key == 'Meta' || event.ctrlKey || key == 'Control';
+      break;
   }
 
   if (event.getModifierState !== undefined) {