From 205a89c52346cc73e36d8564eba9e2d0fc74476a Mon Sep 17 00:00:00 2001 From: Alex Dima Date: Tue, 12 Oct 2021 15:17:46 +0200 Subject: [PATCH] Remove workaround for #108880 --- .../services/keybinding/common/macLinuxKeyboardMapper.ts | 6 ------ .../services/keybinding/test/electron-browser/mac_de_ch.txt | 4 ++-- .../services/keybinding/test/electron-browser/mac_en_us.txt | 4 ++-- 3 files changed, 4 insertions(+), 10 deletions(-) diff --git a/src/vs/workbench/services/keybinding/common/macLinuxKeyboardMapper.ts b/src/vs/workbench/services/keybinding/common/macLinuxKeyboardMapper.ts index 941d1308e98..29a435956ce 100644 --- a/src/vs/workbench/services/keybinding/common/macLinuxKeyboardMapper.ts +++ b/src/vs/workbench/services/keybinding/common/macLinuxKeyboardMapper.ts @@ -885,12 +885,6 @@ export class MacLinuxKeyboardMapper implements IKeyboardMapper { // Check if this scanCode always maps to the same keyCode and back const constantKeyCode: KeyCode = this._scanCodeKeyCodeMapper.guessStableKeyCode(binding.scanCode); - // See https://github.com/microsoft/vscode/issues/108880 - if (this._OS === OperatingSystem.Macintosh && binding.ctrlKey && !binding.metaKey && !binding.altKey && constantKeyCode === KeyCode.US_MINUS) { - // ctrl+- and ctrl+shift+- render very similarly in native macOS menus, leading to confusion - return null; - } - if (constantKeyCode !== KeyCode.DependsOnKbLayout) { return KeyCodeUtils.toElectronAccelerator(constantKeyCode); } diff --git a/src/vs/workbench/services/keybinding/test/electron-browser/mac_de_ch.txt b/src/vs/workbench/services/keybinding/test/electron-browser/mac_de_ch.txt index 34044cdc5b5..973d6a28603 100644 --- a/src/vs/workbench/services/keybinding/test/electron-browser/mac_de_ch.txt +++ b/src/vs/workbench/services/keybinding/test/electron-browser/mac_de_ch.txt @@ -470,9 +470,9 @@ isUSStandard: false | Ctrl+Shift+Alt+Period | ÷ | Ctrl+Shift+Alt+; | | Ctrl+Shift+Alt+. | ctrl+shift+alt+[Period] | null | ctrl+shift+alt+[Period] | NO | ---------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------- | Slash | - | - | | - | - | - | [Slash] | | -| Ctrl+Slash | - | Ctrl+- | | Ctrl+- | ctrl+- | null | ctrl+[Slash] | | +| Ctrl+Slash | - | Ctrl+- | | Ctrl+- | ctrl+- | Ctrl+- | ctrl+[Slash] | | | Shift+Slash | _ | Shift+- | | Shift+- | shift+- | Shift+- | shift+[Slash] | | -| Ctrl+Shift+Slash | _ | Ctrl+Shift+- | | Ctrl+Shift+- | ctrl+shift+- | null | ctrl+shift+[Slash] | | +| Ctrl+Shift+Slash | _ | Ctrl+Shift+- | | Ctrl+Shift+- | ctrl+shift+- | Ctrl+Shift+- | ctrl+shift+[Slash] | | | Alt+Slash | - | Alt+- | | Alt+- | alt+- | Alt+- | alt+[Slash] | | | Ctrl+Alt+Slash | – | Ctrl+Alt+- | | Ctrl+Alt+- | ctrl+alt+- | Ctrl+Alt+- | ctrl+alt+[Slash] | | | Shift+Alt+Slash | _ | Shift+Alt+- | | Shift+Alt+- | shift+alt+- | Shift+Alt+- | shift+alt+[Slash] | | diff --git a/src/vs/workbench/services/keybinding/test/electron-browser/mac_en_us.txt b/src/vs/workbench/services/keybinding/test/electron-browser/mac_en_us.txt index 5881abce1cf..7a83477293f 100644 --- a/src/vs/workbench/services/keybinding/test/electron-browser/mac_en_us.txt +++ b/src/vs/workbench/services/keybinding/test/electron-browser/mac_en_us.txt @@ -345,9 +345,9 @@ isUSStandard: true | HW Code combination | Key | KeyCode combination | Pri | UI label | User settings | Electron accelerator | Dispatching string | WYSIWYG | ---------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------- | Minus | - | - | | - | - | - | [Minus] | | -| Ctrl+Minus | - | Ctrl+- | | Ctrl+- | ctrl+- | null | ctrl+[Minus] | | +| Ctrl+Minus | - | Ctrl+- | | Ctrl+- | ctrl+- | Ctrl+- | ctrl+[Minus] | | | Shift+Minus | _ | Shift+- | | Shift+- | shift+- | Shift+- | shift+[Minus] | | -| Ctrl+Shift+Minus | _ | Ctrl+Shift+- | | Ctrl+Shift+- | ctrl+shift+- | null | ctrl+shift+[Minus] | | +| Ctrl+Shift+Minus | _ | Ctrl+Shift+- | | Ctrl+Shift+- | ctrl+shift+- | Ctrl+Shift+- | ctrl+shift+[Minus] | | | Alt+Minus | - | Alt+- | | Alt+- | alt+- | Alt+- | alt+[Minus] | | | Ctrl+Alt+Minus | – | Ctrl+Alt+- | | Ctrl+Alt+- | ctrl+alt+- | Ctrl+Alt+- | ctrl+alt+[Minus] | | | Shift+Alt+Minus | _ | Shift+Alt+- | | Shift+Alt+- | shift+alt+- | Shift+Alt+- | shift+alt+[Minus] | |