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/dashboard/common/dashboardPage.component.ts

@@ -28,7 +28,7 @@ import { IColorTheme } from 'vs/workbench/services/themes/common/workbenchThemeS
 import * as colors from 'vs/platform/theme/common/colorRegistry';
 import * as themeColors from 'vs/workbench/common/theme';
 import { generateUuid } from 'vs/base/common/uuid';
-import * as objects from 'vs/base/common/objects';
+import * as objects from 'sql/base/common/objects';
 import { ConfigurationTarget } from 'vs/platform/configuration/common/configuration';
 
 /**

src/sql/parts/dashboard/dashboardEditor.ts

@@ -75,7 +75,7 @@ export class DashboardEditor extends BaseEditor {
 			return TPromise.wrap(input.initializedPromise.then(() => this.bootstrapAngular(input)));
 		} else {
 			this._dashboardContainer = DOM.append(parentElement, this.input.container);
-			return TPromise.as<void>(null);
+			return TPromise.wrap<void>(null);
 		}
 	}
 

src/sql/parts/dashboard/widgets/insights/views/charts/types/barChart.contribution.ts

@@ -2,7 +2,8 @@
  *  Copyright (c) Microsoft Corporation. All rights reserved.
  *  Licensed under the Source EULA. See License.txt in the project root for license information.
  *--------------------------------------------------------------------------------------------*/
-import { mixin, clone } from 'vs/base/common/objects';
+import { mixin } from 'vs/base/common/objects';
+import { clone } from 'sql/base/common/objects';
 import { IJSONSchema } from 'vs/base/common/jsonSchema';
 import * as nls from 'vs/nls';
 

src/sql/parts/dashboard/widgets/insights/views/charts/types/doughnutChart.contribution.ts

@@ -2,7 +2,8 @@
  *  Copyright (c) Microsoft Corporation. All rights reserved.
  *  Licensed under the Source EULA. See License.txt in the project root for license information.
  *--------------------------------------------------------------------------------------------*/
-import { mixin, clone } from 'vs/base/common/objects';
+import { clone } from 'sql/base/common/objects';
+import { mixin } from 'vs/base/common/objects';
 import { IJSONSchema } from 'vs/base/common/jsonSchema';
 import { registerInsight } from 'sql/platform/dashboard/common/insightRegistry';
 import { chartInsightSchema } from 'sql/parts/dashboard/widgets/insights/views/charts/chartInsight.contribution';

src/sql/parts/dashboard/widgets/insights/views/charts/types/horizontalBarChart.contribution.ts

@@ -2,7 +2,8 @@
  *  Copyright (c) Microsoft Corporation. All rights reserved.
  *  Licensed under the Source EULA. See License.txt in the project root for license information.
  *--------------------------------------------------------------------------------------------*/
-import { mixin, clone } from 'vs/base/common/objects';
+import { clone } from 'sql/base/common/objects';
+import { mixin } from 'vs/base/common/objects';
 import { IJSONSchema } from 'vs/base/common/jsonSchema';
 
 import { registerInsight } from 'sql/platform/dashboard/common/insightRegistry';

src/sql/parts/dashboard/widgets/insights/views/charts/types/lineChart.component.ts

@@ -6,8 +6,8 @@
 import { ChartType, customMixin, defaultChartConfig, IDataSet, IPointDataSet } from 'sql/parts/dashboard/widgets/insights/views/charts/chartInsight.component';
 import BarChart, { IBarChartConfig } from './barChart.component';
 import { memoize, unmemoize } from 'sql/base/common/decorators';
-import { mixin } from 'sql/base/common/objects';
-import { clone } from 'vs/base/common/objects';
+import { mixin } from 'vs/base/common/objects';
+import { clone } from 'sql/base/common/objects';
 
 export enum DataType {
 	Number = 'number',
@@ -93,6 +93,7 @@ export default class LineChart extends BarChart {
 			}
 		};
 
-		this.options = mixin(this.options, options, true, customMixin);
+		// @SQLTODO
+		this.options = mixin(this.options, options, true);
 	}
 }

