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

@@ -17,6 +17,7 @@ import { whenDeleted } from 'vs/base/node/pfs';
 import { findFreePort } from 'vs/base/node/ports';
 import { resolveTerminalEncoding } from 'vs/base/node/encoding';
 import * as iconv from 'iconv-lite';
+import { writeFileAndFlushSync } from 'vs/base/node/extfs';
 import { isWindows } from 'vs/base/common/platform';
 
 function shouldSpawnCliProcess(argv: ParsedArgs): boolean {
@@ -56,6 +57,61 @@ export async function main(argv: string[]): TPromise<any> {
 		return mainCli.then(cli => cli.main(args));
 	}
 
+	// Write File
+	else if (args['file-write']) {
+		const source = args._[0];
+		const target = args._[1];
+
+		// Validate
+		if (
+			!source || !target || source === target ||					// make sure source and target are provided and are not the same
+			!paths.isAbsolute(source) || !paths.isAbsolute(target) ||	// make sure both source and target are absolute paths
+			!fs.existsSync(source) || !fs.statSync(source).isFile() ||	// make sure source exists as file
+			!fs.existsSync(target) || !fs.statSync(target).isFile()		// make sure target exists as file
+		) {
+			return TPromise.wrapError(new Error('Using --file-write with invalid arguments.'));
+		}
+
+		try {
+
+			// Check for readonly status and chmod if so if we are told so
+			let targetMode: number;
+			let restoreMode = false;
+			if (!!args['file-chmod']) {
+				targetMode = fs.statSync(target).mode;
+				if (!(targetMode & 128) /* readonly */) {
+					fs.chmodSync(target, targetMode | 128);
+					restoreMode = true;
+				}
+			}
+
+			// Write source to target
+			const data = fs.readFileSync(source);
+			try {
+				writeFileAndFlushSync(target, data);
+			} catch (error) {
+				// On Windows and if the file exists with an EPERM error, we try a different strategy of saving the file
+				// by first truncating the file and then writing with r+ mode. This helps to save hidden files on Windows
+				// (see https://github.com/Microsoft/vscode/issues/931)
+				if (isWindows && error.code === 'EPERM') {
+					fs.truncateSync(target, 0);
+					writeFileAndFlushSync(target, data, { flag: 'r+' });
+				} else {
+					throw error;
+				}
+			}
+
+			// Restore previous mode as needed
+			if (restoreMode) {
+				fs.chmodSync(target, targetMode);
+			}
+		} catch (error) {
+			return TPromise.wrapError(new Error(`Using --file-write resulted in an error: ${error}`));
+		}
+
+		return TPromise.as(null);
+	}
+
 	// Just Code
 	else {
 		const env = assign({}, process.env, {
@@ -67,7 +123,7 @@ export async function main(argv: string[]): TPromise<any> {
 
 		const processCallbacks: ((child: ChildProcess) => Thenable<any>)[] = [];
 
-		const verbose = args.verbose || args.status;
+		const verbose = args.verbose || args.status || typeof args['upload-logs'] !== 'undefined';
 		if (verbose) {
 			env['ELECTRON_ENABLE_LOGGING'] = '1';
 
@@ -86,17 +142,20 @@ export async function main(argv: string[]): TPromise<any> {
 			// Windows workaround for https://github.com/nodejs/node/issues/11656
 		}
 
+		const readFromStdin = args._.some(a => a === '-');
+		if (readFromStdin) {
+			// remove the "-" argument when we read from stdin
+			args._ = args._.filter(a => a !== '-');
+			argv = argv.filter(a => a !== '-');
+		}
+
 		let stdinFilePath: string;
 		if (stdinWithoutTty) {
 
 			// Read from stdin: we require a single "-" argument to be passed in order to start reading from
 			// stdin. We do this because there is no reliable way to find out if data is piped to stdin. Just
 			// checking for stdin being connected to a TTY is not enough (https://github.com/Microsoft/vscode/issues/40351)
-			if (args._.length === 1 && args._[0] === '-') {
-
-				// remove the "-" argument when we read from stdin
-				args._ = [];
-				argv = argv.filter(a => a !== '-');
+			if (args._.length === 0 && readFromStdin) {
 
 				// prepare temp file to read stdin to
 				stdinFilePath = paths.join(os.tmpdir(), `code-stdin-${Math.random().toString(36).replace(/[^a-z]+/g, '').substr(0, 3)}.txt`);
@@ -247,12 +306,21 @@ export async function main(argv: string[]): TPromise<any> {
 			});
 		}
 
+		if (args['js-flags']) {
+			const match = /max_old_space_size=(\d+)/g.exec(args['js-flags']);
+			if (match && !args['max-memory']) {
+				argv.push(`--max-memory=${match[1]}`);
+			}
+		}
+
 		const options = {
 			detached: true,
 			env
 		};
 
-		if (!verbose) {
+		if (typeof args['upload-logs'] !== undefined) {
+			options['stdio'] = ['pipe', 'pipe', 'pipe'];
+		} else if (!verbose) {
 			options['stdio'] = 'ignore';
 		}
 
@@ -288,6 +356,6 @@ function eventuallyExit(code: number): void {
 main(process.argv)
 	.then(() => eventuallyExit(0))
 	.then(null, err => {
-		console.error(err.stack ? err.stack : err);
+		console.error(err.message || err.stack || err);
 		eventuallyExit(1);
 	});

src/vs/code/node/cliProcessMain.ts

@@ -30,14 +30,14 @@ import { IConfigurationService } from 'vs/platform/configuration/common/configur
 import { ConfigurationService } from 'vs/platform/configuration/node/configurationService';
 import { AppInsightsAppender } from 'vs/platform/telemetry/node/appInsightsAppender';
 import { mkdirp, writeFile } from 'vs/base/node/pfs';
-import { IChoiceService } from 'vs/platform/message/common/message';
-import { ChoiceCliService } from 'vs/platform/message/node/messageCli';
 import { getBaseLabel } from 'vs/base/common/labels';
 import { IStateService } from 'vs/platform/state/common/state';
 import { StateService } from 'vs/platform/state/node/stateService';
-import { createLogService } from 'vs/platform/log/node/spdlogService';
-import { ILogService } from 'vs/platform/log/common/log';
+import { createSpdLogService } from 'vs/platform/log/node/spdlogService';
+import { ILogService, getLogLevel } from 'vs/platform/log/common/log';
 import { isPromiseCanceledError } from 'vs/base/common/errors';
+import { IChoiceService } from 'vs/platform/dialogs/common/dialogs';
+import { ChoiceCliService } from 'vs/platform/dialogs/node/choiceCli';
 
 const notFound = (id: string) => localize('notFound', "Extension '{0}' not found.", id);
 const notInstalled = (id: string) => localize('notInstalled', "Extension '{0}' is not installed.", id);
@@ -196,7 +196,7 @@ export function main(argv: ParsedArgs): TPromise<void> {
 	const services = new ServiceCollection();
 
 	const environmentService = new EnvironmentService(argv, process.execPath);
-	const logService = createLogService('cli', environmentService);
+	const logService = createSpdLogService('cli', getLogLevel(environmentService), environmentService.logsPath);
 	process.once('exit', () => logService.dispose());
 
 	logService.info('main', argv);