npm - @theia/core - Versions diffs - 1.72.0-next.2 → 1.72.0-next.5 - Mend

@theia/core 1.72.0-next.2 → 1.72.0-next.5

This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.

Files changed (9) hide show

package/lib/browser/keybinding.d.ts +3 -1
package/lib/browser/keybinding.d.ts.map +1 -1
package/lib/browser/keybinding.js +5 -2
package/lib/browser/keybinding.js.map +1 -1
package/lib/browser/keybinding.spec.js +19 -0
package/lib/browser/keybinding.spec.js.map +1 -1
package/package.json +4 -4
package/src/browser/keybinding.spec.ts +24 -0
package/src/browser/keybinding.ts +5 -2

package/lib/browser/keybinding.d.ts CHANGED Viewed

@@ -184,7 +184,9 @@ export declare class KeybindingRegistry {
      * Get a user visible representation of a key code (a key with modifiers).
      * @returns a string representing the {@link KeyCode}
      * @param keyCode the keycode
-     * @param separator the separator used to separate keys (key and modifiers) in the returning string
+     * @param separator the separator used to separate keys (key and modifiers) in the returning string.
+     * Ignored when rendering macOS symbols (i.e. on macOS with `asciiOnly=false`), as the convention is
+     * to juxtapose modifier symbols without a separator (e.g. `⌃⌘V`).
      * @param asciiOnly if `true`, no special characters will be substituted into the string returned. Ensures correct keyboard shortcuts in Electron menus.
      */
     acceleratorForKeyCode(keyCode: KeyCode, separator?: string, asciiOnly?: boolean): string;

package/lib/browser/keybinding.d.ts.map CHANGED Viewed

	@@ -1 +1 @@
1	- {"version":3,"file":"keybinding.d.ts","sourceRoot":"","sources":["../../src/browser/keybinding.ts"],"names":[],"mappings":"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~~;;;;;;OAMG~~;IACH,qBAAqB,CAAC,OAAO,EAAE,OAAO,EAAE,SAAS,GAAE,MAAY,EAAE,SAAS,UAAQ,GAAG,MAAM;~~IAI3F~~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"}
1	+ {"version":3,"file":"keybinding.d.ts","sourceRoot":"","sources":["../../src/browser/keybinding.ts"],"names":[],"mappings":"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"}

package/lib/browser/keybinding.js CHANGED Viewed

@@ -298,11 +298,14 @@ let KeybindingRegistry = class KeybindingRegistry {
      * Get a user visible representation of a key code (a key with modifiers).
      * @returns a string representing the {@link KeyCode}
      * @param keyCode the keycode
-     * @param separator the separator used to separate keys (key and modifiers) in the returning string
+     * @param separator the separator used to separate keys (key and modifiers) in the returning string.
+     * Ignored when rendering macOS symbols (i.e. on macOS with `asciiOnly=false`), as the convention is
+     * to juxtapose modifier symbols without a separator (e.g. `⌃⌘V`).
      * @param asciiOnly if `true`, no special characters will be substituted into the string returned. Ensures correct keyboard shortcuts in Electron menus.
      */
     acceleratorForKeyCode(keyCode, separator = ' ', asciiOnly = false) {
-        return this.componentsForKeyCode(keyCode, asciiOnly).join(separator);
+        const useSymbols = os_1.isOSX && !asciiOnly;
+        return this.componentsForKeyCode(keyCode, asciiOnly).join(useSymbols ? '' : separator);
     }
     componentsForKeyCode(keyCode, asciiOnly = false) {
         const keyCodeResult = [];

package/lib/browser/keybinding.js.map CHANGED Viewed

	@@ -1 +1 @@
1	- {"version":3,"file":"keybinding.js","sourceRoot":"","sources":["../../src/browser/keybinding.ts"],"names":[],"mappings":"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"}
1	+ {"version":3,"file":"keybinding.js","sourceRoot":"","sources":["../../src/browser/keybinding.ts"],"names":[],"mappings":"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"}

package/lib/browser/keybinding.spec.js CHANGED Viewed

@@ -449,6 +449,25 @@ describe('keybindings', () => {
         disable();
     });
 });
+describe('acceleratorForKeyCode', () => {
+    const ctrlV = keys_1.KeyCode.createKeyCode({ key: keys_1.Key.KEY_V, ctrl: true });
+    const metaV = keys_1.KeyCode.createKeyCode({ key: keys_1.Key.KEY_V, meta: true });
+    it('uses ASCII names with the separator on non-macOS', () => {
+        stub.value(false);
+        const accelerator = keybindingRegistry.acceleratorForKeyCode(ctrlV, '+');
+        expect(accelerator).to.equal('Ctrl+V');
+    });
+    it('uses macOS symbols without a separator on macOS browser', () => {
+        stub.value(true);
+        const accelerator = keybindingRegistry.acceleratorForKeyCode(metaV, '+');
+        expect(accelerator).to.equal('⌘V');
+    });
+    it('uses ASCII names with the separator on macOS Electron (asciiOnly)', () => {
+        stub.value(true);
+        const accelerator = keybindingRegistry.acceleratorForKeyCode(metaV, '+', true);
+        expect(accelerator).to.equal('Cmd+V');
+    });
+});
 const TEST_COMMAND = {
     id: 'test.command'
 };

package/lib/browser/keybinding.spec.js.map CHANGED Viewed

	@@ -1 +1 @@
1	- {"version":3,"file":"keybinding.spec.js","sourceRoot":"","sources":["../../src/browser/keybinding.spec.ts"],"names":[],"mappings":"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"}
1	+ {"version":3,"file":"keybinding.spec.js","sourceRoot":"","sources":["../../src/browser/keybinding.spec.ts"],"names":[],"mappings":"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"}

package/package.json CHANGED Viewed

@@ -1,6 +1,6 @@
 {
   "name": "@theia/core",
-  "version": "1.72.0-next.2+c6615252d",
+  "version": "1.72.0-next.5+b7e4c26e2",
   "description": "Theia is a cloud & desktop IDE framework implemented in TypeScript.",
   "main": "lib/common/index.js",
   "typings": "lib/common/index.d.ts",
@@ -17,8 +17,8 @@
     "@lumino/virtualdom": "^2.0.4",
     "@lumino/widgets": "2.7.5",
     "@parcel/watcher": "^2.5.6",
-    "@theia/application-package": "1.72.0-next.2+c6615252d",
-    "@theia/request": "1.72.0-next.2+c6615252d",
+    "@theia/application-package": "1.72.0-next.5+b7e4c26e2",
+    "@theia/request": "1.72.0-next.5+b7e4c26e2",
     "@types/body-parser": "^1.19.6",
     "@types/express": "^4.17.21",
     "@types/fs-extra": "^4.0.2",
@@ -221,5 +221,5 @@
   "nyc": {
     "extends": "../../configs/nyc.json"
   },
-  "gitHead": "c6615252d35303058e0bde98e8a3ca56b5efcd82"
+  "gitHead": "b7e4c26e21017756fe8bc06e8e77998477da3443"
 }

package/src/browser/keybinding.spec.ts CHANGED Viewed

@@ -576,6 +576,30 @@ describe('keybindings', () => {
     });
 });