src/sql/parts/dashboard/widgets/insights/views/charts/types/lineChart.contribution.ts

@@ -2,7 +2,8 @@
  *  Copyright (c) Microsoft Corporation. All rights reserved.
  *  Licensed under the Source EULA. See License.txt in the project root for license information.
  *--------------------------------------------------------------------------------------------*/
-import { mixin, clone } from 'vs/base/common/objects';
+import { mixin } from 'vs/base/common/objects';
+import { clone } from 'sql/base/common/objects';
 import { IJSONSchema } from 'vs/base/common/jsonSchema';
 import * as nls from 'vs/nls';
 

src/sql/parts/dashboard/widgets/insights/views/charts/types/pieChart.contribution.ts

@@ -2,7 +2,8 @@
  *  Copyright (c) Microsoft Corporation. All rights reserved.
  *  Licensed under the Source EULA. See License.txt in the project root for license information.
  *--------------------------------------------------------------------------------------------*/
-import { mixin, clone } from 'vs/base/common/objects';
+import { mixin } from 'vs/base/common/objects';
+import { clone } from 'sql/base/common/objects';
 import { IJSONSchema } from 'vs/base/common/jsonSchema';
 import { registerInsight } from 'sql/platform/dashboard/common/insightRegistry';
 import { chartInsightSchema } from 'sql/parts/dashboard/widgets/insights/views/charts/chartInsight.contribution';

src/sql/parts/dashboard/widgets/insights/views/charts/types/scatterChart.component.ts

@@ -6,7 +6,8 @@
 import { ChartType, defaultChartConfig } from 'sql/parts/dashboard/widgets/insights/views/charts/chartInsight.component';
 import LineChart, { ILineConfig } from './lineChart.component';
 
-import { mixin, clone } from 'vs/base/common/objects';
+import { mixin } from 'vs/base/common/objects';
+import { clone } from 'sql/base/common/objects';
 
 const defaultScatterConfig = mixin(clone(defaultChartConfig), { dataType: 'point', dataDirection: 'horizontal' }) as ILineConfig;
 

src/sql/parts/dashboard/widgets/insights/views/charts/types/scatterChart.contribution.ts

@@ -2,7 +2,8 @@
  *  Copyright (c) Microsoft Corporation. All rights reserved.
  *  Licensed under the Source EULA. See License.txt in the project root for license information.
  *--------------------------------------------------------------------------------------------*/
-import { mixin, clone } from 'vs/base/common/objects';
+import { mixin } from 'vs/base/common/objects';
+import { clone } from 'sql/base/common/objects';
 import { IJSONSchema } from 'vs/base/common/jsonSchema';
 
 import { registerInsight } from 'sql/platform/dashboard/common/insightRegistry';

src/sql/parts/dashboard/widgets/insights/views/charts/types/timeSeriesChart.component.ts

@@ -6,7 +6,8 @@
 import { defaultChartConfig, IPointDataSet, ChartType } from 'sql/parts/dashboard/widgets/insights/views/charts/chartInsight.component';
 import LineChart, { ILineConfig } from './lineChart.component';
 
-import { mixin, clone } from 'vs/base/common/objects';
+import { mixin } from 'vs/base/common/objects';
+import { clone } from 'sql/base/common/objects';
 import { Color } from 'vs/base/common/color';
 
 const defaultTimeSeriesConfig = mixin(clone(defaultChartConfig), { dataType: 'point', dataDirection: 'horizontal' }) as ILineConfig;

src/sql/parts/dashboard/widgets/insights/views/charts/types/timeSeriesChart.contribution.ts

@@ -2,7 +2,8 @@
  *  Copyright (c) Microsoft Corporation. All rights reserved.
  *  Licensed under the Source EULA. See License.txt in the project root for license information.
  *--------------------------------------------------------------------------------------------*/
-import { mixin, clone } from 'vs/base/common/objects';
+import { mixin } from 'vs/base/common/objects';
+import { clone } from 'sql/base/common/objects';
 import { IJSONSchema } from 'vs/base/common/jsonSchema';
 
 import { registerInsight } from 'sql/platform/dashboard/common/insightRegistry';