Merge VS Code 1.21 source code (#1067)

* Initial VS Code 1.21 file copy with patches

* A few more merges

* Post npm install

* Fix batch of build breaks

* Fix more build breaks

* Fix more build errors

* Fix more build breaks

* Runtime fixes 1

* Get connection dialog working with some todos

* Fix a few packaging issues

* Copy several node_modules to package build to fix loader issues

* Fix breaks from master

* A few more fixes

* Make tests pass

* First pass of license header updates

* Second pass of license header updates

* Fix restore dialog issues

* Remove add additional themes menu items

* fix select box issues where the list doesn't show up

* formatting

* Fix editor dispose issue

* Copy over node modules to correct location on all platforms

src/sql/base/browser/ui/dropdownList/dropdownList.ts

@@ -43,11 +43,11 @@ export class DropdownList extends Dropdown {
 		if (_action) {
 			let button = new Button(_contentContainer);
 			button.label = _action.label;
-			this.toDispose.push(DOM.addDisposableListener(button.getElement(), DOM.EventType.CLICK, () => {
+			this.toDispose.push(DOM.addDisposableListener(button.element, DOM.EventType.CLICK, () => {
 				this._action.run();
 				this.hide();
 			}));
-			this.toDispose.push(DOM.addDisposableListener(button.getElement(), DOM.EventType.KEY_DOWN, (e: KeyboardEvent) => {
+			this.toDispose.push(DOM.addDisposableListener(button.element, DOM.EventType.KEY_DOWN, (e: KeyboardEvent) => {
 				let event = new StandardKeyboardEvent(e);
 				if (event.equals(KeyCode.Enter)) {
 					e.stopPropagation();

src/sql/base/browser/ui/listBox/listBox.ts

@@ -13,6 +13,7 @@ import { IKeyboardEvent } from 'vs/base/browser/keyboardEvent';
 import { IContextViewProvider, AnchorAlignment } from 'vs/base/browser/ui/contextview/contextview';
 import { RenderOptions, renderFormattedText, renderText } from 'vs/base/browser/htmlContentRenderer';
 import { IClipboardService } from 'vs/platform/clipboard/common/clipboardService';
+import { IContextViewService } from 'vs/platform/contextview/browser/contextView';
 
 const $ = dom.$;
 
@@ -50,8 +51,13 @@ export class ListBox extends SelectBox {
 	private contextViewProvider: IContextViewProvider;
 	private isValid: boolean;
 
-	constructor(options: string[], selectedOption: string, contextViewProvider: IContextViewProvider, private _clipboardService: IClipboardService) {
-		super(options, 0);
+	constructor(
+		options: string[],
+		selectedOption: string,
+		contextViewProvider: IContextViewProvider,
+		private _clipboardService: IClipboardService) {
+
+		super(options, 0, contextViewProvider);
 		this.contextViewProvider = contextViewProvider;
 		this.isValid = true;
 		this.selectElement.multiple = true;

src/sql/base/browser/ui/modal/dialogHelper.ts

@@ -44,7 +44,7 @@ export function appendRowLink(container: Builder, label: string, labelClass: str
 		});
 	});
 
-	return new Builder(rowButton.getElement());
+	return new Builder(rowButton.element);
 }
 
 export function appendInputSelectBox(container: Builder, selectBox: SelectBox): SelectBox {

src/sql/base/browser/ui/modal/optionsDialogHelper.ts

@@ -48,7 +48,7 @@ export function createOptionElement(option: sqlops.ServiceOption, rowContainer:
 		optionWidget.value = optionValue;
 		inputElement = this.findElement(rowContainer, 'input');
 	} else if (option.valueType === ServiceOptionType.category || option.valueType === ServiceOptionType.boolean) {
-		optionWidget = new SelectBox(possibleInputs, optionValue.toString());
+		optionWidget = new SelectBox(possibleInputs, optionValue.toString(), contextViewService);
 		DialogHelper.appendInputSelectBox(rowContainer, optionWidget);
 		inputElement = this.findElement(rowContainer, 'select-box');
 	} else if (option.valueType === ServiceOptionType.string || option.valueType === ServiceOptionType.password) {

src/sql/base/browser/ui/modal/webViewDialog.ts

@@ -18,7 +18,7 @@ import { ITelemetryService } from 'vs/platform/telemetry/common/telemetry';
 import { IContextKeyService } from 'vs/platform/contextkey/common/contextkey';
 import { IClipboardService } from 'vs/platform/clipboard/common/clipboardService';
 import { localize } from 'vs/nls';
-import WebView from 'vs/workbench/parts/html/browser/webview';
+import { Webview } from 'vs/workbench/parts/html/browser/webview';
 import { IContextViewService } from 'vs/platform/contextview/browser/contextView';
 import { IEnvironmentService } from 'vs/platform/environment/common/environment';
 import { IDisposable, toDisposable } from 'vs/base/common/lifecycle';
@@ -29,7 +29,7 @@ export class WebViewDialog extends Modal {
 	private _okButton: Button;
 	private _okLabel: string;
 	private _closeLabel: string;
-	private _webview: WebView;
+	private _webview: Webview;
 	private _html: string;
 	private _headerTitle: string;
 
@@ -89,14 +89,17 @@ export class WebViewDialog extends Modal {
 	protected renderBody(container: HTMLElement) {
 		new Builder(container).div({ 'class': 'webview-dialog' }, (bodyBuilder) => {
 			this._body = bodyBuilder.getHTMLElement();
-			this._webview = new WebView(this._body, this._webViewPartService.getContainer(Parts.EDITOR_PART),
+			this._webview = new Webview(
+				this._body,
+				this._webViewPartService.getContainer(Parts.EDITOR_PART),
+				this._themeService,
+				this._environmentService,
 				this._contextViewService,
 				undefined,
 				undefined,
 				{
 					allowScripts: true,
-					enableWrappedPostMessage: true,
-					hideFind: true
+					enableWrappedPostMessage: true
 				}
 			);
 
@@ -130,7 +133,7 @@ export class WebViewDialog extends Modal {
 	}
 
 	private updateDialogBody(): void {
-		this._webview.contents = [this.html];
+		this._webview.contents = this.html;
 	}
 
 	/* espace key */

src/sql/base/browser/ui/selectBox/selectBox.ts

@@ -16,8 +16,8 @@ import nls = require('vs/nls');
 const $ = dom.$;
 
 export interface ISelectBoxStyles extends vsISelectBoxStyles {
-	disabledSelectBackground?: Color,
-	disabledSelectForeground?: Color,
+	disabledSelectBackground?: Color;
+	disabledSelectForeground?: Color;
 	inputValidationInfoBorder?: Color;
 	inputValidationInfoBackground?: Color;
 	inputValidationWarningBorder?: Color;
@@ -46,8 +46,8 @@ export class SelectBox extends vsSelectBox {
 	private inputValidationErrorBackground: Color;
 	private element: HTMLElement;
 
-	constructor(options: string[], selectedOption: string, container?: HTMLElement, contextViewProvider?: IContextViewProvider) {
-		super(options, 0);
+	constructor(options: string[], selectedOption: string, contextViewProvider: IContextViewProvider, container?: HTMLElement) {
+		super(options, 0, contextViewProvider);
 		this._optionsDictionary = new Array();
 		for (var i = 0; i < options.length; i++) {
 			this._optionsDictionary[options[i]] = i;
@@ -115,7 +115,8 @@ export class SelectBox extends vsSelectBox {
 	}
 
 	public enable(): void {
-		this.selectElement.disabled = false;
+		//@SQLTODO
+		//this.selectElement.disabled = false;
 		this.selectBackground = this.enabledSelectBackground;
 		this.selectForeground = this.enabledSelectForeground;
 		this.selectBorder = this.enabledSelectBorder;
@@ -123,7 +124,8 @@ export class SelectBox extends vsSelectBox {
 	}
 
 	public disable(): void {
-		this.selectElement.disabled = true;
+		//@SQLTODO
+		//this.selectElement.disabled = true;
 		this.selectBackground = this.disabledSelectBackground;
 		this.selectForeground = this.disabledSelectForeground;
 		this.selectBorder = this.disabledSelectBorder;