+describe('acceleratorForKeyCode', () => {
+    const ctrlV = KeyCode.createKeyCode({ key: Key.KEY_V, ctrl: true });
+    const metaV = KeyCode.createKeyCode({ key: Key.KEY_V, meta: true });
+    it('uses ASCII names with the separator on non-macOS', () => {
+        stub.value(false);
+        const accelerator = keybindingRegistry.acceleratorForKeyCode(ctrlV, '+');
+        expect(accelerator).to.equal('Ctrl+V');
+    });
+    it('uses macOS symbols without a separator on macOS browser', () => {
+        stub.value(true);
+        const accelerator = keybindingRegistry.acceleratorForKeyCode(metaV, '+');
+        expect(accelerator).to.equal('⌘V');
+    });
+    it('uses ASCII names with the separator on macOS Electron (asciiOnly)', () => {
+        stub.value(true);
+        const accelerator = keybindingRegistry.acceleratorForKeyCode(metaV, '+', true);
+        expect(accelerator).to.equal('Cmd+V');
+    });
+});
 const TEST_COMMAND: Command = {
     id: 'test.command'
 };

package/src/browser/keybinding.ts CHANGED Viewed

@@ -399,11 +399,14 @@ export class KeybindingRegistry {
      * Get a user visible representation of a key code (a key with modifiers).
      * @returns a string representing the {@link KeyCode}
      * @param keyCode the keycode
-     * @param separator the separator used to separate keys (key and modifiers) in the returning string
+     * @param separator the separator used to separate keys (key and modifiers) in the returning string.
+     * Ignored when rendering macOS symbols (i.e. on macOS with `asciiOnly=false`), as the convention is
+     * to juxtapose modifier symbols without a separator (e.g. `⌃⌘V`).
      * @param asciiOnly if `true`, no special characters will be substituted into the string returned. Ensures correct keyboard shortcuts in Electron menus.
      */
     acceleratorForKeyCode(keyCode: KeyCode, separator: string = ' ', asciiOnly = false): string {
-        return this.componentsForKeyCode(keyCode, asciiOnly).join(separator);
+        const useSymbols = isOSX && !asciiOnly;
+        return this.componentsForKeyCode(keyCode, asciiOnly).join(useSymbols ? '' : separator);
     }
     componentsForKeyCode(keyCode: KeyCode, asciiOnly = false): string[] {