Vscode merge (#4582)

* Merge from vscode 37cb23d3dd4f9433d56d4ba5ea3203580719a0bd

* fix issues with merges

* bump node version in azpipe

* replace license headers

* remove duplicate launch task

* fix build errors

* fix build errors

* fix tslint issues

* working through package and linux build issues

* more work

* wip

* fix packaged builds

* working through linux build errors

* wip

* wip

* wip

* fix mac and linux file limits

* iterate linux pipeline

* disable editor typing

* revert series to parallel

* remove optimize vscode from linux

* fix linting issues

* revert testing change

* add work round for new node

* readd packaging for extensions

* fix issue with angular not resolving decorator dependencies

src/vs/platform/theme/common/colorRegistry.ts

@@ -27,7 +27,7 @@ export interface ColorContribution {
 
 
 export interface ColorFunction {
-	(theme: ITheme): Color | null;
+	(theme: ITheme): Color | undefined;
 }
 
 export interface ColorDefaults {
@@ -71,7 +71,7 @@ export interface IColorRegistry {
 	/**
 	 * Gets the default color of the given id
 	 */
-	resolveDefaultColor(id: ColorIdentifier, theme: ITheme): Color | null;
+	resolveDefaultColor(id: ColorIdentifier, theme: ITheme): Color | undefined;
 
 	/**
 	 * JSON schema for an object to assign color values to one of the color contributions.
@@ -131,13 +131,13 @@ class ColorRegistry implements IColorRegistry {
 		return Object.keys(this.colorsById).map(id => this.colorsById[id]);
 	}
 
-	public resolveDefaultColor(id: ColorIdentifier, theme: ITheme): Color | null {
-		let colorDesc = this.colorsById[id];
+	public resolveDefaultColor(id: ColorIdentifier, theme: ITheme): Color | undefined {
+		const colorDesc = this.colorsById[id];
 		if (colorDesc && colorDesc.defaults) {
-			let colorValue = colorDesc.defaults[theme.type];
+			const colorValue = colorDesc.defaults[theme.type];
 			return resolveColorValue(colorValue, theme);
 		}
-		return null;
+		return undefined;
 	}
 
 	public getColorSchema(): IJSONSchema {
@@ -229,7 +229,7 @@ export const listActiveSelectionBackground = registerColor('list.activeSelection
 export const listActiveSelectionForeground = registerColor('list.activeSelectionForeground', { dark: Color.white, light: Color.white, hc: null }, nls.localize('listActiveSelectionForeground', "List/Tree foreground color for the selected item when the list/tree is active. An active list/tree has keyboard focus, an inactive does not."));
 export const listInactiveSelectionBackground = registerColor('list.inactiveSelectionBackground', { dark: '#37373D', light: '#E4E6F1', hc: null }, nls.localize('listInactiveSelectionBackground', "List/Tree background color for the selected item when the list/tree is inactive. An active list/tree has keyboard focus, an inactive does not."));
 export const listInactiveSelectionForeground = registerColor('list.inactiveSelectionForeground', { dark: null, light: null, hc: null }, nls.localize('listInactiveSelectionForeground', "List/Tree foreground color for the selected item when the list/tree is inactive. An active list/tree has keyboard focus, an inactive does not."));
-export const listInactiveFocusBackground = registerColor('list.inactiveFocusBackground', { dark: '#313135', light: '#d8dae6', hc: null }, nls.localize('listInactiveFocusBackground', "List/Tree background color for the focused item when the list/tree is inactive. An active list/tree has keyboard focus, an inactive does not."));
+export const listInactiveFocusBackground = registerColor('list.inactiveFocusBackground', { dark: null, light: null, hc: null }, nls.localize('listInactiveFocusBackground', "List/Tree background color for the focused item when the list/tree is inactive. An active list/tree has keyboard focus, an inactive does not."));
 export const listHoverBackground = registerColor('list.hoverBackground', { dark: '#2A2D2E', light: '#F0F0F0', hc: null }, nls.localize('listHoverBackground', "List/Tree background when hovering over items using the mouse."));
 export const listHoverForeground = registerColor('list.hoverForeground', { dark: null, light: null, hc: null }, nls.localize('listHoverForeground', "List/Tree foreground when hovering over items using the mouse."));
 export const listDropBackground = registerColor('list.dropBackground', { dark: listFocusBackground, light: listFocusBackground, hc: null }, nls.localize('listDropBackground', "List/Tree drag and drop background when moving items around using the mouse."));
@@ -259,7 +259,7 @@ export const scrollbarSliderActiveBackground = registerColor('scrollbarSlider.ac
 export const progressBarBackground = registerColor('progressBar.background', { dark: Color.fromHex('#0E70C0'), light: Color.fromHex('#0E70C0'), hc: contrastBorder }, nls.localize('progressBarBackground', "Background color of the progress bar that can show for long running operations."));
 
 export const menuBorder = registerColor('menu.border', { dark: null, light: null, hc: contrastBorder }, nls.localize('menuBorder', "Border color of menus."));
-export const menuForeground = registerColor('menu.foreground', { dark: selectForeground, light: selectForeground, hc: selectForeground }, nls.localize('menuForeground', "Foreground color of menu items."));
+export const menuForeground = registerColor('menu.foreground', { dark: selectForeground, light: foreground, hc: selectForeground }, nls.localize('menuForeground', "Foreground color of menu items."));
 export const menuBackground = registerColor('menu.background', { dark: selectBackground, light: selectBackground, hc: selectBackground }, nls.localize('menuBackground', "Background color of menu items."));
 export const menuSelectionForeground = registerColor('menu.selectionForeground', { dark: listActiveSelectionForeground, light: listActiveSelectionForeground, hc: listActiveSelectionForeground }, nls.localize('menuSelectionForeground', "Foreground color of the selected menu item in menus."));
 export const menuSelectionBackground = registerColor('menu.selectionBackground', { dark: listActiveSelectionBackground, light: listActiveSelectionBackground, hc: listActiveSelectionBackground }, nls.localize('menuSelectionBackground', "Background color of the selected menu item in menus."));
@@ -312,6 +312,7 @@ export const editorFindRangeHighlightBorder = registerColor('editor.findRangeHig
 export const editorHoverHighlight = registerColor('editor.hoverHighlightBackground', { light: '#ADD6FF26', dark: '#264f7840', hc: '#ADD6FF26' }, nls.localize('hoverHighlight', 'Highlight below the word for which a hover is shown. The color must not be opaque so as not to hide underlying decorations.'), true);
 export const editorHoverBackground = registerColor('editorHoverWidget.background', { light: editorWidgetBackground, dark: editorWidgetBackground, hc: editorWidgetBackground }, nls.localize('hoverBackground', 'Background color of the editor hover.'));
 export const editorHoverBorder = registerColor('editorHoverWidget.border', { light: editorWidgetBorder, dark: editorWidgetBorder, hc: editorWidgetBorder }, nls.localize('hoverBorder', 'Border color of the editor hover.'));
+export const editorHoverStatusBarBackground = registerColor('editorHoverWidget.statusBarBackground', { dark: lighten(editorHoverBackground, 0.2), light: darken(editorHoverBackground, 0.05), hc: editorWidgetBackground }, nls.localize('statusBarBackground', "Background color of the editor hover status bar."));
 
 /**
  * Editor link colors
@@ -387,7 +388,7 @@ export function darken(colorValue: ColorValue, factor: number): ColorFunction {
 		if (color) {
 			return color.darken(factor);
 		}
-		return null;
+		return undefined;
 	};
 }
 
@@ -397,7 +398,7 @@ export function lighten(colorValue: ColorValue, factor: number): ColorFunction {
 		if (color) {
 			return color.lighten(factor);
 		}
-		return null;
+		return undefined;
 	};
 }
 
@@ -407,7 +408,7 @@ export function transparent(colorValue: ColorValue, factor: number): ColorFuncti
 		if (color) {
 			return color.transparent(factor);
 		}
-		return null;
+		return undefined;
 	};
 }
 
@@ -419,7 +420,7 @@ export function oneOf(...colorValues: ColorValue[]): ColorFunction {
 				return color;
 			}
 		}
-		return null;
+		return undefined;
 	};
 }
 
@@ -436,7 +437,7 @@ function lessProminent(colorValue: ColorValue, backgroundColorValue: ColorValue,
 			}
 			return from.transparent(factor * transparency);
 		}
-		return null;
+		return undefined;
 	};
 }
 
@@ -445,9 +446,9 @@ function lessProminent(colorValue: ColorValue, backgroundColorValue: ColorValue,
 /**
  * @param colorValue Resolve a color value in the context of a theme
  */
-function resolveColorValue(colorValue: ColorValue | null, theme: ITheme): Color | null {
+function resolveColorValue(colorValue: ColorValue | null, theme: ITheme): Color | undefined {
 	if (colorValue === null) {
-		return null;
+		return undefined;
 	} else if (typeof colorValue === 'string') {
 		if (colorValue[0] === '#') {
 			return Color.fromHex(colorValue);
@@ -458,7 +459,7 @@ function resolveColorValue(colorValue: ColorValue | null, theme: ITheme): Color
 	} else if (typeof colorValue === 'function') {
 		return colorValue(theme);
 	}
-	return null;
+	return undefined;
 }
 
 export const workbenchColorsSchemaId = 'vscode://schemas/workbench-colors';

src/vs/platform/theme/common/styler.ts

@@ -9,7 +9,7 @@ import { IDisposable } from 'vs/base/common/lifecycle';
 import { Color } from 'vs/base/common/color';
 import { mixin } from 'vs/base/common/objects';
 
-export type styleFn = (colors: { [name: string]: Color | null }) => void;
+export type styleFn = (colors: { [name: string]: Color | undefined }) => void;
 
 export interface IStyleOverrides {
 	[color: string]: ColorIdentifier | undefined;
@@ -24,7 +24,7 @@ export interface IColorMapping {
 }
 
 export interface IComputedStyles {
-	[color: string]: Color | null;
+	[color: string]: Color | undefined;
 }
 
 export function computeStyles(theme: ITheme, styleMap: IColorMapping): IComputedStyles {
@@ -327,10 +327,5 @@ export const defaultMenuStyles = <IMenuStyleOverrides>{
 };
 
 export function attachMenuStyler(widget: IThemable, themeService, style?: IMenuStyleOverrides): IDisposable {
-	const styles = { ...defaultMenuStyles, ...style };
-	const fallback: IMenuStyleOverrides = {
-		foregroundColor: !!styles.foregroundColor && !!themeService && !!themeService.getTheme().getColor(styles.foregroundColor) ? styles.foregroundColor : foreground
-	};
-
-	return attachStyler(themeService, { ...styles, ...fallback }, widget);
+	return attachStyler(themeService, { ...defaultMenuStyles, ...style }, widget);
 }

src/vs/platform/theme/common/themeService.ts

@@ -52,7 +52,7 @@ export interface ITheme {
 	 * @param color the id of the color
 	 * @param useDefault specifies if the default color should be used. If not set, the default is used.
 	 */
-	getColor(color: ColorIdentifier, useDefault?: boolean): Color | null;
+	getColor(color: ColorIdentifier, useDefault?: boolean): Color | undefined;
 
 	/**
 	 * Returns whether the theme defines a value for the color. If not, that means the

src/vs/platform/theme/test/common/testThemeService.ts

@@ -12,12 +12,12 @@ export class TestTheme implements ITheme {
 	constructor(private colors: { [id: string]: string; } = {}, public type = DARK) {
 	}
 
-	getColor(color: string, useDefault?: boolean): Color | null {
+	getColor(color: string, useDefault?: boolean): Color | undefined {
 		let value = this.colors[color];
 		if (value) {
 			return Color.fromHex(value);
 		}
-		return null;
+		return undefined;
 	}
 
 	defines(color: string): boolean {

src/vs/platform/theme/test/electron-browser/colorRegistry.releaseTest.ts

@@ -1,130 +0,0 @@
-/*---------------------------------------------------------------------------------------------
- *  Copyright (c) Microsoft Corporation. All rights reserved.
- *  Licensed under the Source EULA. See License.txt in the project root for license information.
- *--------------------------------------------------------------------------------------------*/
-
-import { Registry } from 'vs/platform/registry/common/platform';
-import { IColorRegistry, Extensions, ColorContribution } from 'vs/platform/theme/common/colorRegistry';
-import { editorMarkerNavigationError } from 'vs/editor/contrib/gotoError/gotoErrorWidget';
-import { overviewRulerModifiedForeground } from 'vs/workbench/parts/scm/electron-browser/dirtydiffDecorator';
-import { STATUS_BAR_DEBUGGING_BACKGROUND } from 'vs/workbench/parts/debug/browser/statusbarColorProvider';
-import { debugExceptionWidgetBackground } from 'vs/workbench/parts/debug/browser/exceptionWidget';
-import { debugToolBarBackground } from 'vs/workbench/parts/debug/browser/debugToolbar';
-import { buttonBackground } from 'vs/workbench/parts/welcome/page/electron-browser/welcomePage';
-import { embeddedEditorBackground } from 'vs/workbench/parts/welcome/walkThrough/electron-browser/walkThroughPart';
-import { request, asText } from 'vs/base/node/request';
-import * as pfs from 'vs/base/node/pfs';
-import * as path from 'path';
-import * as assert from 'assert';
-import { getPathFromAmdModule } from 'vs/base/common/amd';
-import { CancellationToken } from 'vs/base/common/cancellation';
-
-
-interface ColorInfo {
-	description: string;
-	offset: number;
-	length: number;
-}
-
-interface DescriptionDiff {
-	docDescription: string;
-	specDescription: string;
-}
-
-// add artificial dependencies to some files that are not loaded yet
-export const forceColorLoad = [editorMarkerNavigationError, overviewRulerModifiedForeground, STATUS_BAR_DEBUGGING_BACKGROUND,
-	debugExceptionWidgetBackground, debugToolBarBackground, buttonBackground, embeddedEditorBackground];
-
-export const experimental: string[] = []; // 'settings.modifiedItemForeground', 'editorUnnecessary.foreground' ];
-
-suite('Color Registry', function () {
-
-	test('all colors documented', async function () {
-		const reqContext = await request({ url: 'https://raw.githubusercontent.com/Microsoft/vscode-docs/vnext/docs/getstarted/theme-color-reference.md' }, CancellationToken.None);
-		const content = (await asText(reqContext))!;
-
-		const expression = /\-\s*\`([\w\.]+)\`: (.*)/g;
-
-		let m: RegExpExecArray | null;
-		let colorsInDoc: { [id: string]: ColorInfo } = Object.create(null);
-		while (m = expression.exec(content)) {
-			colorsInDoc[m[1]] = { description: m[2], offset: m.index, length: m.length };
-		}
-		let missing = Object.create(null);
-		let descriptionDiffs: { [id: string]: DescriptionDiff } = Object.create(null);
-
-		let themingRegistry = Registry.as<IColorRegistry>(Extensions.ColorContribution);
-		for (let color of themingRegistry.getColors()) {
-			if (!colorsInDoc[color.id]) {
-				if (!color.deprecationMessage) {
-					missing[color.id] = getDescription(color);
-				}
-			} else {
-				let docDescription = colorsInDoc[color.id].description;
-				let specDescription = getDescription(color);
-				if (docDescription !== specDescription) {
-					descriptionDiffs[color.id] = { docDescription, specDescription };
-				}
-				delete colorsInDoc[color.id];
-			}
-		}
-		let colorsInExtensions = await getColorsFromExtension();
-		for (let colorId in colorsInExtensions) {
-			if (!colorsInDoc[colorId]) {
-				missing[colorId] = colorsInExtensions[colorId];
-			} else {
-				delete colorsInDoc[colorId];
-			}
-		}
-		for (let colorId of experimental) {
-			if (missing[colorId]) {
-				delete missing[colorId];
-			}
-			if (colorsInDoc[colorId]) {
-				assert.fail(`Color ${colorId} found in doc but marked experimental. Please remove from experimental list.`);
-			}
-		}
-
-		let undocumentedKeys = Object.keys(missing).map(k => `${k}: ${missing[k]}`);
-		assert.deepEqual(undocumentedKeys, [], 'Undocumented colors ids');
-
-		let superfluousKeys = Object.keys(colorsInDoc);
-		assert.deepEqual(superfluousKeys, [], 'Colors ids in doc that do not exist');
-
-	});
-});
-
-function getDescription(color: ColorContribution) {
-	let specDescription = color.description;
-	if (color.deprecationMessage) {
-		specDescription = specDescription + ' ' + color.deprecationMessage;
-	}
-	return specDescription;
-}
-
-async function getColorsFromExtension(): Promise<{ [id: string]: string }> {
-	let extPath = getPathFromAmdModule(require, '../../../../../../extensions');
-	let extFolders = await pfs.readDirsInDir(extPath);
-	let result: { [id: string]: string } = Object.create(null);
-	for (let folder of extFolders) {
-		try {
-			let packageJSON = JSON.parse((await pfs.readFile(path.join(extPath, folder, 'package.json'))).toString());
-			let contributes = packageJSON['contributes'];
-			if (contributes) {
-				let colors = contributes['colors'];
-				if (colors) {
-					for (let color of colors) {
-						let colorId = color['id'];
-						if (colorId) {
-							result[colorId] = colorId['description'];
-						}
-					}
-				}
-			}
-		} catch (e) {
-			// ignore
-		}
-
-	}
-	return result;
-}