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/node/zip.ts

@@ -10,7 +10,7 @@ import { Readable } from 'stream';
 import { nfcall, ninvoke, SimpleThrottler } from 'vs/base/common/async';
 import { mkdirp, rimraf } from 'vs/base/node/pfs';
 import { TPromise } from 'vs/base/common/winjs.base';
-import { open as openZip, Entry, ZipFile } from 'yauzl';
+import { open as _openZip, Entry, ZipFile } from 'yauzl';
 
 export interface IExtractOptions {
 	overwrite?: boolean;
@@ -26,6 +26,29 @@ interface IOptions {
 	sourcePathRegex: RegExp;
 }
 
+export enum ExtractErrorType {
+	Undefined,
+	CorruptZip
+}
+
+export class ExtractError extends Error {
+
+	readonly type: ExtractErrorType;
+	readonly cause: Error;
+
+	constructor(type: ExtractErrorType, cause: Error) {
+		let message = cause.message;
+
+		switch (type) {
+			case ExtractErrorType.CorruptZip: message = `Corrupt ZIP: ${message}`; break;
+		}
+
+		super(message);
+		this.type = type;
+		this.cause = cause;
+	}
+}
+
 function modeFromEntry(entry: Entry) {
 	let attr = entry.externalFileAttributes >> 16 || 33188;
 
@@ -34,6 +57,18 @@ function modeFromEntry(entry: Entry) {
 		.reduce((a, b) => a + b, attr & 61440 /* S_IFMT */);
 }
 
+function toExtractError(err: Error): ExtractError {
+	let type = ExtractErrorType.CorruptZip;
+
+	console.log('WHAT');
+
+	if (/end of central directory record signature not found/.test(err.message)) {
+		type = ExtractErrorType.CorruptZip;
+	}
+
+	return new ExtractError(type, err);
+}
+
 function extractEntry(stream: Readable, fileName: string, mode: number, targetPath: string, options: IOptions): TPromise<void> {
 	const dirName = path.dirname(fileName);
 	const targetDirName = path.join(targetPath, dirName);
@@ -74,13 +109,18 @@ function extractZip(zipfile: ZipFile, targetPath: string, options: IOptions): TP
 
 			last = throttler.queue(() => stream.then(stream => extractEntry(stream, fileName, mode, targetPath, options)));
 		});
-	});
+	}).then(null, err => TPromise.wrapError(toExtractError(err)));
+}
+
+function openZip(zipFile: string): TPromise<ZipFile> {
+	return nfcall<ZipFile>(_openZip, zipFile)
+		.then(null, err => TPromise.wrapError(toExtractError(err)));
 }
 
 export function extract(zipPath: string, targetPath: string, options: IExtractOptions = {}): TPromise<void> {
 	const sourcePathRegex = new RegExp(options.sourcePath ? `^${options.sourcePath}` : '');
 
-	let promise = nfcall<ZipFile>(openZip, zipPath);
+	let promise = openZip(zipPath);
 
 	if (options.overwrite) {
 		promise = promise.then(zipfile => rimraf(targetPath).then(() => zipfile));
@@ -90,7 +130,7 @@ export function extract(zipPath: string, targetPath: string, options: IExtractOp
 }
 
 function read(zipPath: string, filePath: string): TPromise<Readable> {
-	return nfcall(openZip, zipPath).then((zipfile: ZipFile) => {
+	return openZip(zipPath).then(zipfile => {
 		return new TPromise<Readable>((c, e) => {
 			zipfile.on('entry', (entry: Entry) => {
 				if (entry.fileName === filePath) {