Merge pull request #285416 from microsoft/dev/dmitriv/diff-peek-focus-toggle

Enable `togglePeekWidgetFocus` command for quick diff pick view

Author: dmitrivMS

src/vs/workbench/contrib/scm/browser/quickDiffWidget.ts

@@ -47,7 +47,7 @@ import { ThemeIcon } from '../../../../base/common/themables.js';
 import { gotoNextLocation, gotoPreviousLocation } from '../../../../platform/theme/common/iconRegistry.js';
 import { Codicon } from '../../../../base/common/codicons.js';
 import { Color } from '../../../../base/common/color.js';
-import { KeyCode, KeyMod } from '../../../../base/common/keyCodes.js';
+import { KeyChord, KeyCode, KeyMod } from '../../../../base/common/keyCodes.js';
 import { getOuterEditor } from '../../../../editor/browser/widget/codeEditor/embeddedCodeEditorWidget.js';
 import { quickDiffDecorationCount } from './quickDiffDecorator.js';
 import { hasNativeContextMenu } from '../../../../platform/window/common/window.js';
@@ -464,6 +464,14 @@ class QuickDiffWidget extends PeekViewWidget {
 		return this.diffEditor.hasTextFocus();
 	}
 
+	toggleFocus(): void {
+		if (this.diffEditor.hasTextFocus()) {
+			this.editor.focus();
+		} else {
+			this.diffEditor.focus();
+		}
+	}
+
 	override dispose() {
 		this.dropdown?.dispose();
 		this.menu?.dispose();
@@ -547,6 +555,12 @@ export class QuickDiffEditorController extends Disposable implements IEditorCont
 		this.widget?.showChange(this.widget.index, false);
 	}
 
+	toggleFocus(): void {
+		if (this.widget) {
+			this.widget.toggleFocus();
+		}
+	}
+
 	next(lineNumber?: number): void {
 		if (!this.assertWidget()) {
 			return;
@@ -940,6 +954,26 @@ KeybindingsRegistry.registerCommandAndKeybindingRule({
 	}
 });
 
+KeybindingsRegistry.registerCommandAndKeybindingRule({
+	id: 'togglePeekWidgetFocus',
+	weight: KeybindingWeight.EditorContrib,
+	primary: KeyChord(KeyMod.CtrlCmd | KeyCode.KeyK, KeyCode.F2),
+	when: isQuickDiffVisible,
+	handler: (accessor: ServicesAccessor) => {
+		const outerEditor = getOuterEditorFromDiffEditor(accessor);
+		if (!outerEditor) {
+			return;
+		}
+
+		const controller = QuickDiffEditorController.get(outerEditor);
+		if (!controller) {
+			return;
+		}
+
+		controller.toggleFocus();
+	}
+});
+
 function setPositionAndSelection(change: IChange, editor: ICodeEditor, accessibilityService: IAccessibilityService, codeEditorService: ICodeEditorService) {
 	const position = new Position(change.modifiedStartLineNumber, 1);
 	editor.setPosition(position);