Merge VS Code 1.21 source code (#1067)

* Initial VS Code 1.21 file copy with patches

* A few more merges

* Post npm install

* Fix batch of build breaks

* Fix more build breaks

* Fix more build errors

* Fix more build breaks

* Runtime fixes 1

* Get connection dialog working with some todos

* Fix a few packaging issues

* Copy several node_modules to package build to fix loader issues

* Fix breaks from master

* A few more fixes

* Make tests pass

* First pass of license header updates

* Second pass of license header updates

* Fix restore dialog issues

* Remove add additional themes menu items

* fix select box issues where the list doesn't show up

* formatting

* Fix editor dispose issue

* Copy over node modules to correct location on all platforms

src/vs/base/common/resources.ts

@@ -12,9 +12,9 @@ export function basenameOrAuthority(resource: uri): string {
 	return paths.basename(resource.fsPath) || resource.authority;
 }
 
-export function isEqualOrParent(first: uri, second: uri, ignoreCase?: boolean): boolean {
-	if (first.scheme === second.scheme && first.authority === second.authority) {
-		return paths.isEqualOrParent(first.fsPath, second.fsPath, ignoreCase);
+export function isEqualOrParent(resource: uri, candidate: uri, ignoreCase?: boolean): boolean {
+	if (resource.scheme === candidate.scheme && resource.authority === candidate.authority) {
+		return paths.isEqualOrParent(resource.fsPath, candidate.fsPath, ignoreCase);
 	}
 
 	return false;
@@ -38,7 +38,32 @@ export function isEqual(first: uri, second: uri, ignoreCase?: boolean): boolean
 }
 
 export function dirname(resource: uri): uri {
+	const dirname = paths.dirname(resource.path);
+	if (resource.authority && dirname && !paths.isAbsolute(dirname)) {
+		return null; // If a URI contains an authority component, then the path component must either be empty or begin with a slash ("/") character
+	}
+
 	return resource.with({
-		path: paths.dirname(resource.path)
+		path: dirname
 	});
 }
+
+export function distinctParents<T>(items: T[], resourceAccessor: (item: T) => uri): T[] {
+	const distinctParents: T[] = [];
+	for (let i = 0; i < items.length; i++) {
+		const candidateResource = resourceAccessor(items[i]);
+		if (items.some((otherItem, index) => {
+			if (index === i) {
+				return false;
+			}
+
+			return isEqualOrParent(candidateResource, resourceAccessor(otherItem));
+		})) {
+			continue;
+		}
+
+		distinctParents.push(items[i]);
+	}
+
+	return distinctParents;
+}