Skip to content

Commit f9737bd

Browse files
committed
Fix invalid regex in Firefox
1 parent f4af4af commit f9737bd

File tree

2 files changed

+15
-4
lines changed

2 files changed

+15
-4
lines changed

packages/vscode/src/fill/labels.ts

+5-4
Original file line numberDiff line numberDiff line change
@@ -1,10 +1,11 @@
11
import * as labels from "vs/base/common/labels";
22

3-
// Here we simply disable translation of mnemonics and leave everything as &&.
4-
// Since we're in the browser, we can handle all platforms in the same way.
3+
// Disable all mnemonics for now until we implement it.
54
const target = labels as typeof labels;
65
target.mnemonicMenuLabel = (label: string, forceDisable?: boolean): string => {
7-
return forceDisable ? label.replace(/\(&&\w\)|&&/g, "") : label;
6+
return label.replace(/\(&&\w\)|&&/g, "");
7+
};
8+
target.mnemonicButtonLabel = (label: string): string => {
9+
return label.replace(/\(&&\w\)|&&/g, "");
810
};
9-
target.mnemonicButtonLabel = (label: string): string => { return label; };
1011
target.unmnemonicLabel = (label: string): string => { return label; };

scripts/vscode.patch

+10
Original file line numberDiff line numberDiff line change
@@ -46,6 +46,16 @@ index cd7312809c..b1246de1ee 100644
4646
@@ -553 +553 @@ export class MouseController<T> implements IDisposable {
4747
- return platform.isMacintosh ? event.browserEvent.metaKey : event.browserEvent.ctrlKey;
4848
+ return browser.isMacintosh ? event.browserEvent.metaKey : event.browserEvent.ctrlKey;
49+
diff --git a/src/vs/base/browser/ui/menu/menu.ts b/src/vs/base/browser/ui/menu/menu.ts
50+
index 47da5e4277..fbf7e22aed 100644
51+
--- a/src/vs/base/browser/ui/menu/menu.ts
52+
+++ b/src/vs/base/browser/ui/menu/menu.ts
53+
@@ -23,2 +23,3 @@ import { isLinux } from 'vs/base/common/platform';
54+
-export const MENU_MNEMONIC_REGEX: RegExp = /\(&([^\s&])\)|(?<!&)&([^\s&])/;
55+
-export const MENU_ESCAPED_MNEMONIC_REGEX: RegExp = /(?<!&amp;)(?:&amp;)([^\s&])/;
56+
+// Not all browsers support negative lookbehinds. We don't support mnemonics currently anyway.
57+
+export const MENU_MNEMONIC_REGEX: RegExp = /&([^\s&])/; ///\(&([^\s&])\)|(?<!&)&([^\s&])/;
58+
+export const MENU_ESCAPED_MNEMONIC_REGEX: RegExp = /&amp;([^\s&])/; // /(?<!&amp;)(?:&amp;)([^\s&])/;
4959
diff --git a/src/vs/base/browser/ui/sash/sash.ts b/src/vs/base/browser/ui/sash/sash.ts
5060
index 8c7168bad5..8bbea63b3b 100644
5161
--- a/src/vs/base/browser/ui/sash/sash.ts

0 commit comments

Comments
 (0)