Skip to content

Commit 8a6c086

Browse files
alexdimaalexdima
authored
Merge pull request microsoft#98815 from microsoft/lszomoru/screencast-label
Keybinding - Do not push an empty string to the result
2 parents 1cfe31d + 918bf38 commit 8a6c086

5 files changed

Lines changed: 37 additions & 32 deletions

File tree

‎src/vs/base/common/keybindingLabels.ts‎

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -182,7 +182,9 @@ function _simpleAsString(modifiers: Modifiers, key: string, labels: ModifierLabe
182182
}
183183

184184
// the actual key
185-
result.push(key);
185+
if (key !== '') {
186+
result.push(key);
187+
}
186188

187189
return result.join(labels.separator);
188190
}

‎src/vs/platform/keybinding/test/common/keybindingLabels.test.ts‎

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -167,4 +167,7 @@ suite('KeybindingLabels', () => {
167167
assertElectronAcceleratorLabel(OperatingSystem.Macintosh, KeyChord(KeyMod.CtrlCmd | KeyCode.KEY_A, KeyMod.CtrlCmd | KeyCode.KEY_B), 'cmd+a cmd+b');
168168
});
169169

170+
test('issue #91235: Do not end with a +', () => {
171+
assertUSLabel(OperatingSystem.Windows, KeyMod.CtrlCmd | KeyMod.Alt | KeyCode.Alt, 'Ctrl+Alt');
172+
});
170173
});

