[keybinding] fix #6878: allow a user to change default keybindings

Signed-off-by: Anton Kosyakov <anton.kosyakov@typefox.io>
eclipse-theia · Jan 16, 2020 · bdd39e8 · bdd39e8
1 parent 193c85f
commit bdd39e8
Show file tree

Hide file tree

Showing 9 changed files with 219 additions and 446 deletions.
diff --git a/packages/core/src/browser/keybinding.ts b/packages/core/src/browser/keybinding.ts
@@ -38,35 +38,11 @@ export namespace KeybindingScope {
     export const length = KeybindingScope.END - KeybindingScope.DEFAULT;
 }
 
-export namespace Keybinding {
-
-    /**
-     * Returns with the string representation of the binding.
-     * Any additional properties which are not described on
-     * the `Keybinding` API will be ignored.
-     *
-     * @param binding the binding to stringify.
-     */
-    export function stringify(binding: Keybinding): string {
-        const copy: Keybinding = {
-            command: binding.command,
-            keybinding: binding.keybinding,
-            context: binding.context
-        };
-        return JSON.stringify(copy);
-    }
-
-    /* Determine whether object is a KeyBinding */
-    // tslint:disable-next-line:no-any
-    export function is(arg: Keybinding | any): arg is Keybinding {
-        return !!arg && arg === Object(arg) && 'command' in arg && 'keybinding' in arg;
-    }
-}
-
 /**
  * @deprecated import from `@theia/core/lib/common/keybinding` instead
  */
 export type Keybinding = common.Keybinding;
+export const Keybinding = common.Keybinding;
 
 export interface ResolvedKeybinding extends Keybinding {
     /**

diff --git a/packages/core/src/common/keybinding.ts b/packages/core/src/common/keybinding.ts
@@ -36,3 +36,29 @@ export interface Keybinding {
     // tslint:disable-next-line no-any
     args?: any;
 }
+export namespace Keybinding {
+
+    /**
+     * Returns with the string representation of the binding.
+     * Any additional properties which are not described on
+     * the `Keybinding` API will be ignored.
+     *
+     * @param binding the binding to stringify.
+     */
+    export function stringify(binding: Keybinding): string {
+        const copy: Keybinding = {
+            command: binding.command,
+            keybinding: binding.keybinding,
+            context: binding.context,
+            when: binding.when,
+            args: binding.args
+        };
+        return JSON.stringify(copy);
+    }
+
+    /* Determine whether object is a KeyBinding */
+    // tslint:disable-next-line:no-any
+    export function is(arg: Keybinding | any): arg is Keybinding {
+        return !!arg && arg === Object(arg) && 'command' in arg && 'keybinding' in arg;
+    }
+}