Fix #41490

src/vs/workbench/parts/markers/browser/markersTreeController.ts

@@ -10,24 +10,20 @@ import tree = require('vs/base/parts/tree/browser/tree');
 import treedefaults = require('vs/base/parts/tree/browser/treeDefaults');
 import { MarkersModel } from 'vs/workbench/parts/markers/common/markersModel';
 import { IContextMenuService } from 'vs/platform/contextview/browser/contextView';
-import { IContextKeyService } from 'vs/platform/contextkey/common/contextkey';
-import { IMenuService, IMenu, MenuId } from 'vs/platform/actions/common/actions';
+import { IMenuService, MenuId } from 'vs/platform/actions/common/actions';
 import { IAction } from 'vs/base/common/actions';
 import { ActionItem, Separator } from 'vs/base/browser/ui/actionbar/actionbar';
 import { IKeybindingService } from 'vs/platform/keybinding/common/keybinding';
+import { WorkbenchTree } from 'vs/platform/list/browser/listService';
 
 export class Controller extends treedefaults.DefaultController {
 
-	private contextMenu: IMenu;
-
 	constructor(
 		@IContextMenuService private contextMenuService: IContextMenuService,
-		@IMenuService menuService: IMenuService,
-		@IContextKeyService contextKeyService: IContextKeyService,
+		@IMenuService private menuService: IMenuService,
 		@IKeybindingService private _keybindingService: IKeybindingService
 	) {
 		super({ clickBehavior: treedefaults.ClickBehavior.ON_MOUSE_DOWN, keyboardSupport: false });
-		this.contextMenu = menuService.createMenu(MenuId.ProblemsPanelContext, contextKeyService);
 	}
 
 	protected onLeftClick(tree: tree.ITree, element: any, event: mouse.IMouseEvent): boolean {
@@ -45,9 +41,9 @@ export class Controller extends treedefaults.DefaultController {
 		return false;
 	}
 
-	public onContextMenu(tree: tree.ITree, element: any, event: tree.ContextMenuEvent): boolean {
+	public onContextMenu(tree: WorkbenchTree, element: any, event: tree.ContextMenuEvent): boolean {
 		tree.setFocus(element);
-		const actions = this._getMenuActions();
+		const actions = this._getMenuActions(tree);
 		if (!actions.length) {
 			return true;
 		}
@@ -77,9 +73,9 @@ export class Controller extends treedefaults.DefaultController {
 		return true;
 	}
 
-	private _getMenuActions(): IAction[] {
+	private _getMenuActions(tree: WorkbenchTree): IAction[] {
 		const result: IAction[] = [];
-		const groups = this.contextMenu.getActions();
+		const groups = this.menuService.createMenu(MenuId.ProblemsPanelContext, tree.contextKeyService).getActions();
 
 		for (let group of groups) {
 			const [, actions] = group;