‎src/vs/workbench/services/keybinding/test/electron-browser/macLinuxFallbackKeyboardMapper.test.ts‎

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -107,9 +107,9 @@ suite('keyboardMapper - MAC fallback', () => {
107107
},
108108
{
109109
label: '⌘',
110-
ariaLabel: 'Command+',
110+
ariaLabel: 'Command',
111111
electronAccelerator: null,
112-
userSettingsLabel: 'cmd+',
112+
userSettingsLabel: 'cmd',
113113
isWYSIWYG: true,
114114
isChord: false,
115115
dispatchParts: [null],
@@ -228,10 +228,10 @@ suite('keyboardMapper - LINUX fallback', () => {
228228
code: null!
229229
},
230230
{
231-
label: 'Ctrl+',
232-
ariaLabel: 'Control+',
231+
label: 'Ctrl',
232+
ariaLabel: 'Control',
233233
electronAccelerator: null,
234-
userSettingsLabel: 'ctrl+',
234+
userSettingsLabel: 'ctrl',
235235
isWYSIWYG: true,
236236
isChord: false,
237237
dispatchParts: [null],

‎src/vs/workbench/services/keybinding/test/electron-browser/macLinuxKeyboardMapper.test.ts‎

Lines changed: 20 additions & 20 deletions
Original file line numberDiff line numberDiff line change
@@ -344,9 +344,9 @@ suite('keyboardMapper - MAC de_ch', () => {
344344
},
345345
{
346346
label: '⌘',
347-
ariaLabel: 'Command+',
347+
ariaLabel: 'Command',
348348
electronAccelerator: null,
349-
userSettingsLabel: 'cmd+',
349+
userSettingsLabel: 'cmd',
350350
isWYSIWYG: true,
351351
isChord: false,
352352
dispatchParts: [null],
@@ -368,9 +368,9 @@ suite('keyboardMapper - MAC de_ch', () => {
368368
},
369369
{
370370
label: '⌘',
371-
ariaLabel: 'Command+',
371+
ariaLabel: 'Command',
372372
electronAccelerator: null,
373-
userSettingsLabel: 'cmd+',
373+
userSettingsLabel: 'cmd',
374374
isWYSIWYG: true,
375375
isChord: false,
376376
dispatchParts: [null],
@@ -425,9 +425,9 @@ suite('keyboardMapper - MAC en_us', () => {
425425
},
426426
{
427427
label: '⌘',
428-
ariaLabel: 'Command+',
428+
ariaLabel: 'Command',
429429
electronAccelerator: null,
430-
userSettingsLabel: 'cmd+',
430+
userSettingsLabel: 'cmd',
431431
isWYSIWYG: true,
432432
isChord: false,
433433
dispatchParts: [null],
@@ -449,9 +449,9 @@ suite('keyboardMapper - MAC en_us', () => {
449449
},
450450
{
451451
label: '⌘',
452-
ariaLabel: 'Command+',
452+
ariaLabel: 'Command',
453453
electronAccelerator: null,
454-
userSettingsLabel: 'cmd+',
454+
userSettingsLabel: 'cmd',
455455
isWYSIWYG: true,
456456
isChord: false,
457457
dispatchParts: [null],
@@ -780,10 +780,10 @@ suite('keyboardMapper - LINUX de_ch', () => {
780780
code: 'ControlLeft'
781781
},
782782
{
783-
label: 'Ctrl+',
784-
ariaLabel: 'Control+',
783+
label: 'Ctrl',
784+
ariaLabel: 'Control',
785785
electronAccelerator: null,
786-
userSettingsLabel: 'ctrl+',
786+
userSettingsLabel: 'ctrl',
787787
isWYSIWYG: true,
788788
isChord: false,
789789
dispatchParts: [null],
@@ -804,10 +804,10 @@ suite('keyboardMapper - LINUX de_ch', () => {
804804
code: 'ControlRight'
805805
},
806806
{
807-
label: 'Ctrl+',
808-
ariaLabel: 'Control+',
807+
label: 'Ctrl',
808+
ariaLabel: 'Control',
809809
electronAccelerator: null,
810-
userSettingsLabel: 'ctrl+',
810+
userSettingsLabel: 'ctrl',
811811
isWYSIWYG: true,
812812
isChord: false,
813813
dispatchParts: [null],
@@ -1180,10 +1180,10 @@ suite('keyboardMapper - LINUX en_us', () => {
11801180
code: 'ControlLeft'
11811181
},
11821182
{
1183-
label: 'Ctrl+',
1184-
ariaLabel: 'Control+',
1183+
label: 'Ctrl',
1184+
ariaLabel: 'Control',
11851185
electronAccelerator: null,
1186-
userSettingsLabel: 'ctrl+',
1186+
userSettingsLabel: 'ctrl',
11871187
isWYSIWYG: true,
11881188
isChord: false,
11891189
dispatchParts: [null],
@@ -1204,10 +1204,10 @@ suite('keyboardMapper - LINUX en_us', () => {
12041204
code: 'ControlRight'
12051205
},
12061206
{
1207-
label: 'Ctrl+',
1208-
ariaLabel: 'Control+',
1207+
label: 'Ctrl',
1208+
ariaLabel: 'Control',
12091209
electronAccelerator: null,
1210-
userSettingsLabel: 'ctrl+',
1210+
userSettingsLabel: 'ctrl',
12111211
isWYSIWYG: true,
12121212
isChord: false,
12131213
dispatchParts: [null],

‎src/vs/workbench/services/keybinding/test/electron-browser/windowsKeyboardMapper.test.ts‎

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -308,10 +308,10 @@ suite('keyboardMapper - WINDOWS de_ch', () => {
308308
code: null!
309309
},
310310
{
311-
label: 'Ctrl+',
312-
ariaLabel: 'Control+',
311+
label: 'Ctrl',
312+
ariaLabel: 'Control',
313313
electronAccelerator: null,
314-
userSettingsLabel: 'ctrl+',
314+
userSettingsLabel: 'ctrl',
315315
isWYSIWYG: true,
316316
isChord: false,
317317
dispatchParts: [null],
@@ -396,10 +396,10 @@ suite('keyboardMapper - WINDOWS en_us', () => {
396396
code: null!
397397
},
398398
{
399-
label: 'Ctrl+',
400-
ariaLabel: 'Control+',
399+
label: 'Ctrl',
400+
ariaLabel: 'Control',
401401
electronAccelerator: null,
402-
userSettingsLabel: 'ctrl+',
402+
userSettingsLabel: 'ctrl',
403403
isWYSIWYG: true,
404404
isChord: false,
405405
dispatchParts: [null],

0 commit comments

Comments
 (0)