diff --git a/src/vs/code/electron-main/menus.ts b/src/vs/code/electron-main/menus.ts index c5c16a0650a0f5ef33136f93f89b204b6e2eeaea..619486409e6d31bc48ccd949363cc488bfaf8ba0 100644 --- a/src/vs/code/electron-main/menus.ts +++ b/src/vs/code/electron-main/menus.ts @@ -789,7 +789,7 @@ function __separator__(): Electron.MenuItem { function mnemonicLabel(label: string): string { if (platform.isMacintosh) { - return label.replace(/&&/g, ''); // no mnemonic support on mac + return label.replace(/\(&&\w\)|&&/g, ''); // no mnemonic support on mac/linux } return label.replace(/&&/g, '&'); diff --git a/src/vs/workbench/parts/files/electron-browser/textFileServices.ts b/src/vs/workbench/parts/files/electron-browser/textFileServices.ts index 7c62da4417bae9289776313483c79800b27c4c8a..7c619eb415d954b9523c1c216f4d57998c7247ae 100644 --- a/src/vs/workbench/parts/files/electron-browser/textFileServices.ts +++ b/src/vs/workbench/parts/files/electron-browser/textFileServices.ts @@ -217,7 +217,7 @@ export class TextFileService extends AbstractTextFileService { private mnemonicLabel(label: string): string { if (!isWindows) { - return label.replace(/&&/g, ''); // no mnemonic support on mac/linux in buttons yet + return label.replace(/\(&&\w\)|&&/g, ''); // no mnemonic support on mac/linux } return label.replace(/&&/g, '&'); diff --git a/src/vs/workbench/services/message/electron-browser/messageService.ts b/src/vs/workbench/services/message/electron-browser/messageService.ts index 475d3da764c1651f340a9dfdf5ac4b6b1d8cc899..252b65e018a255f7297f5f511be8c2ddc9270e3f 100644 --- a/src/vs/workbench/services/message/electron-browser/messageService.ts +++ b/src/vs/workbench/services/message/electron-browser/messageService.ts @@ -64,7 +64,7 @@ export class MessageService extends WorkbenchMessageService { private mnemonicLabel(label: string): string { if (!isWindows) { - return label.replace(/&&/g, ''); // no mnemonic support on mac/linux in buttons yet + return label.replace(/\(&&\w\)|&&/g, ''); // no mnemonic support on mac/linux } return label.replace(/&&/g, '&');