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/sql/parts/profiler/editor/controller/profilerFindWidget.ts

@@ -5,7 +5,8 @@
 
 'use strict';
 
-import 'vs/css!vs/editor/contrib/find/browser/findWidget';
+import 'vs/css!vs/editor/contrib/find/findWidget';
+
 import * as nls from 'vs/nls';
 import { onUnexpectedError } from 'vs/base/common/errors';
 import { KeyCode, KeyMod } from 'vs/base/common/keyCodes';
@@ -21,10 +22,9 @@ import { Widget } from 'vs/base/browser/ui/widget';
 import { Sash, IHorizontalSashLayoutProvider, ISashEvent, Orientation } from 'vs/base/browser/ui/sash/sash';
 import { IKeybindingService } from 'vs/platform/keybinding/common/keybinding';
 import { IOverlayWidget, IOverlayWidgetPosition, OverlayWidgetPositionPreference } from 'vs/editor/browser/editorBrowser';
-import { FIND_IDS, MATCHES_LIMIT } from 'vs/editor/contrib/find/common/findModel';
-import { FindReplaceState, FindReplaceStateChangedEvent } from 'vs/editor/contrib/find/common/findState';
+import { FIND_IDS, MATCHES_LIMIT, CONTEXT_FIND_INPUT_FOCUSED } from 'vs/editor/contrib/find/findModel';
+import { FindReplaceState, FindReplaceStateChangedEvent } from 'vs/editor/contrib/find/findState';
 import { IContextKeyService, IContextKey } from 'vs/platform/contextkey/common/contextkey';
-import { CONTEXT_FIND_INPUT_FOCUSED } from 'vs/editor/contrib/find/common/findController';
 import { ITheme, registerThemingParticipant, IThemeService } from 'vs/platform/theme/common/themeService';
 import { Color } from 'vs/base/common/color';
 import { editorFindRangeHighlight, editorFindMatch, editorFindMatchHighlight, activeContrastBorder, contrastBorder, inputBackground, editorWidgetBackground, inputActiveOptionBorder, widgetShadow, inputForeground, inputBorder, inputValidationInfoBackground, inputValidationInfoBorder, inputValidationWarningBackground, inputValidationWarningBorder, inputValidationErrorBackground, inputValidationErrorBorder, errorForeground } from 'vs/platform/theme/common/colorRegistry';
@@ -102,7 +102,7 @@ export class FindWidget extends Widget implements IOverlayWidget, IHorizontalSas
 
 		this._isVisible = false;
 
-		this._register(this._state.addChangeListener((e) => this._onStateChanged(e)));
+		this._register(this._state.onFindReplaceStateChange((e) => this._onStateChanged(e)));
 		this._buildDomNode();
 		this._updateButtons();
 
@@ -148,10 +148,10 @@ export class FindWidget extends Widget implements IOverlayWidget, IHorizontalSas
 
 		this._findInputFocussed = CONTEXT_FIND_INPUT_FOCUSED.bindTo(contextKeyService);
 		this._focusTracker = this._register(dom.trackFocus(this._findInput.inputBox.inputElement));
