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/configuration/test/common/configurationModels.test.ts

@@ -3,7 +3,7 @@
  *  Licensed under the Source EULA. See License.txt in the project root for license information.
  *--------------------------------------------------------------------------------------------*/
 import * as assert from 'assert';
-import { ConfigurationModel, DefaultConfigurationModel, ConfigurationChangeEvent, ConfigurationModelParser } from 'vs/platform/configuration/common/configurationModels';
+import { ConfigurationModel, DefaultConfigurationModel, ConfigurationChangeEvent, ConfigurationModelParser, Configuration } from 'vs/platform/configuration/common/configurationModels';
 import { Extensions, IConfigurationRegistry } from 'vs/platform/configuration/common/configurationRegistry';
 import { Registry } from 'vs/platform/registry/common/platform';
 import { URI } from 'vs/base/common/uri';
@@ -466,4 +466,30 @@ suite('ConfigurationChangeEvent', () => {
 		assert.ok(actual.affectsConfiguration('[markdown]', URI.file('file2')));
 	});
 
+});
+
+suite('Configuration', () => {
+
+	test('Test update value', () => {
+		const parser = new ConfigurationModelParser('test');
+		parser.parse(JSON.stringify({ 'a': 1 }));
+		const testObject: Configuration = new Configuration(parser.configurationModel, new ConfigurationModel());
+
+		testObject.updateValue('a', 2);
+
+		assert.equal(testObject.getValue('a', {}, undefined), 2);
+	});
+
+	test('Test update value after inspect', () => {
+		const parser = new ConfigurationModelParser('test');
+		parser.parse(JSON.stringify({ 'a': 1 }));
+		const testObject: Configuration = new Configuration(parser.configurationModel, new ConfigurationModel());
+
+		testObject.inspect('a', {}, undefined);
+		testObject.updateValue('a', 2);
+
+		assert.equal(testObject.getValue('a', {}, undefined), 2);
+	});
+
+
 });

src/vs/platform/configuration/test/node/configurationService.test.ts

@@ -5,7 +5,7 @@
 
 import * as assert from 'assert';
 import * as os from 'os';
-import * as path from 'path';
+import * as path from 'vs/base/common/path';
 import * as fs from 'fs';
 
 import { Registry } from 'vs/platform/registry/common/platform';