From 0e86dd639b51c2a546ae304e8dd64a3be6cc009f Mon Sep 17 00:00:00 2001
From: Johannes Rieken <johannes.rieken@gmail.com>
Date: Fri, 23 Nov 2018 16:19:52 +0100
Subject: [PATCH] MenuItemActionItem only listens to alt-key when having an
 alt-command

---
 .../actions/browser/menuItemActionItem.ts     | 25 +++++++++++--------
 1 file changed, 14 insertions(+), 11 deletions(-)

diff --git a/src/vs/platform/actions/browser/menuItemActionItem.ts b/src/vs/platform/actions/browser/menuItemActionItem.ts
index cf9b8731061..5ce200b310f 100644
--- a/src/vs/platform/actions/browser/menuItemActionItem.ts
+++ b/src/vs/platform/actions/browser/menuItemActionItem.ts
@@ -128,14 +128,16 @@ export class MenuItemActionItem extends ActionItem {
 
 	private _wantsAltCommand: boolean;
 	private _itemClassDispose: IDisposable;
+	private readonly _altKey: AlternativeKeyEmitter;
 
 	constructor(
-		public _action: MenuItemAction,
+		readonly _action: MenuItemAction,
 		@IKeybindingService private readonly _keybindingService: IKeybindingService,
 		@INotificationService protected _notificationService: INotificationService,
-		@IContextMenuService private readonly _contextMenuService: IContextMenuService
+		@IContextMenuService _contextMenuService: IContextMenuService
 	) {
 		super(undefined, _action, { icon: !!(_action.class || _action.item.iconLocation), label: !_action.class && !_action.item.iconLocation });
+		this._altKey = AlternativeKeyEmitter.getInstance(_contextMenuService);
 	}
 
 	protected get _commandAction(): IAction {
@@ -146,9 +148,8 @@ export class MenuItemActionItem extends ActionItem {
 		event.preventDefault();
 		event.stopPropagation();
 
-		const altKey = AlternativeKeyEmitter.getInstance(this._contextMenuService);
-		if (altKey.isPressed) {
-			altKey.suppressAltKeyUp();
+		if (this._altKey.isPressed) {
+			this._altKey.suppressAltKeyUp();
 		}
 
 		this.actionRunner.run(this._commandAction)
@@ -161,8 +162,8 @@ export class MenuItemActionItem extends ActionItem {
 		this._updateItemClass(this._action.item);
 
 		let mouseOver = false;
-		const alternativeKeyEmitter = AlternativeKeyEmitter.getInstance(this._contextMenuService);
-		let alternativeKeyDown = alternativeKeyEmitter.isPressed;
+
+		let alternativeKeyDown = this._altKey.isPressed;
 
 		const updateAltState = () => {
 			const wantsAltCommand = mouseOver && alternativeKeyDown;
@@ -174,10 +175,12 @@ export class MenuItemActionItem extends ActionItem {
 			}
 		};
 
-		this._register(alternativeKeyEmitter.event(value => {
-			alternativeKeyDown = value;
-			updateAltState();
-		}));
+		if (this._action.alt) {
+			this._register(this._altKey.event(value => {
+				alternativeKeyDown = value;
+				updateAltState();
+			}));
+		}
 
 		this._register(domEvent(container, 'mouseleave')(_ => {
 			mouseOver = false;
-- 
GitLab