From 5874111ef297fd005d30bf6a31f046f0ebe5ac2a Mon Sep 17 00:00:00 2001
From: Benjamin Pasero <benjpas@microsoft.com>
Date: Fri, 23 Sep 2016 12:15:23 +0200
Subject: [PATCH] --verbose tweaks

---
 src/vs/code/electron-main/launch.ts | 2 +-
 src/vs/code/electron-main/log.ts    | 2 +-
 src/vs/code/electron-main/main.ts   | 5 +++--
 src/vs/code/node/cli.ts             | 8 +++++++-
 4 files changed, 12 insertions(+), 5 deletions(-)

diff --git a/src/vs/code/electron-main/launch.ts b/src/vs/code/electron-main/launch.ts
index d2485997bd0..99678232b30 100644
--- a/src/vs/code/electron-main/launch.ts
+++ b/src/vs/code/electron-main/launch.ts
@@ -56,7 +56,7 @@ export class LaunchService implements ILaunchService {
 	) {}
 
 	start(args: ICommandLineArguments, userEnv: IProcessEnvironment): TPromise<void> {
-		this.logService.log('Received data from other instance', args, userEnv);
+		this.logService.log('Received data from other instance: ', args, userEnv);
 
 		// Otherwise handle in windows service
 		let usedWindows: VSCodeWindow[];
diff --git a/src/vs/code/electron-main/log.ts b/src/vs/code/electron-main/log.ts
index c281e1a8e38..352363d63ca 100644
--- a/src/vs/code/electron-main/log.ts
+++ b/src/vs/code/electron-main/log.ts
@@ -26,7 +26,7 @@ export class MainLogService implements ILogService {
 		const { verbose } = this.envService.cliArgs;
 
 		if (verbose) {
-			console.log(`(${new Date().toLocaleTimeString()})`, ...args);
+			console.log(`\x1b[93m[main ${new Date().toLocaleTimeString()}]\x1b[0m`, ...args);
 		}
 	}
 }
\ No newline at end of file
diff --git a/src/vs/code/electron-main/main.ts b/src/vs/code/electron-main/main.ts
index 3a15129ab3b..122121e8d6a 100644
--- a/src/vs/code/electron-main/main.ts
+++ b/src/vs/code/electron-main/main.ts
@@ -99,8 +99,9 @@ function main(accessor: ServicesAccessor, mainIpcServer: Server, userEnv: IProce
 		}
 	});
 
-	logService.log('### VSCode main.js ###');
-	logService.log(envService.appRoot, envService.cliArgs);
+	logService.log('Starting VS Code in verbose mode');
+	logService.log(`from: ${envService.appRoot}`);
+	logService.log('args:', envService.cliArgs);
 
 	// Setup Windows mutex
 	let windowsMutex: Mutex = null;
diff --git a/src/vs/code/node/cli.ts b/src/vs/code/node/cli.ts
index 18e6d60018c..7097b5db30e 100644
--- a/src/vs/code/node/cli.ts
+++ b/src/vs/code/node/cli.ts
@@ -41,12 +41,18 @@ export function main(argv: string[]): TPromise<void> {
 			'VSCODE_CLI': '1',
 			'ELECTRON_NO_ATTACH_CONSOLE': '1'
 		});
+
 		delete env['ELECTRON_RUN_AS_NODE'];
 
-		let options = {
+		if (args.verbose) {
+			env['ELECTRON_ENABLE_LOGGING'] = '1';
+		}
+
+		const options = {
 			detached: true,
 			env,
 		};
+
 		if (!args.verbose) {
 			options['stdio'] = 'ignore';
 		}
-- 
GitLab