From 096e2b509657517037d44e21911584bc56ffdbf1 Mon Sep 17 00:00:00 2001 From: Johannes Rieken Date: Fri, 24 Jun 2016 17:14:56 +0200 Subject: [PATCH] wire editor context menus --- .../editor/contrib/contextmenu/browser/contextmenu.ts | 11 ++++------- 1 file changed, 4 insertions(+), 7 deletions(-) diff --git a/src/vs/editor/contrib/contextmenu/browser/contextmenu.ts b/src/vs/editor/contrib/contextmenu/browser/contextmenu.ts index a153a68e49c..56796309675 100644 --- a/src/vs/editor/contrib/contextmenu/browser/contextmenu.ts +++ b/src/vs/editor/contrib/contextmenu/browser/contextmenu.ts @@ -21,6 +21,7 @@ import {ICommonCodeEditor, IEditorActionDescriptorData, IEditorContribution, Mou import {CommonEditorRegistry, ContextKey, EditorActionDescriptor} from 'vs/editor/common/editorCommonExtensions'; import {ICodeEditor, IEditorMouseEvent} from 'vs/editor/browser/editorBrowser'; import {EditorBrowserRegistry} from 'vs/editor/browser/editorBrowserExtensions'; +import {fillInActions} from 'vs/platform/actions/browser/menuItemActionItem'; interface IPosition { x: number; @@ -124,12 +125,6 @@ class ContextMenuController implements IEditorContribution { private _getMenuActions(): IAction[] { - // const actions = this._contextMenu.getActions(); - // if (actions.length > 0) { - // console.log(actions); - // return actions; - // } - const editorModel = this._editor.getModel(); if (!editorModel) { return []; @@ -141,7 +136,9 @@ class ContextMenuController implements IEditorContribution { } }); - return ContextMenuController._prepareActions(contributedActions); + const actions = ContextMenuController._prepareActions(contributedActions); + fillInActions(this._contextMenu, actions); + return actions; } private static _prepareActions(actions: EditorAction[]): IAction[] { -- GitLab