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/vs/base/test/node/glob.test.ts

@@ -416,7 +416,7 @@ suite('Glob', () => {
 
 		assert.strictEqual(glob.match(expression, 'test.js', () => siblings), null);
 
-		expression = <any>{
+		expression = {
 			'**/*.js': {
 			}
 		};
@@ -460,6 +460,46 @@ suite('Glob', () => {
 		assert(!glob.match(p, 'foo.8'));
 		assert(!glob.match(p, 'bar.5'));
 		assert(glob.match(p, 'foo.f'));
+
+		p = 'foo.[!0-9]';
+
+		assert(!glob.match(p, 'foo.5'));
+		assert(!glob.match(p, 'foo.8'));
+		assert(!glob.match(p, 'bar.5'));
+		assert(glob.match(p, 'foo.f'));
+
+		p = 'foo.[0!^*?]';
+
+		assert(!glob.match(p, 'foo.5'));
+		assert(!glob.match(p, 'foo.8'));
+		assert(glob.match(p, 'foo.0'));
+		assert(glob.match(p, 'foo.!'));
+		assert(glob.match(p, 'foo.^'));
+		assert(glob.match(p, 'foo.*'));
+		assert(glob.match(p, 'foo.?'));
+
+		p = 'foo[/]bar';
+
+		assert(!glob.match(p, 'foo/bar'));
+
+		p = 'foo.[[]';
+
+		assert(glob.match(p, 'foo.['));
+
+		p = 'foo.[]]';
+
+		assert(glob.match(p, 'foo.]'));
+
+		p = 'foo.[][!]';
+
+		assert(glob.match(p, 'foo.]'));
+		assert(glob.match(p, 'foo.['));
+		assert(glob.match(p, 'foo.!'));
+
+		p = 'foo.[]-]';
+
+		assert(glob.match(p, 'foo.]'));
+		assert(glob.match(p, 'foo.-'));
 	});
 
 	test('full path', function () {
@@ -867,35 +907,16 @@ suite('Glob', () => {
 		return slashPath.replace(/\//g, path.sep);
 	}
 
-	test('mergeExpressions', () => {
-		// Empty => empty
-		assert.deepEqual(glob.mergeExpressions(), glob.getEmptyExpression());
-
-		// Doesn't modify given expressions
-		const expr1 = { 'a': true };
-		glob.mergeExpressions(expr1, { 'b': true });
-		assert.deepEqual(expr1, { 'a': true });
-
-		// Merges correctly
-		assert.deepEqual(glob.mergeExpressions({ 'a': true }, { 'b': true }), { 'a': true, 'b': true });
-
-		// Ignores null/undefined portions
-		assert.deepEqual(glob.mergeExpressions(undefined, { 'a': true }, null, { 'b': true }), { 'a': true, 'b': true });
-
-		// Later expressions take precedence
-		assert.deepEqual(glob.mergeExpressions({ 'a': true, 'b': false, 'c': true }, { 'a': false, 'b': true }), { 'a': false, 'b': true, 'c': true });
-	});
-
 	test('relative pattern - glob star', function () {
 		if (isWindows) {
-			let p = { base: 'C:\\DNXConsoleApp\\foo', pattern: '**/*.cs' };
+			let p: glob.IRelativePattern = { base: 'C:\\DNXConsoleApp\\foo', pattern: '**/*.cs', pathToRelative: (from, to) => path.relative(from, to) };
 			assert(glob.match(p, 'C:\\DNXConsoleApp\\foo\\Program.cs'));
 			assert(glob.match(p, 'C:\\DNXConsoleApp\\foo\\bar\\Program.cs'));
 			assert(!glob.match(p, 'C:\\DNXConsoleApp\\foo\\Program.ts'));
 			assert(!glob.match(p, 'C:\\DNXConsoleApp\\Program.cs'));
 			assert(!glob.match(p, 'C:\\other\\DNXConsoleApp\\foo\\Program.ts'));
 		} else {
-			let p: glob.IRelativePattern = { base: '/DNXConsoleApp/foo', pattern: '**/*.cs' };
+			let p: glob.IRelativePattern = { base: '/DNXConsoleApp/foo', pattern: '**/*.cs', pathToRelative: (from, to) => path.relative(from, to) };
 			assert(glob.match(p, '/DNXConsoleApp/foo/Program.cs'));
 			assert(glob.match(p, '/DNXConsoleApp/foo/bar/Program.cs'));
 			assert(!glob.match(p, '/DNXConsoleApp/foo/Program.ts'));
@@ -906,14 +927,14 @@ suite('Glob', () => {
 
 	test('relative pattern - single star', function () {
 		if (isWindows) {
-			let p = { base: 'C:\\DNXConsoleApp\\foo', pattern: '*.cs' };
+			let p: glob.IRelativePattern = { base: 'C:\\DNXConsoleApp\\foo', pattern: '*.cs', pathToRelative: (from, to) => path.relative(from, to) };
 			assert(glob.match(p, 'C:\\DNXConsoleApp\\foo\\Program.cs'));
 			assert(!glob.match(p, 'C:\\DNXConsoleApp\\foo\\bar\\Program.cs'));
 			assert(!glob.match(p, 'C:\\DNXConsoleApp\\foo\\Program.ts'));
 			assert(!glob.match(p, 'C:\\DNXConsoleApp\\Program.cs'));
 			assert(!glob.match(p, 'C:\\other\\DNXConsoleApp\\foo\\Program.ts'));
 		} else {
-			let p: glob.IRelativePattern = { base: '/DNXConsoleApp/foo', pattern: '*.cs' };
+			let p: glob.IRelativePattern = { base: '/DNXConsoleApp/foo', pattern: '*.cs', pathToRelative: (from, to) => path.relative(from, to) };
 			assert(glob.match(p, '/DNXConsoleApp/foo/Program.cs'));
 			assert(!glob.match(p, '/DNXConsoleApp/foo/bar/Program.cs'));
 			assert(!glob.match(p, '/DNXConsoleApp/foo/Program.ts'));
@@ -924,11 +945,11 @@ suite('Glob', () => {
 
 	test('relative pattern - single star with path', function () {
 		if (isWindows) {
-			let p = { base: 'C:\\DNXConsoleApp\\foo', pattern: 'something/*.cs' };
+			let p: glob.IRelativePattern = { base: 'C:\\DNXConsoleApp\\foo', pattern: 'something/*.cs', pathToRelative: (from, to) => path.relative(from, to) };
 			assert(glob.match(p, 'C:\\DNXConsoleApp\\foo\\something\\Program.cs'));
 			assert(!glob.match(p, 'C:\\DNXConsoleApp\\foo\\Program.cs'));
 		} else {
-			let p: glob.IRelativePattern = { base: '/DNXConsoleApp/foo', pattern: 'something/*.cs' };
+			let p: glob.IRelativePattern = { base: '/DNXConsoleApp/foo', pattern: 'something/*.cs', pathToRelative: (from, to) => path.relative(from, to) };
 			assert(glob.match(p, '/DNXConsoleApp/foo/something/Program.cs'));
 			assert(!glob.match(p, '/DNXConsoleApp/foo/Program.cs'));
 		}