Fix 'quick fixes'

Signed-off-by: Roman Nikitenko <[email protected]>
eclipse-theia · Mar 17, 2020 · c1a8936 · c1a8936
1 parent c40f846
commit c1a8936
Show file tree

Hide file tree

Showing 2 changed files with 21 additions and 4 deletions.
diff --git a/packages/monaco/src/browser/monaco-context-menu.ts b/packages/monaco/src/browser/monaco-context-menu.ts
@@ -30,12 +30,10 @@ export class MonacoContextMenuService implements IContextMenuService {
 
     showContextMenu(delegate: IContextMenuDelegate): void {
         const anchor = toAnchor(delegate.getAnchor());
-        // If it is the general context menu, we want to delegate to our menu registry entirely and ignore the actually passed actions.
-        // Unfortunately checking the existence of certain properties seems to be the best way to tell, what kind of context menu is requested.
-        if (delegate.hasOwnProperty('getKeyBinding')) {
+        const actions = delegate.getActions();
+        if (actions.length > 0 && actions[0] instanceof monaco.actions.MenuItemAction) {
             this.contextMenuRenderer.render(EDITOR_CONTEXT_MENU, anchor, () => delegate.onHide(false));
         } else {
-            const actions = delegate.getActions();
             const commands = new CommandRegistry();
             const menu = new Menu({
                 commands

diff --git a/packages/monaco/src/typings/monaco/index.d.ts b/packages/monaco/src/typings/monaco/index.d.ts
@@ -364,6 +364,25 @@ declare module monaco.actions {
      */
     // https://github.com/theia-ide/vscode/blob/standalone/0.19.x/src/vs/platform/actions/common/actions.ts#L142
     export const MenuRegistry: IMenuRegistry;
+
+    // https://github.com/theia-ide/vscode/blob/standalone/0.19.x/src/vs/platform/actions/common/actions.ts#L112
+    export interface IMenuActionOptions {
+        arg?: any;
+        shouldForwardArgs?: boolean;
+    }
+
+    // https://github.com/theia-ide/vscode/blob/standalone/0.19.x/src/vs/platform/actions/common/actions.ts#L246
+    export class MenuItemAction {
+        readonly item: ICommandAction;
+        readonly alt: MenuItemAction | undefined;
+        constructor(
+            item: ICommandAction,
+            alt: ICommandAction | undefined,
+            options: IMenuActionOptions,
+            contextKeyService: monaco.contextKeyService.IContextKeyService,
+            commandService: monaco.commands.ICommandService
+        )
+    }
 }
 
 declare module monaco.platform {