debt - move IMenu closing to its service

jrieken · jrieken · commit 69fdfa2fd83f · 2017-02-15T16:29:46.000+01:00
diff --git a/src/vs/platform/actions/common/actions.ts b/src/vs/platform/actions/common/actions.ts
@@ -21,11 +21,6 @@ export interface ICommandAction {
 	iconClass?: string;
 }
 
-export interface IMenu extends IDisposable {
-	onDidChange: Event<IMenu>;
-	getActions(arg?: any): [string, MenuItemAction[]][];
-}
-
 export interface IMenuItem {
 	command: ICommandAction;
 	alt?: ICommandAction;
@@ -60,6 +55,11 @@ export class MenuId {
 	}
 }
 
+export interface IMenu extends IDisposable {
+	onDidChange: Event<IMenu>;
+	getActions(arg?: any): [string, MenuItemAction[]][];
+}
+
 export const IMenuService = createDecorator<IMenuService>('menuService');
 
 export interface IMenuService {
@@ -95,7 +95,7 @@ export const MenuRegistry: IMenuRegistry = new class {
 		return this.commands[id];
 	}
 
-	appendMenuItem({id}: MenuId, item: IMenuItem): IDisposable {
+	appendMenuItem({ id }: MenuId, item: IMenuItem): IDisposable {
 		let array = this.menuItems[id];
 		if (!array) {
 			this.menuItems[id] = array = [item];
@@ -112,7 +112,7 @@ export const MenuRegistry: IMenuRegistry = new class {
 		};
 	}
 
-	getMenuItems({id}: MenuId): IMenuItem[] {
+	getMenuItems({ id }: MenuId): IMenuItem[] {
 		return this.menuItems[id] || [];
 	}
 };
@@ -204,4 +204,4 @@ export class SyncActionDescriptor {
 	public get keybindingWeight(): number {
 		return this._keybindingWeight;
 	}
-}
+}

Original file line number	Diff line number	Diff line change
`@@ -21,11 +21,6 @@ export interface ICommandAction {`
`21`	`21`	`iconClass?: string;`
`22`	`22`	`}`
`23`	`23`
`24`		`-export interface IMenu extends IDisposable {`
`25`		`- onDidChange: Event<IMenu>;`
`26`		`- getActions(arg?: any): [string, MenuItemAction[]][];`
`27`		`-}`
`28`		`-`
`29`	`24`	`export interface IMenuItem {`
`30`	`25`	`command: ICommandAction;`
`31`	`26`	`alt?: ICommandAction;`
`@@ -60,6 +55,11 @@ export class MenuId {`
`60`	`55`	`}`
`61`	`56`	`}`
`62`	`57`
	`58`	`+export interface IMenu extends IDisposable {`
	`59`	`+ onDidChange: Event<IMenu>;`
	`60`	`+ getActions(arg?: any): [string, MenuItemAction[]][];`
	`61`	`+}`
	`62`	`+`
`63`	`63`	`export const IMenuService = createDecorator<IMenuService>('menuService');`
`64`	`64`
`65`	`65`	`export interface IMenuService {`
`@@ -95,7 +95,7 @@ export const MenuRegistry: IMenuRegistry = new class {`
`95`	`95`	`return this.commands[id];`
`96`	`96`	`}`
`97`	`97`
`98`		`- appendMenuItem({id}: MenuId, item: IMenuItem): IDisposable {`
	`98`	`+ appendMenuItem({ id }: MenuId, item: IMenuItem): IDisposable {`
`99`	`99`	`let array = this.menuItems[id];`
`100`	`100`	`if (!array) {`
`101`	`101`	`this.menuItems[id] = array = [item];`
`@@ -112,7 +112,7 @@ export const MenuRegistry: IMenuRegistry = new class {`
`112`	`112`	`};`
`113`	`113`	`}`
`114`	`114`
`115`		`- getMenuItems({id}: MenuId): IMenuItem[] {`
	`115`	`+ getMenuItems({ id }: MenuId): IMenuItem[] {`
`116`	`116`	`return this.menuItems[id] \|\| [];`
`117`	`117`	`}`
`118`	`118`	`};`
`@@ -204,4 +204,4 @@ export class SyncActionDescriptor {`
`204`	`204`	`public get keybindingWeight(): number {`
`205`	`205`	`return this._keybindingWeight;`
`206`	`206`	`}`
`207`		`-}`
	`207`	`+}`