Fixes #28576: Add support for BrowserBack and BrowserForward

microsoft · Oct 18, 2021 · 438c92c · 438c92c
1 parent 53e1748
commit 438c92c
Show file tree

Hide file tree

Showing 6 changed files with 19 additions and 6 deletions.
diff --git a/src/vs/base/browser/keyboardEvent.ts b/src/vs/base/browser/keyboardEvent.ts
@@ -122,6 +122,9 @@ let INVERSE_KEY_CODE_MAP: KeyCode[] = new Array(KeyCode.MAX_VALUE);
 	define(144, KeyCode.NumLock);
 	define(145, KeyCode.ScrollLock);
 
+	define(166, KeyCode.BrowserBack);
+	define(167, KeyCode.BrowserForward);
+
 	define(186, KeyCode.US_SEMICOLON);
 	define(187, KeyCode.US_EQUAL);
 	define(188, KeyCode.US_COMMA);

diff --git a/src/vs/base/common/keyCodes.ts b/src/vs/base/common/keyCodes.ts
@@ -194,6 +194,9 @@ export const enum KeyCode {
 	ABNT_C1 = 110, // Brazilian (ABNT) Keyboard
 	ABNT_C2 = 111, // Brazilian (ABNT) Keyboard
 
+	BrowserBack = 112, // BrowserBack
+	BrowserForward = 113, // BrowserBack
+
 	/**
 	 * Placed last to cover the length of the enum.
 	 * Please do not depend on this value!
@@ -359,6 +362,9 @@ const userSettingsGeneralMap = new KeyCodeStrMap();
 	define(KeyCode.NUMPAD_DECIMAL, 'NumPad_Decimal');
 	define(KeyCode.NUMPAD_DIVIDE, 'NumPad_Divide');
 
+	define(KeyCode.BrowserBack, 'BrowserBack');
+	define(KeyCode.BrowserForward, 'BrowserForward');
+
 })();
 
 export namespace KeyCodeUtils {

diff --git a/src/vs/base/common/scanCode.ts b/src/vs/base/common/scanCode.ts
@@ -678,8 +678,8 @@ export class ScanCodeBinding implements IBaseKeybinding {
 	define(ScanCode.LaunchScreenSaver, KeyCode.Unknown);
 	define(ScanCode.BrowserSearch, KeyCode.Unknown);
 	define(ScanCode.BrowserHome, KeyCode.Unknown);
-	define(ScanCode.BrowserBack, KeyCode.Unknown);
-	define(ScanCode.BrowserForward, KeyCode.Unknown);
+	define(ScanCode.BrowserBack, KeyCode.BrowserBack);
+	define(ScanCode.BrowserForward, KeyCode.BrowserForward);
 	define(ScanCode.BrowserStop, KeyCode.Unknown);
 	define(ScanCode.BrowserRefresh, KeyCode.Unknown);
 	define(ScanCode.BrowserFavorites, KeyCode.Unknown);

diff --git a/src/vs/editor/common/standalone/standaloneEnums.ts b/src/vs/editor/common/standalone/standaloneEnums.ts
@@ -553,11 +553,13 @@ export enum KeyCode {
 	KEY_IN_COMPOSITION = 109,
 	ABNT_C1 = 110,
 	ABNT_C2 = 111,
+	BrowserBack = 112,
+	BrowserForward = 113,
 	/**
 	 * Placed last to cover the length of the enum.
 	 * Please do not depend on this value!
 	 */
-	MAX_VALUE = 112
+	MAX_VALUE = 114
 }
 
 export enum MarkerSeverity {

diff --git a/src/vs/monaco.d.ts b/src/vs/monaco.d.ts
@@ -391,11 +391,13 @@ declare namespace monaco {
 		KEY_IN_COMPOSITION = 109,
 		ABNT_C1 = 110,
 		ABNT_C2 = 111,
+		BrowserBack = 112,
+		BrowserForward = 113,
 		/**
 		 * Placed last to cover the length of the enum.
 		 * Please do not depend on this value!
 		 */
-		MAX_VALUE = 112
+		MAX_VALUE = 114
 	}
 	export class KeyMod {
 		static readonly CtrlCmd: number;

diff --git a/src/vs/workbench/services/keybinding/common/windowsKeyboardMapper.ts b/src/vs/workbench/services/keybinding/common/windowsKeyboardMapper.ts
@@ -583,8 +583,8 @@ function _getNativeMap() {
 		VK_RCONTROL: KeyCode.Ctrl,
 		VK_LMENU: KeyCode.Unknown, // MISSING
 		VK_RMENU: KeyCode.Unknown, // MISSING
-		VK_BROWSER_BACK: KeyCode.Unknown, // MISSING
-		VK_BROWSER_FORWARD: KeyCode.Unknown, // MISSING
+		VK_BROWSER_BACK: KeyCode.BrowserBack,
+		VK_BROWSER_FORWARD: KeyCode.BrowserForward,
 		VK_BROWSER_REFRESH: KeyCode.Unknown, // MISSING
 		VK_BROWSER_STOP: KeyCode.Unknown, // MISSING
 		VK_BROWSER_SEARCH: KeyCode.Unknown, // MISSING