Initial VS Code 1.19 source merge (#571)

* Initial 1.19 xcopy

* Fix yarn build

* Fix numerous build breaks

* Next batch of build break fixes

* More build break fixes

* Runtime breaks

* Additional post merge fixes

* Fix windows setup file

* Fix test failures.

* Update license header blocks to refer to source eula

src/vs/base/browser/ui/menu/menu.ts

@@ -10,8 +10,8 @@ import { IDisposable } from 'vs/base/common/lifecycle';
 import { $ } from 'vs/base/browser/builder';
 import { IActionRunner, IAction } from 'vs/base/common/actions';
 import { ActionBar, IActionItemProvider, ActionsOrientation } from 'vs/base/browser/ui/actionbar/actionbar';
-import { EventEmitter } from 'vs/base/common/eventEmitter';
 import { ResolvedKeybinding } from 'vs/base/common/keyCodes';
+import Event from 'vs/base/common/event';
 
 export interface IMenuOptions {
 	context?: any;
@@ -20,14 +20,12 @@ export interface IMenuOptions {
 	getKeyBinding?: (action: IAction) => ResolvedKeybinding;
 }
 
-export class Menu extends EventEmitter {
+export class Menu {
 
 	private actionBar: ActionBar;
 	private listener: IDisposable;
 
 	constructor(container: HTMLElement, actions: IAction[], options: IMenuOptions = {}) {
-		super();
-
 		$(container).addClass('monaco-menu-container');
 
 		let $menu = $('.monaco-menu').appendTo(container);
@@ -40,18 +38,22 @@ export class Menu extends EventEmitter {
 			isMenu: true
 		});
 
-		this.listener = this.addEmitter(this.actionBar);
-
 		this.actionBar.push(actions, { icon: true, label: true });
 	}
 
+	public get onDidCancel(): Event<void> {
+		return this.actionBar.onDidCancel;
+	}
+
+	public get onDidBlur(): Event<void> {
+		return this.actionBar.onDidBlur;
+	}
+
 	public focus() {
 		this.actionBar.focus(true);
 	}
 
 	public dispose() {
-		super.dispose();
-
 		if (this.actionBar) {
 			this.actionBar.dispose();
 			this.actionBar = null;