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/contrib/caretOperations/caretOperations.ts

@@ -5,10 +5,11 @@
 'use strict';
 
 import * as nls from 'vs/nls';
-import { ICommand, ICommonCodeEditor } from 'vs/editor/common/editorCommon';
+import { ICommand } from 'vs/editor/common/editorCommon';
 import { EditorContextKeys } from 'vs/editor/common/editorContextKeys';
-import { IActionOptions, editorAction, EditorAction, ServicesAccessor } from 'vs/editor/common/editorCommonExtensions';
+import { IActionOptions, registerEditorAction, EditorAction, ServicesAccessor } from 'vs/editor/browser/editorExtensions';
 import { MoveCaretCommand } from './moveCaretCommand';
+import { ICodeEditor } from 'vs/editor/browser/editorBrowser';
 
 class MoveCaretAction extends EditorAction {
 
@@ -20,7 +21,7 @@ class MoveCaretAction extends EditorAction {
 		this.left = left;
 	}
 
-	public run(accessor: ServicesAccessor, editor: ICommonCodeEditor): void {
+	public run(accessor: ServicesAccessor, editor: ICodeEditor): void {
 
 		var commands: ICommand[] = [];
 		var selections = editor.getSelections();
@@ -35,7 +36,6 @@ class MoveCaretAction extends EditorAction {
 	}
 }
 
-@editorAction
 class MoveCaretLeftAction extends MoveCaretAction {
 	constructor() {
 		super(true, {
@@ -47,7 +47,6 @@ class MoveCaretLeftAction extends MoveCaretAction {
 	}
 }
 
-@editorAction
 class MoveCaretRightAction extends MoveCaretAction {
 	constructor() {
 		super(false, {
@@ -58,3 +57,6 @@ class MoveCaretRightAction extends MoveCaretAction {
 		});
 	}
 }
+
+registerEditorAction(MoveCaretLeftAction);
+registerEditorAction(MoveCaretRightAction);

src/vs/editor/contrib/caretOperations/test/moveCarretCommand.test.ts

@@ -5,8 +5,8 @@
 'use strict';
 
 import { Selection } from 'vs/editor/common/core/selection';
-import { MoveCaretCommand } from 'vs/editor/contrib/caretOperations/common/moveCaretCommand';
-import { testCommand } from 'vs/editor/test/common/commands/commandTestUtils';
+import { MoveCaretCommand } from 'vs/editor/contrib/caretOperations/moveCaretCommand';
+import { testCommand } from 'vs/editor/test/browser/testCommand';
 
 
 function testMoveCaretLeftCommand(lines: string[], selection: Selection, expectedLines: string[], expectedSelection: Selection): void {
@@ -67,4 +67,4 @@ suite('Editor Contrib - Move Caret Command', () => {
 			new Selection(1, 5, 1, 7)
 		);
 	});
-});
+});

src/vs/editor/contrib/caretOperations/transpose.ts

@@ -7,12 +7,12 @@
 import * as nls from 'vs/nls';
 import { KeyCode, KeyMod } from 'vs/base/common/keyCodes';
 import { Range } from 'vs/editor/common/core/range';
-import { ICommand, ICommonCodeEditor } from 'vs/editor/common/editorCommon';
+import { ICommand } from 'vs/editor/common/editorCommon';
 import { EditorContextKeys } from 'vs/editor/common/editorContextKeys';
-import { editorAction, EditorAction, ServicesAccessor } from 'vs/editor/common/editorCommonExtensions';
+import { registerEditorAction, EditorAction, ServicesAccessor } from 'vs/editor/browser/editorExtensions';
 import { ReplaceCommand } from 'vs/editor/common/commands/replaceCommand';
+import { ICodeEditor } from 'vs/editor/browser/editorBrowser';
 
-@editorAction
 class TransposeLettersAction extends EditorAction {
 
 	constructor() {
@@ -31,7 +31,7 @@ class TransposeLettersAction extends EditorAction {
 		});
 	}
 
-	public run(accessor: ServicesAccessor, editor: ICommonCodeEditor): void {
+	public run(accessor: ServicesAccessor, editor: ICodeEditor): void {
 		let model = editor.getModel();
 		let commands: ICommand[] = [];
 		let selections = editor.getSelections();
@@ -69,3 +69,5 @@ class TransposeLettersAction extends EditorAction {
 		}
 	}
 }
+
+registerEditorAction(TransposeLettersAction);