GH-22: Committing changes before starting to fix cyclic dependencies.

Signed-off-by: Akos Kitta <kittaakos@gmail.com>

src/application/browser/menu/context-menu-renderer.ts

@@ -12,20 +12,13 @@ export interface ContextMenuRenderer {
 @injectable()
 export class BrowserContextMenuRenderer implements ContextMenuRenderer {
 
-    constructor(
-        @inject(MainMenuFactory) private menuFactory: MainMenuFactory) { }
+    constructor( @inject(MainMenuFactory) private menuFactory: MainMenuFactory) {
+    }
 
     render(path: string, anchor: Anchor): void {
         const contextMenu = this.menuFactory.createContextMenu(path);
-        const {x, y} = this.getAnchor(anchor);
+        const { x, y } = anchor instanceof MouseEvent ? { x: anchor.clientX, y: anchor.clientY } : anchor;
         contextMenu.open(x, y);
     }
 
-    private getAnchor(event: MouseEvent | { x: number, y: number }): { x: number, y: number } {
-        if (event instanceof MouseEvent) {
-            return { x: event.clientX, y: event.clientY };
-        }
-        return event;
-    }
-
 }

src/application/electron-browser/menu/context-menu-renderer.ts

@@ -1,16 +1,16 @@
 import { inject, injectable } from "inversify";
 import { MainMenuFactory } from "./menu-plugin";
-import { ContextMenuRenderer } from "../../browser/menu/context-menu-renderer";
+import { Anchor, ContextMenuRenderer } from "../../browser/menu/context-menu-renderer";
 
 @injectable()
 export class ElectronContextMenuRenderer implements ContextMenuRenderer {
 
-    constructor(
-        @inject(MainMenuFactory) private menuFactory: MainMenuFactory) {}
+    constructor( @inject(MainMenuFactory) private menuFactory: MainMenuFactory) {
+    }
 
-    render(path: string, event: MouseEvent): void {
+    render(path: string, anchor: Anchor): void {
         const menu = this.menuFactory.createContextMenu(path);
-
         menu.popup();
     }
+
 }

src/editor/browser/editor-contextmenu.ts

@@ -1,5 +1,5 @@
-import { injectable } from "inversify";
-// import { ContextMenuRenderer } from "../../application/browser/menu/context-menu-renderer";
+import { injectable, inject } from "inversify";
+import { ContextMenuRenderer } from "../../application/browser/menu/context-menu-renderer";
 import IContextMenuService = monaco.editor.IContextMenuService;
 import IContextMenuDelegate = monaco.editor.IContextMenuDelegate;
 import CommandsRegistry = monaco.commands.CommandsRegistry;
@@ -15,12 +15,12 @@ export interface EditorContextMenuService extends IContextMenuService {
 @injectable()
 export class BrowserContextMenuService implements EditorContextMenuService {
 
-    // constructor(@inject(ContextMenuRenderer) protected readonly contextMenuRenderer: ContextMenuRenderer) {
-    // }
+    constructor(@inject(ContextMenuRenderer) protected readonly contextMenuRenderer: ContextMenuRenderer) {
+    }
 
     showContextMenu(delegate: IContextMenuDelegate): void {
         console.log(delegate.getAnchor());
-        // console.log(this.contextMenuRenderer);
+        console.log(this.contextMenuRenderer);
         const ids = Object.keys(CommandsRegistry.getCommands());
         console.log(ids.length);