From 839d8b291c1dc9daec85f523fc8f1e8d516958b0 Mon Sep 17 00:00:00 2001 From: Sakshi Sharma <57200045+SakshiS-harma@users.noreply.github.com> Date: Thu, 7 Sep 2023 10:53:53 -0700 Subject: [PATCH] Fix F11 key binding (#24323) * Fix F11 key binding to non-debug mode * Disable F11 keybinding completely to toggle between full screen * Fix compile error --- src/vs/workbench/contrib/debug/browser/debugCommands.ts | 9 +++++---- 1 file changed, 5 insertions(+), 4 deletions(-) diff --git a/src/vs/workbench/contrib/debug/browser/debugCommands.ts b/src/vs/workbench/contrib/debug/browser/debugCommands.ts index b2dbcecd64..c4f0f73c1a 100644 --- a/src/vs/workbench/contrib/debug/browser/debugCommands.ts +++ b/src/vs/workbench/contrib/debug/browser/debugCommands.ts @@ -28,7 +28,7 @@ import { IConfigurationService } from 'vs/platform/configuration/common/configur import { IQuickInputService, IQuickPickItem } from 'vs/platform/quickinput/common/quickInput'; import { IViewsService, ViewContainerLocation } from 'vs/workbench/common/views'; import { deepClone } from 'vs/base/common/objects'; -import { isWeb, isWindows } from 'vs/base/common/platform'; +import { isWeb } from 'vs/base/common/platform'; import { saveAllBeforeDebugStart } from 'vs/workbench/contrib/debug/common/debugUtils'; import { IPaneCompositePartService } from 'vs/workbench/services/panecomposite/browser/panecomposite'; import { showLoadedScriptMenu } from 'vs/workbench/contrib/debug/common/loadedScriptsPicker'; @@ -487,7 +487,8 @@ KeybindingsRegistry.registerCommandAndKeybindingRule({ }); // Windows browsers use F11 for full screen, thus use alt+F11 as the default shortcut -const STEP_INTO_KEYBINDING = (isWeb && isWindows) ? (KeyMod.Alt | KeyCode.F11) : KeyCode.F11; +// {{SQL CARBON EDIT}} - Disable F11 binding to use it as shortcut for full screen in ADS +/*const STEP_INTO_KEYBINDING = (isWeb && isWindows) ? (KeyMod.Alt | KeyCode.F11) : KeyCode.F11; KeybindingsRegistry.registerCommandAndKeybindingRule({ id: STEP_INTO_ID, @@ -503,7 +504,7 @@ KeybindingsRegistry.registerCommandAndKeybindingRule({ await getThreadAndRun(accessor, context, (thread: IThread) => thread.stepIn()); } } -}); +});*/ KeybindingsRegistry.registerCommandAndKeybindingRule({ id: STEP_OUT_ID, @@ -533,7 +534,7 @@ KeybindingsRegistry.registerCommandAndKeybindingRule({ KeybindingsRegistry.registerCommandAndKeybindingRule({ id: STEP_INTO_TARGET_ID, - primary: STEP_INTO_KEYBINDING | KeyMod.CtrlCmd, + primary: KeyMod.CtrlCmd, // {{SQL CARBON EDIT}} - Remove STEP_INTO_KEYBINDING when: ContextKeyExpr.and(CONTEXT_STEP_INTO_TARGETS_SUPPORTED, CONTEXT_IN_DEBUG_MODE, CONTEXT_DEBUG_STATE.isEqualTo('stopped')), weight: KeybindingWeight.WorkbenchContrib, handler: async (accessor: ServicesAccessor, _: string, context: CallStackContext | unknown) => {