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/editor/standalone/browser/standaloneCodeEditor.ts

@@ -12,8 +12,8 @@ import { IInstantiationService } from 'vs/platform/instantiation/common/instanti
 import { CommandsRegistry, ICommandService, ICommandHandler } from 'vs/platform/commands/common/commands';
 import { IKeybindingService } from 'vs/platform/keybinding/common/keybinding';
 import { ContextKeyExpr, IContextKey, IContextKeyService } from 'vs/platform/contextkey/common/contextkey';
-import { IActionDescriptor, IModel, IModelChangedEvent } from 'vs/editor/common/editorCommon';
-import { ICodeEditorService } from 'vs/editor/common/services/codeEditorService';
+import { IModel, IModelChangedEvent } from 'vs/editor/common/editorCommon';
+import { ICodeEditorService } from 'vs/editor/browser/services/codeEditorService';
 import { IEditorWorkerService } from 'vs/editor/common/services/editorWorkerService';
 import { StandaloneKeybindingService } from 'vs/editor/standalone/browser/simpleServices';
 import { IEditorContextViewService } from 'vs/editor/standalone/browser/standaloneServices';
@@ -30,6 +30,51 @@ import { IMessageService } from 'vs/platform/message/common/message';
 import * as nls from 'vs/nls';
 import * as browser from 'vs/base/browser/browser';
 
+/**
+ * Description of an action contribution
+ */
+export interface IActionDescriptor {
+	/**
+	 * An unique identifier of the contributed action.
+	 */
+	id: string;
+	/**
+	 * A label of the action that will be presented to the user.
+	 */
+	label: string;
+	/**
+	 * Precondition rule.
+	 */
+	precondition?: string;
+	/**
+	 * An array of keybindings for the action.
+	 */
+	keybindings?: number[];
+	/**
+	 * The keybinding rule (condition on top of precondition).
+	 */
+	keybindingContext?: string;
+	/**
+	 * Control if the action should show up in the context menu and where.
+	 * The context menu of the editor has these default:
+	 *   navigation - The navigation group comes first in all cases.
+	 *   1_modification - This group comes next and contains commands that modify your code.
+	 *   9_cutcopypaste - The last default group with the basic editing commands.
+	 * You can also create your own group.
+	 * Defaults to null (don't show in context menu).
+	 */
+	contextMenuGroupId?: string;
+	/**
+	 * Control the order in the context menu group.
+	 */
+	contextMenuOrder?: number;
+	/**
+	 * Method that will be executed when the action is triggered.
+	 * @param editor The editor instance is passed in as a convinience
+	 */
+	run(editor: ICodeEditor): void | TPromise<void>;
+}
+
 /**
  * The options to create an editor.
  */
@@ -283,10 +328,6 @@ export class StandaloneEditor extends StandaloneCodeEditor implements IStandalon
 		super.dispose();
 	}
 
-	public destroy(): void {
-		this.dispose();
-	}
-
 	_attachModel(model: IModel): void {
 		super._attachModel(model);
 		if (this._view) {
@@ -306,7 +347,6 @@ export class StandaloneEditor extends StandaloneCodeEditor implements IStandalon
 export class StandaloneDiffEditor extends DiffEditorWidget implements IStandaloneDiffEditor {
 
 	private _contextViewService: IEditorContextViewService;
-	private _standaloneKeybindingService: StandaloneKeybindingService;
 
 	constructor(
 		domElement: HTMLElement,
@@ -328,10 +368,6 @@ export class StandaloneDiffEditor extends DiffEditorWidget implements IStandalon
 
 		super(domElement, options, editorWorkerService, contextKeyService, instantiationService, codeEditorService, themeService, messageService);
 
-		if (keybindingService instanceof StandaloneKeybindingService) {
-			this._standaloneKeybindingService = keybindingService;
-		}
-
 		this._contextViewService = <IEditorContextViewService>contextViewService;
 
 		this._register(toDispose);
@@ -343,10 +379,6 @@ export class StandaloneDiffEditor extends DiffEditorWidget implements IStandalon
 		super.dispose();
 	}
 
-	public destroy(): void {
-		this.dispose();
-	}
-
 	protected _createInnerEditor(instantiationService: IInstantiationService, container: HTMLElement, options: IEditorOptions): CodeEditor {
 		return instantiationService.createInstance(StandaloneCodeEditor, container, options);
 	}