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/base/browser/ui/modal/optionsDialogHelper.ts

@@ -14,7 +14,7 @@ import { InputBox } from 'sql/base/browser/ui/inputBox/inputBox';
 import * as types from 'vs/base/common/types';
 import data = require('data');
 import { localize } from 'vs/nls';
-import { ServiceOptionType } from 'sql/workbench/api/common/sqlExtHostTypes';
+import { ServiceOptionType, ServiceOptionTypeNames } from 'sql/workbench/api/common/sqlExtHostTypes';
 
 export interface IOptionElement {
 	optionWidget: any;
@@ -30,52 +30,51 @@ export function createOptionElement(option: data.ServiceOption, rowContainer: Bu
 	let inputElement: HTMLElement;
 	let missingErrorMessage = localize('missingRequireField', ' is required.');
 	let invalidInputMessage = localize('invalidInput', 'Invalid input.  Numeric value expected.');
-	switch (option.valueType) {
-		case ServiceOptionType.number:
-			optionWidget = new InputBox(rowContainer.getHTMLElement(), contextViewService, {
-				validationOptions: {
-					validation: (value: string) => {
-						if (!value && option.isRequired) {
-							return { type: MessageType.ERROR, content: option.displayName + missingErrorMessage };
-						} else if (!types.isNumber(Number(value))) {
-							return { type: MessageType.ERROR, content: invalidInputMessage };
-						} else {
-							return null;
-						}
+
+	let typeName: string = option.valueType.toString();
+	if (typeName === ServiceOptionTypeNames.number) {
+		optionWidget = new InputBox(rowContainer.getHTMLElement(), contextViewService, {
+			validationOptions: {
+				validation: (value: string) => {
+					if (!value && option.isRequired) {
+						return { type: MessageType.ERROR, content: option.displayName + missingErrorMessage };
+					} else if (!types.isNumber(Number(value))) {
+						return { type: MessageType.ERROR, content: invalidInputMessage };
+					} else {
+						return null;
 					}
 				}
-			});
-			optionWidget.value = optionValue;
-			inputElement = this.findElement(rowContainer, 'input');
-			break;
-		case ServiceOptionType.category:
-		case ServiceOptionType.boolean:
-			optionWidget = new SelectBox(possibleInputs, optionValue.toString());
-			DialogHelper.appendInputSelectBox(rowContainer, optionWidget);
-			inputElement = this.findElement(rowContainer, 'select-box');
-			break;
-		case ServiceOptionType.string:
-		case ServiceOptionType.password:
-			optionWidget = new InputBox(rowContainer.getHTMLElement(), contextViewService, {
-				validationOptions: {
-					validation: (value: string) => (!value && option.isRequired) ? ({ type: MessageType.ERROR, content: option.displayName + missingErrorMessage }) : null
-				}
-			});
-			optionWidget.value = optionValue;
-			if (option.valueType === ServiceOptionType.password) {
-				optionWidget.inputElement.type = 'password';
 			}
-			inputElement = this.findElement(rowContainer, 'input');
+		});
+		optionWidget.value = optionValue;
+		inputElement = this.findElement(rowContainer, 'input');
+	} else if (typeName === ServiceOptionTypeNames.category || typeName === ServiceOptionTypeNames.boolean) {
+		optionWidget = new SelectBox(possibleInputs, optionValue.toString());
+		DialogHelper.appendInputSelectBox(rowContainer, optionWidget);
+		inputElement = this.findElement(rowContainer, 'select-box');
+	} else if (typeName === ServiceOptionTypeNames.string || typeName === ServiceOptionTypeNames.password) {
+		optionWidget = new InputBox(rowContainer.getHTMLElement(), contextViewService, {
+			validationOptions: {
+				validation: (value: string) => (!value && option.isRequired) ? ({ type: MessageType.ERROR, content: option.displayName + missingErrorMessage }) : null
+			}
+		});
+		optionWidget.value = optionValue;
+		if (option.valueType === ServiceOptionType.password) {
+			optionWidget.inputElement.type = 'password';
+		}
+		inputElement = this.findElement(rowContainer, 'input');
 	}
 	optionsMap[option.name] = { optionWidget: optionWidget, option: option, optionValue: optionValue };
 	inputElement.onfocus = () => onFocus(option.name);
 }
 
 export function getOptionValueAndCategoryValues(option: data.ServiceOption, options: { [optionName: string]: any }, possibleInputs: string[]): any {
+
+	let valueTypeName:string = option.valueType.toString();
 	var optionValue = option.defaultValue;
 	if (options[option.name]) {
 		// if the value type is boolean, the option value can be either boolean or string
-		if (option.valueType === ServiceOptionType.boolean) {
+		if (valueTypeName === ServiceOptionTypeNames.boolean) {
 			if (options[option.name] === true || options[option.name] === this.trueInputValue) {
 				optionValue = this.trueInputValue;
 			} else {
@@ -86,13 +85,13 @@ export function getOptionValueAndCategoryValues(option: data.ServiceOption, opti
 		}
 	}
 
-	if (option.valueType === ServiceOptionType.boolean || option.valueType === ServiceOptionType.category) {
+	if (valueTypeName === ServiceOptionTypeNames.boolean || valueTypeName === ServiceOptionTypeNames.category) {
 		// If the option is not required, the empty string should be add at the top of possible choices
 		if (!option.isRequired) {
 			possibleInputs.push('');
 		}
 
-		if (option.valueType === ServiceOptionType.boolean) {
+		if (valueTypeName === ServiceOptionTypeNames.boolean) {
 			possibleInputs.push(this.trueInputValue, this.falseInputValue);
 		} else {
 			option.categoryValues.map(c => possibleInputs.push(c.name));
@@ -112,9 +111,9 @@ export function validateInputs(optionsMap: { [optionName: string]: IOptionElemen
 	for (var optionName in optionsMap) {
 		var optionElement: IOptionElement = optionsMap[optionName];
 		var widget = optionElement.optionWidget;
-		var isInputBox = (optionElement.option.valueType === ServiceOptionType.string ||
-			optionElement.option.valueType === ServiceOptionType.password ||
-			optionElement.option.valueType === ServiceOptionType.number);
+		var isInputBox = (optionElement.option.valueType.toString() === ServiceOptionTypeNames.string ||
+			optionElement.option.valueType.toString() === ServiceOptionTypeNames.password ||
+			optionElement.option.valueType.toString() === ServiceOptionTypeNames.number);
 
 		if (isInputBox) {
 			if (!widget.validate()) {