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/smartSelect/smartSelect.ts

@@ -10,22 +10,23 @@ import { KeyCode, KeyMod } from 'vs/base/common/keyCodes';
 import { TPromise } from 'vs/base/common/winjs.base';
 import { IInstantiationService } from 'vs/platform/instantiation/common/instantiation';
 import { Range } from 'vs/editor/common/core/range';
-import { ICommonCodeEditor, IEditorContribution } from 'vs/editor/common/editorCommon';
+import { IEditorContribution } from 'vs/editor/common/editorCommon';
 import { EditorContextKeys } from 'vs/editor/common/editorContextKeys';
-import { editorAction, ServicesAccessor, IActionOptions, EditorAction, commonEditorContribution } from 'vs/editor/common/editorCommonExtensions';
+import { registerEditorAction, ServicesAccessor, IActionOptions, EditorAction, registerEditorContribution } from 'vs/editor/browser/editorExtensions';
 import { TokenSelectionSupport, ILogicalSelectionEntry } from './tokenSelectionSupport';
 import { ICursorPositionChangedEvent } from 'vs/editor/common/controller/cursorEvents';
+import { ICodeEditor } from 'vs/editor/browser/editorBrowser';
 
 // --- selection state machine
 
 class State {
 
-	public editor: ICommonCodeEditor;
+	public editor: ICodeEditor;
 	public next: State;
 	public previous: State;
 	public selection: Range;
 
-	constructor(editor: ICommonCodeEditor) {
+	constructor(editor: ICodeEditor) {
 		this.editor = editor;
 		this.next = null;
 		this.previous = null;
@@ -39,19 +40,18 @@ var ignoreSelection = false;
 
 // -- action implementation
 
-@commonEditorContribution
 class SmartSelectController implements IEditorContribution {
 
-	private static ID = 'editor.contrib.smartSelectController';
+	private static readonly ID = 'editor.contrib.smartSelectController';
 
-	public static get(editor: ICommonCodeEditor): SmartSelectController {
+	public static get(editor: ICodeEditor): SmartSelectController {
 		return editor.getContribution<SmartSelectController>(SmartSelectController.ID);
 	}
 
 	private _tokenSelectionSupport: TokenSelectionSupport;
 
 	constructor(
-		private editor: ICommonCodeEditor,
+		private editor: ICodeEditor,
 		@IInstantiationService instantiationService: IInstantiationService
 	) {
 		this._tokenSelectionSupport = instantiationService.createInstance(TokenSelectionSupport);
@@ -154,7 +154,7 @@ abstract class AbstractSmartSelect extends EditorAction {
 		this._forward = forward;
 	}
 
-	public run(accessor: ServicesAccessor, editor: ICommonCodeEditor): TPromise<void> {
+	public run(accessor: ServicesAccessor, editor: ICodeEditor): TPromise<void> {
 		let controller = SmartSelectController.get(editor);
 		if (controller) {
 			return controller.run(this._forward);
@@ -163,7 +163,6 @@ abstract class AbstractSmartSelect extends EditorAction {
 	}
 }
 
-@editorAction
 class GrowSelectionAction extends AbstractSmartSelect {
 	constructor() {
 		super(true, {
@@ -180,7 +179,6 @@ class GrowSelectionAction extends AbstractSmartSelect {
 	}
 }
 
-@editorAction
 class ShrinkSelectionAction extends AbstractSmartSelect {
 	constructor() {
 		super(false, {
@@ -196,3 +194,7 @@ class ShrinkSelectionAction extends AbstractSmartSelect {
 		});
 	}
 }
+
+registerEditorContribution(SmartSelectController);
+registerEditorAction(GrowSelectionAction);
+registerEditorAction(ShrinkSelectionAction);

src/vs/editor/contrib/smartSelect/test/tokenSelectionSupport.test.ts

@@ -10,7 +10,7 @@ import { Range } from 'vs/editor/common/core/range';
 import { Position } from 'vs/editor/common/core/position';
 import { LanguageIdentifier } from 'vs/editor/common/modes';
 import { IndentAction } from 'vs/editor/common/modes/languageConfiguration';
-import { TokenSelectionSupport } from 'vs/editor/contrib/smartSelect/common/tokenSelectionSupport';
+import { TokenSelectionSupport } from 'vs/editor/contrib/smartSelect/tokenSelectionSupport';
 import { MockMode } from 'vs/editor/test/common/mocks/mockMode';
 import { LanguageConfigurationRegistry } from 'vs/editor/common/modes/languageConfigurationRegistry';
 import { ModelServiceImpl } from 'vs/editor/common/services/modelServiceImpl';
@@ -18,7 +18,7 @@ import { TestConfigurationService } from 'vs/platform/configuration/test/common/
 
 class MockJSMode extends MockMode {
 
-	private static _id = new LanguageIdentifier('mockJSMode', 3);
+	private static readonly _id = new LanguageIdentifier('mockJSMode', 3);
 
 	constructor() {
 		super(MockJSMode._id);