Ignore mouse events when context menu is shown (microsoft#254864)

ignore mouse events when context menu is shown

Author: aiday-mar

src/vs/editor/contrib/contextmenu/browser/contextmenu.ts

@@ -196,14 +196,6 @@ export class ContextMenuController implements IEditorContribution {
 			return;
 		}
 
-		// Disable hover
-		const oldHoverSetting = this._editor.getOption(EditorOption.hover);
-		this._editor.updateOptions({
-			hover: {
-				enabled: false
-			}
-		});
-
 		let anchor: IMouseEvent | IAnchor | null = event;
 		if (!anchor) {
 			// Ensure selection is visible
@@ -251,9 +243,6 @@ export class ContextMenuController implements IEditorContribution {
 
 			onHide: (wasCancelled: boolean) => {
 				this._contextMenuIsBeingShownCount--;
-				this._editor.updateOptions({
-					hover: oldHoverSetting
-				});
 			}
 		});
 	}

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

@@ -23,6 +23,7 @@ import './hover.css';
 import { Emitter } from '../../../../base/common/event.js';
 import { isOnColorDecorator } from '../../colorPicker/browser/hoverColorPicker/hoverColorPicker.js';
 import { KeyCode } from '../../../../base/common/keyCodes.js';
+import { IContextMenuService } from '../../../../platform/contextview/browser/contextView.js';
 
 // sticky hover widget which doesn't disappear on focus out and such
 const _sticky = false
@@ -54,8 +55,11 @@ export class ContentHoverController extends Disposable implements IEditorContrib
 	private _hoverSettings!: IHoverSettings;
 	private _isMouseDown: boolean = false;
 
+	private _ignoreMouseEvents: boolean = false;
+
 	constructor(
 		private readonly _editor: ICodeEditor,
+		@IContextMenuService _contextMenuService: IContextMenuService,
 		@IInstantiationService private readonly _instantiationService: IInstantiationService,
 		@IKeybindingService private readonly _keybindingService: IKeybindingService
 	) {
@@ -67,6 +71,13 @@ export class ContentHoverController extends Disposable implements IEditorContrib
 				}
 			}, 0
 		));
+		this._register(_contextMenuService.onDidShowContextMenu(() => {
+			this.hideContentHover();
+			this._ignoreMouseEvents = true;
+		}));
+		this._register(_contextMenuService.onDidHideContextMenu(() => {
+			this._ignoreMouseEvents = false;
+		}));
 		this._hookListeners();
 		this._register(this._editor.onDidChangeConfiguration((e: ConfigurationChangedEvent) => {
 			if (e.hasChanged(EditorOption.hover)) {
@@ -115,12 +126,18 @@ export class ContentHoverController extends Disposable implements IEditorContrib
 	}
 
 	private _onEditorScrollChanged(e: IScrollEvent): void {
+		if (this._ignoreMouseEvents) {
+			return;
+		}
 		if (e.scrollTopChanged || e.scrollLeftChanged) {
 			this.hideContentHover();
 		}
 	}
 
 	private _onEditorMouseDown(mouseEvent: IEditorMouseEvent): void {
+		if (this._ignoreMouseEvents) {
+			return;
+		}
 		this._isMouseDown = true;
 		const shouldKeepHoverWidgetVisible = this._shouldKeepHoverWidgetVisible(mouseEvent);
 		if (shouldKeepHoverWidgetVisible) {
@@ -141,10 +158,16 @@ export class ContentHoverController extends Disposable implements IEditorContrib
 	}
 
 	private _onEditorMouseUp(): void {
+		if (this._ignoreMouseEvents) {
+			return;
+		}
 		this._isMouseDown = false;
 	}
 
 	private _onEditorMouseLeave(mouseEvent: IPartialEditorMouseEvent): void {
+		if (this._ignoreMouseEvents) {
+			return;
+		}
 		if (this.shouldKeepOpenOnEditorMouseMoveOrLeave) {
 			return;
 		}
@@ -198,6 +221,9 @@ export class ContentHoverController extends Disposable implements IEditorContrib
 	}
 
 	private _onEditorMouseMove(mouseEvent: IEditorMouseEvent): void {
+		if (this._ignoreMouseEvents) {
+			return;
+		}
 		this._mouseMoveEvent = mouseEvent;
 		const shouldKeepCurrentHover = this._shouldKeepCurrentHover(mouseEvent);
 		if (shouldKeepCurrentHover) {
@@ -236,6 +262,9 @@ export class ContentHoverController extends Disposable implements IEditorContrib
 	}
 
 	private _onKeyDown(e: IKeyboardEvent): void {
+		if (this._ignoreMouseEvents) {
+			return;
+		}
 		if (!this._contentWidget) {
 			return;
 		}