-		this._focusTracker.addFocusListener(() => {
+		this._focusTracker.onDidFocus(() => {
 			this._findInputFocussed.set(true);
 		});
-		this._focusTracker.addBlurListener(() => {
+		this._focusTracker.onDidBlur(() => {
 			this._findInputFocussed.set(false);
 		});
 
@@ -480,11 +480,11 @@ export class FindWidget extends Widget implements IOverlayWidget, IHorizontalSas
 		this._resizeSash = new Sash(this._domNode, this, { orientation: Orientation.VERTICAL });
 		let originalWidth = FIND_WIDGET_INITIAL_WIDTH;
 
-		this._register(this._resizeSash.addListener('start', (e: ISashEvent) => {
+		this._register(this._resizeSash.onDidStart((e: ISashEvent) => {
 			originalWidth = dom.getTotalWidth(this._domNode);
 		}));
 
-		this._register(this._resizeSash.addListener('change', (evt: ISashEvent) => {
+		this._register(this._resizeSash.onDidChange((evt: ISashEvent) => {
 			let width = originalWidth + evt.startX - evt.currentX;
 
 			if (width < FIND_WIDGET_INITIAL_WIDTH) {

src/sql/parts/profiler/editor/controller/profilerTableEditor.ts

@@ -20,7 +20,7 @@ import { IContextKeyService } from 'vs/platform/contextkey/common/contextkey';
 import { IKeybindingService } from 'vs/platform/keybinding/common/keybinding';
 import { IEditorAction } from 'vs/editor/common/editorCommon';
 import { IOverlayWidget } from 'vs/editor/browser/editorBrowser';
-import { FindReplaceState, FindReplaceStateChangedEvent } from 'vs/editor/contrib/find/common/findState';
+import { FindReplaceState, FindReplaceStateChangedEvent } from 'vs/editor/contrib/find/findState';
 import { Dimension, Builder } from 'vs/base/browser/builder';
 import { BaseEditor } from 'vs/workbench/browser/parts/editor/baseEditor';
 import { ITelemetryService } from 'vs/platform/telemetry/common/telemetry';
@@ -70,7 +70,7 @@ export class ProfilerTableEditor extends BaseEditor implements IProfilerControll
 		attachTableStyler(this._profilerTable, this._themeService);
 
 		this._findState = new FindReplaceState();
-		this._findState.addChangeListener(e => this._onFindStateChange(e));
+		this._findState.onFindReplaceStateChange(e => this._onFindStateChange(e));
 
 		this._finder = new FindWidget(
 			this,

src/sql/parts/profiler/editor/profilerEditor.ts

@@ -28,19 +28,20 @@ import { IInstantiationService, ServicesAccessor } from 'vs/platform/instantiati
 import { ProfilerResourceEditor } from './profilerResourceEditor';
 import { SplitView, View, Orientation, IViewOptions } from 'sql/base/browser/ui/splitview/splitview';
 import { IContextMenuService, IContextViewService } from 'vs/platform/contextview/browser/contextView';
-import { IModel, ICommonCodeEditor } from 'vs/editor/common/editorCommon';
+import { IModel } from 'vs/editor/common/editorCommon';
+import { ICodeEditor } from 'vs/editor/browser/editorBrowser';
 import { UntitledEditorInput } from 'vs/workbench/common/editor/untitledEditorInput';
 import URI from 'vs/base/common/uri';
 import { UNTITLED_SCHEMA } from 'vs/workbench/services/untitled/common/untitledEditorService';
 import * as nls from 'vs/nls';
 import { IModelService } from 'vs/editor/common/services/modelService';
 import { IDisposable } from 'vs/base/common/lifecycle';
-import { Command } from 'vs/editor/common/editorCommonExtensions';
+import { Command } from 'vs/editor/browser/editorExtensions';
 import { IWorkbenchEditorService } from 'vs/workbench/services/editor/common/editorService';
 import { KeyMod, KeyCode } from 'vs/base/common/keyCodes';
 import { ContextKeyExpr, IContextKeyService, IContextKey } from 'vs/platform/contextkey/common/contextkey';
 import { KeybindingsRegistry } from 'vs/platform/keybinding/common/keybindingsRegistry';
-import { CommonFindController, FindStartFocusAction } from 'vs/editor/contrib/find/common/findController';
+import { CommonFindController, FindStartFocusAction } from 'vs/editor/contrib/find/findController';
 import * as types from 'vs/base/common/types';
 import { attachSelectBoxStyler } from 'vs/platform/theme/common/styler';
 
@@ -354,11 +355,12 @@ export class ProfilerEditor extends BaseEditor {
 
 	public toggleSearch(): void {
 		if (this._editor.getControl().isFocused()) {
-			let editor = this._editor.getControl() as ICommonCodeEditor;
+			let editor = this._editor.getControl() as ICodeEditor;
 			let controller = CommonFindController.get(editor);
 			if (controller) {
 				controller.start({
 					forceRevealReplace: false,
+					seedSearchStringFromGlobalClipboard: false,
 					seedSearchStringFromSelection: (controller.getState().searchString.length === 0),
 					shouldFocus: FindStartFocusAction.FocusFindInput,
 					shouldAnimate: true

src/sql/parts/profiler/editor/profilerResourceEditor.ts

@@ -22,8 +22,8 @@ import { ITextFileService } from 'vs/workbench/services/textfile/common/textfile
 import { IEditorGroupService } from 'vs/workbench/services/group/common/groupService';
 import { EditorOptions } from 'vs/workbench/common/editor';
 import { CodeEditor } from 'vs/editor/browser/codeEditor';
-import { IEditorContributionCtor } from 'vs/editor/browser/editorBrowser';
-import { FoldingController } from 'vs/editor/contrib/folding/browser/folding';
+import { IEditorContributionCtor } from 'vs/editor/browser/editorExtensions';
+import { FoldingController } from 'vs/editor/contrib/folding/folding';
 
 class ProfilerResourceCodeEditor extends CodeEditor {
 
@@ -53,7 +53,7 @@ export class ProfilerResourceEditor extends BaseTextEditor {
 		@IEditorGroupService editorGroupService: IEditorGroupService
 
 	) {
-		super(ProfilerResourceEditor.ID, telemetryService, instantiationService, storageService, configurationService, themeService, modeService, textFileService, editorGroupService);
+		super(ProfilerResourceEditor.ID, telemetryService, instantiationService, storageService, configurationService, themeService, textFileService, editorGroupService);
 	}
 
 	public createEditorControl(parent: Builder, configuration: IEditorOptions): editorCommon.IEditor {

src/sql/parts/profiler/editor/profilerState.ts

@@ -4,7 +4,7 @@
  *--------------------------------------------------------------------------------------------*/
 'use strict';
 
-import { EventEmitter } from 'vs/base/common/eventEmitter';
+import { EventEmitter } from 'sql/base/common/eventEmitter';
 import { IDisposable } from 'vs/base/common/lifecycle';
 
 export interface IProfilerStateChangedEvent {

src/sql/parts/profiler/service/profilerService.ts

@@ -118,7 +118,7 @@ export class ProfilerService implements IProfilerService {
 	}
 
 	public getSessionTemplates(provider?: string): Array<IProfilerSessionTemplate> {
-		let config = <IProfilerSettings>this._configurationService.getConfiguration(PROFILER_SETTINGS);
+		let config = <IProfilerSettings>this._configurationService.getValue(PROFILER_SETTINGS);
 
 		if (provider) {
 			return config.sessionTemplates;