Hover on keyboard modifier should trigger instantly

src/vs/editor/contrib/hover/browser/contentHoverController.ts

@@ -17,7 +17,7 @@ import { IKeybindingService } from '../../../../platform/keybinding/common/keybi
 import { ResultKind } from '../../../../platform/keybinding/common/keybindingResolver.js';
 import { HoverVerbosityAction } from '../../../common/languages.js';
 import { RunOnceScheduler } from '../../../../base/common/async.js';
-import { isMousePositionWithinElement, shouldShowHover } from './hoverUtils.js';
+import { isMousePositionWithinElement, shouldShowHover, isTriggerModifierPressed } from './hoverUtils.js';
 import { ContentHoverWidgetWrapper } from './contentHoverWidgetWrapper.js';
 import './hover.css';
 import { Emitter } from '../../../../base/common/event.js';
@@ -266,12 +266,19 @@ export class ContentHoverController extends Disposable implements IEditorContrib
 	}
 
 	private _onKeyDown(e: IKeyboardEvent): void {
-		if (this._ignoreMouseEvents) {
+		if (this._ignoreMouseEvents || !this._contentWidget) {
 			return;
 		}
-		if (!this._contentWidget) {
+
+		if (this._hoverSettings.enabled === 'onKeyboardModifier'
+			&& isTriggerModifierPressed(this._editor.getOption(EditorOption.multiCursorModifier), e)
+			&& this._mouseMoveEvent) {
+			if (!this._contentWidget.isVisible) {
+				this._contentWidget.showsOrWillShow(this._mouseMoveEvent);
+			}
 			return;
 		}
+
 		const isPotentialKeyboardShortcut = this._isPotentialKeyboardShortcut(e);
 		const isModifierKeyPressed = isModifierKey(e.keyCode);
 		if (isPotentialKeyboardShortcut || isModifierKeyPressed) {

src/vs/editor/contrib/hover/browser/glyphHoverController.ts

@@ -12,7 +12,7 @@ import { IEditorContribution, IScrollEvent } from '../../../common/editorCommon.
 import { IInstantiationService } from '../../../../platform/instantiation/common/instantiation.js';
 import { IHoverWidget } from './hoverTypes.js';
 import { RunOnceScheduler } from '../../../../base/common/async.js';
-import { isMousePositionWithinElement, shouldShowHover } from './hoverUtils.js';
+import { isMousePositionWithinElement, isTriggerModifierPressed, shouldShowHover } from './hoverUtils.js';
 import './hover.css';
 import { GlyphHoverWidget } from './glyphHoverWidget.js';
 
@@ -206,6 +206,14 @@ export class GlyphHoverController extends Disposable implements IEditorContribut
 		if (!this._editor.hasModel()) {
 			return;
 		}
+
+		if (this._hoverSettings.enabled === 'onKeyboardModifier'
+			&& isTriggerModifierPressed(this._editor.getOption(EditorOption.multiCursorModifier), e)
+			&& this._mouseMoveEvent) {
+			this._tryShowHoverWidget(this._mouseMoveEvent);
+			return;
+		}
+
 		if (isModifierKey(e.keyCode)) {
 			// Do not hide hover when a modifier key is pressed
 			return;

src/vs/editor/contrib/hover/browser/hoverUtils.ts

@@ -37,9 +37,19 @@ export function shouldShowHover(
 	if (hoverEnabled === 'off') {
 		return false;
 	}
+	return isTriggerModifierPressed(multiCursorModifier, mouseEvent.event);
+}
+
+/**
+ * Returns true if the trigger modifier (inverse of multi-cursor modifier) is pressed.
+ * This works with both mouse and keyboard events by relying only on the modifier flags.
+ */
+export function isTriggerModifierPressed(
+	multiCursorModifier: 'altKey' | 'ctrlKey' | 'metaKey',
+	event: { ctrlKey: boolean; metaKey: boolean; altKey: boolean }
+): boolean {
 	if (multiCursorModifier === 'altKey') {
-		return mouseEvent.event.ctrlKey || mouseEvent.event.metaKey;
-	} else {
-		return mouseEvent.event.altKey;
+		return event.ctrlKey || event.metaKey;
 	}
+	return event.altKey; // multiCursorModifier is ctrlKey or metaKey
 }

src/vs/editor/contrib/hover/test/browser/hoverUtils.test.ts

@@ -5,7 +5,7 @@
 
 import assert from 'assert';
 import { ensureNoDisposablesAreLeakedInTestSuite } from '../../../../../base/test/common/utils.js';
-import { shouldShowHover } from '../../browser/hoverUtils.js';
+import { isMousePositionWithinElement, isTriggerModifierPressed, shouldShowHover } from '../../browser/hoverUtils.js';
 import { IEditorMouseEvent } from '../../../../browser/editorBrowser.js';
 
 suite('Hover Utils', () => {
@@ -85,4 +85,140 @@ suite('Hover Utils', () => {
 			assert.strictEqual(result, false);
 		});
 	});
+
+	suite('isMousePositionWithinElement', () => {
+
+		function createMockElement(left: number, top: number, width: number, height: number): HTMLElement {
+			const element = document.createElement('div');
+			// Mock getDomNodePagePosition by setting up the element's bounding rect
+			element.getBoundingClientRect = () => ({
+				left,
+				top,
+				width,
+				height,
+				right: left + width,
+				bottom: top + height,
+				x: left,
+				y: top,
+				toJSON: () => { }
+			});
+			return element;
+		}
+
+		test('returns true when mouse is inside element bounds', () => {
+			const element = createMockElement(100, 100, 200, 100);
+			assert.strictEqual(isMousePositionWithinElement(element, 150, 150), true);
+			assert.strictEqual(isMousePositionWithinElement(element, 200, 150), true);
+			assert.strictEqual(isMousePositionWithinElement(element, 250, 180), true);
+		});
+
+		test('returns true when mouse is on element edges', () => {
+			const element = createMockElement(100, 100, 200, 100);
+			assert.strictEqual(isMousePositionWithinElement(element, 100, 100), true); // top-left corner
+			assert.strictEqual(isMousePositionWithinElement(element, 300, 100), true); // top-right corner
+			assert.strictEqual(isMousePositionWithinElement(element, 100, 200), true); // bottom-left corner
+			assert.strictEqual(isMousePositionWithinElement(element, 300, 200), true); // bottom-right corner
+		});
+
+		test('returns false when mouse is left of element', () => {
+			const element = createMockElement(100, 100, 200, 100);
+			assert.strictEqual(isMousePositionWithinElement(element, 99, 150), false);
+			assert.strictEqual(isMousePositionWithinElement(element, 50, 150), false);
+		});
+
+		test('returns false when mouse is right of element', () => {
+			const element = createMockElement(100, 100, 200, 100);
+			assert.strictEqual(isMousePositionWithinElement(element, 301, 150), false);
+			assert.strictEqual(isMousePositionWithinElement(element, 400, 150), false);
+		});
+
+		test('returns false when mouse is above element', () => {
+			const element = createMockElement(100, 100, 200, 100);
+			assert.strictEqual(isMousePositionWithinElement(element, 200, 99), false);
+			assert.strictEqual(isMousePositionWithinElement(element, 200, 50), false);
+		});
+
+		test('returns false when mouse is below element', () => {
+			const element = createMockElement(100, 100, 200, 100);
+			assert.strictEqual(isMousePositionWithinElement(element, 200, 201), false);
+			assert.strictEqual(isMousePositionWithinElement(element, 200, 300), false);
+		});
+
+		test('handles element at origin (0,0)', () => {
+			const element = createMockElement(0, 0, 100, 100);
+			assert.strictEqual(isMousePositionWithinElement(element, 0, 0), true);
+			assert.strictEqual(isMousePositionWithinElement(element, 50, 50), true);
+			assert.strictEqual(isMousePositionWithinElement(element, 100, 100), true);
+			assert.strictEqual(isMousePositionWithinElement(element, 101, 101), false);
+		});
+
+		test('handles small elements (1x1)', () => {
+			const element = createMockElement(100, 100, 1, 1);
+			assert.strictEqual(isMousePositionWithinElement(element, 100, 100), true);
+			assert.strictEqual(isMousePositionWithinElement(element, 101, 101), true);
+			assert.strictEqual(isMousePositionWithinElement(element, 102, 102), false);
+		});
+	});
+
+	suite('isTriggerModifierPressed', () => {
+
+		function createModifierEvent(ctrlKey: boolean, altKey: boolean, metaKey: boolean) {
+			return { ctrlKey, altKey, metaKey };
+		}
+
+		test('returns true with ctrl pressed when multiCursorModifier is altKey', () => {
+			const event = createModifierEvent(true, false, false);
+			assert.strictEqual(isTriggerModifierPressed('altKey', event), true);
+		});
+
+		test('returns true with metaKey pressed when multiCursorModifier is altKey', () => {
+			const event = createModifierEvent(false, false, true);
+			assert.strictEqual(isTriggerModifierPressed('altKey', event), true);
+		});
+
+		test('returns true with both ctrl and metaKey pressed when multiCursorModifier is altKey', () => {
+			const event = createModifierEvent(true, false, true);
+			assert.strictEqual(isTriggerModifierPressed('altKey', event), true);
+		});
+
+		test('returns false without ctrl or metaKey when multiCursorModifier is altKey', () => {
+			const event = createModifierEvent(false, false, false);
+			assert.strictEqual(isTriggerModifierPressed('altKey', event), false);
+		});
+
+		test('returns false with alt pressed when multiCursorModifier is altKey', () => {
+			const event = createModifierEvent(false, true, false);
+			assert.strictEqual(isTriggerModifierPressed('altKey', event), false);
+		});
+
+		test('returns true with alt pressed when multiCursorModifier is ctrlKey', () => {
+			const event = createModifierEvent(false, true, false);
+			assert.strictEqual(isTriggerModifierPressed('ctrlKey', event), true);
+		});
+
+		test('returns false without alt pressed when multiCursorModifier is ctrlKey', () => {
+			const event = createModifierEvent(false, false, false);
+			assert.strictEqual(isTriggerModifierPressed('ctrlKey', event), false);
+		});
+
+		test('returns false with ctrl pressed when multiCursorModifier is ctrlKey', () => {
+			const event = createModifierEvent(true, false, false);
+			assert.strictEqual(isTriggerModifierPressed('ctrlKey', event), false);
+		});
+
+		test('returns true with alt pressed when multiCursorModifier is metaKey', () => {
+			const event = createModifierEvent(false, true, false);
+			assert.strictEqual(isTriggerModifierPressed('metaKey', event), true);
+		});
+
+		test('returns false without alt pressed when multiCursorModifier is metaKey', () => {
+			const event = createModifierEvent(false, false, false);
+			assert.strictEqual(isTriggerModifierPressed('metaKey', event), false);
+		});
+
+		test('returns false with metaKey pressed when multiCursorModifier is metaKey', () => {
+			const event = createModifierEvent(false, false, true);
+			assert.strictEqual(isTriggerModifierPressed('metaKey', event), false);
+		});
+	});
 });