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/workbench/api/common/configurationExtensionPoint.ts

@@ -91,8 +91,7 @@ const defaultConfigurationExtPoint = ExtensionsRegistry.registerExtensionPoint<I
 				$ref: editorConfigurationSchemaId,
 			}
 		}
-	},
-	isDynamic: true
+	}
 });
 defaultConfigurationExtPoint.setHandler((extensions, { added, removed }) => {
 	if (removed.length) {
@@ -134,8 +133,7 @@ const configurationExtPoint = ExtensionsRegistry.registerExtensionPoint<IConfigu
 				items: configurationEntrySchema
 			}
 		]
-	},
-	isDynamic: true
+	}
 });
 
 const extensionConfigurations: Map<string, IConfigurationNode[]> = new Map<string, IConfigurationNode[]>();

src/vs/workbench/api/common/jsonValidationExtensionPoint.ts

@@ -0,0 +1,81 @@
+/*---------------------------------------------------------------------------------------------
+ *  Copyright (c) Microsoft Corporation. All rights reserved.
+ *  Licensed under the Source EULA. See License.txt in the project root for license information.
+ *--------------------------------------------------------------------------------------------*/
+
+import * as nls from 'vs/nls';
+import { ExtensionsRegistry } from 'vs/workbench/services/extensions/common/extensionsRegistry';
+import * as strings from 'vs/base/common/strings';
+import * as resources from 'vs/base/common/resources';
+
+interface IJSONValidationExtensionPoint {
+	fileMatch: string;
+	url: string;
+}
+
+const configurationExtPoint = ExtensionsRegistry.registerExtensionPoint<IJSONValidationExtensionPoint[]>({
+	extensionPoint: 'jsonValidation',
+	defaultExtensionKind: 'workspace',
+	jsonSchema: {
+		description: nls.localize('contributes.jsonValidation', 'Contributes json schema configuration.'),
+		type: 'array',
+		defaultSnippets: [{ body: [{ fileMatch: '${1:file.json}', url: '${2:url}' }] }],
+		items: {
+			type: 'object',
+			defaultSnippets: [{ body: { fileMatch: '${1:file.json}', url: '${2:url}' } }],
+			properties: {
+				fileMatch: {
+					type: 'string',
+					description: nls.localize('contributes.jsonValidation.fileMatch', 'The file pattern to match, for example "package.json" or "*.launch".'),
+				},
+				url: {
+					description: nls.localize('contributes.jsonValidation.url', 'A schema URL (\'http:\', \'https:\') or relative path to the extension folder (\'./\').'),
+					type: 'string'
+				}
+			}
+		}
+	}
+});
+
+export class JSONValidationExtensionPoint {
+
+	constructor() {
+		configurationExtPoint.setHandler((extensions) => {
+			for (const extension of extensions) {
+				const extensionValue = <IJSONValidationExtensionPoint[]>extension.value;
+				const collector = extension.collector;
+				const extensionLocation = extension.description.extensionLocation;
+
+				if (!extensionValue || !Array.isArray(extensionValue)) {
+					collector.error(nls.localize('invalid.jsonValidation', "'configuration.jsonValidation' must be a array"));
+					return;
+				}
+				extensionValue.forEach(extension => {
+					if (typeof extension.fileMatch !== 'string') {
+						collector.error(nls.localize('invalid.fileMatch', "'configuration.jsonValidation.fileMatch' must be defined"));
+						return;
+					}
+					let uri = extension.url;
+					if (typeof extension.url !== 'string') {
+						collector.error(nls.localize('invalid.url', "'configuration.jsonValidation.url' must be a URL or relative path"));
+						return;
+					}
+					if (strings.startsWith(uri, './')) {
+						try {
+							const colorThemeLocation = resources.joinPath(extensionLocation, uri);
+							if (!resources.isEqualOrParent(colorThemeLocation, extensionLocation)) {
+								collector.warn(nls.localize('invalid.path.1', "Expected `contributes.{0}.url` ({1}) to be included inside extension's folder ({2}). This might make the extension non-portable.", configurationExtPoint.name, colorThemeLocation.toString(), extensionLocation.path));
+							}
+						} catch (e) {
+							collector.error(nls.localize('invalid.url.fileschema', "'configuration.jsonValidation.url' is an invalid relative URL: {0}", e.message));
+						}
+					} else if (!strings.startsWith(uri, 'https:/') && strings.startsWith(uri, 'https:/')) {
+						collector.error(nls.localize('invalid.url.schema', "'configuration.jsonValidation.url' must start with 'http:', 'https:' or './' to reference schemas located in the extension"));
+						return;
+					}
+				});
+			}
+		});
+	}
+
+}

src/vs/workbench/api/common/menusExtensionPoint.ts

@@ -34,6 +34,7 @@ namespace schema {
 			case 'explorer/context': return MenuId.ExplorerContext;
 			case 'editor/title/context': return MenuId.EditorTitleContext;
 			case 'debug/callstack/context': return MenuId.DebugCallStackContext;
+			case 'debug/toolbar': return MenuId.DebugToolbar;
 			case 'scm/title': return MenuId.SCMTitle;
 			case 'scm/sourceControl': return MenuId.SCMSourceControl;
 			case 'scm/resourceGroup/context': return MenuId.SCMResourceGroupContext;
@@ -139,6 +140,11 @@ namespace schema {
 				type: 'array',
 				items: menuItem
 			},
+			'debug/toolbar': {
+				description: localize('menus.debugToolbar', "The debug toolbar menu"),
+				type: 'array',
+				items: menuItem
+			},
 			'scm/title': {
 				description: localize('menus.scmTitle', "The Source Control title menu"),
 				type: 'array',
@@ -286,8 +292,7 @@ let _commandRegistrations: IDisposable[] = [];
 
 ExtensionsRegistry.registerExtensionPoint<schema.IUserFriendlyCommand | schema.IUserFriendlyCommand[]>({
 	extensionPoint: 'commands',
-	jsonSchema: schema.commandsContribution,
-	isDynamic: true
+	jsonSchema: schema.commandsContribution
 }).setHandler(extensions => {
 
 	function handleCommand(userFriendlyCommand: schema.IUserFriendlyCommand, extension: IExtensionPointUser<any>, disposables: IDisposable[]) {
@@ -336,8 +341,7 @@ let _menuRegistrations: IDisposable[] = [];
 
 ExtensionsRegistry.registerExtensionPoint<{ [loc: string]: schema.IUserFriendlyMenuItem[] }>({
 	extensionPoint: 'menus',
-	jsonSchema: schema.menusContribtion,
-	isDynamic: true
+	jsonSchema: schema.menusContribtion
 }).setHandler(extensions => {
 
 	// remove all previous menu registrations