From 98fd5aa1e5d9781391edbdf2472d1ffd6fa4fbbf Mon Sep 17 00:00:00 2001
From: Benjamin Pasero <benjpas@microsoft.com>
Date: Wed, 17 Aug 2016 11:56:02 +0200
Subject: [PATCH] cli: verboseLogging => verbose

---
 src/vs/code/electron-main/env.ts              | 4 ++--
 src/vs/code/electron-main/log.ts              | 4 ++--
 src/vs/code/electron-main/main.ts             | 2 +-
 src/vs/code/electron-main/storage.ts          | 4 ++--
 src/vs/code/electron-main/window.ts           | 2 +-
 src/vs/code/electron-main/windows.ts          | 2 +-
 src/vs/platform/workspace/common/workspace.ts | 1 -
 7 files changed, 9 insertions(+), 10 deletions(-)

diff --git a/src/vs/code/electron-main/env.ts b/src/vs/code/electron-main/env.ts
index 9e0c5cd3641..bb198565d8d 100644
--- a/src/vs/code/electron-main/env.ts
+++ b/src/vs/code/electron-main/env.ts
@@ -28,7 +28,7 @@ export interface IProcessEnvironment {
 }
 
 export interface ICommandLineArguments {
-	verboseLogging: boolean;
+	verbose: boolean;
 	debugExtensionHostPort: number;
 	debugBrkExtensionHost: boolean;
 	debugBrkFileWatcherPort: number;
@@ -170,7 +170,7 @@ export class EnvService implements IEnvService {
 			pathArguments: pathArguments,
 			programStart: types.isNumber(timestamp) ? timestamp : 0,
 			enablePerformance: argv.performance,
-			verboseLogging: argv.verbose,
+			verbose: argv.verbose,
 			debugExtensionHostPort: debugBrkExtensionHostPort || debugExtensionHostPort,
 			debugBrkExtensionHost: !!debugBrkExtensionHostPort,
 			logExtensionHostCommunication: argv.logExtensionHostCommunication,
diff --git a/src/vs/code/electron-main/log.ts b/src/vs/code/electron-main/log.ts
index b8f4865d6c1..e7e0667f986 100644
--- a/src/vs/code/electron-main/log.ts
+++ b/src/vs/code/electron-main/log.ts
@@ -23,9 +23,9 @@ export class MainLogService implements ILogService {
 	}
 
 	log(...args: any[]): void {
-		const { verboseLogging } = this.envService.cliArgs;
+		const { verbose } = this.envService.cliArgs;
 
-		if (verboseLogging) {
+		if (verbose) {
 			console.log(`(${new Date().toLocaleTimeString()})`, ...args);
 		}
 	}
diff --git a/src/vs/code/electron-main/main.ts b/src/vs/code/electron-main/main.ts
index 65f9cdab447..3f3af241774 100644
--- a/src/vs/code/electron-main/main.ts
+++ b/src/vs/code/electron-main/main.ts
@@ -122,7 +122,7 @@ function main(accessor: ServicesAccessor, mainIpcServer: Server, userEnv: IProce
 
 	// Spawn shared process
 	const sharedProcess = spawnSharedProcess({
-		allowOutput: !envService.isBuilt || envService.cliArgs.verboseLogging,
+		allowOutput: !envService.isBuilt || envService.cliArgs.verbose,
 		debugPort: envService.isBuilt ? null : 5871
 	});
 
diff --git a/src/vs/code/electron-main/storage.ts b/src/vs/code/electron-main/storage.ts
index 22f8977d7eb..943d4a93679 100644
--- a/src/vs/code/electron-main/storage.ts
+++ b/src/vs/code/electron-main/storage.ts
@@ -93,7 +93,7 @@ export class StorageService implements IStorageService {
 		try {
 			return JSON.parse(fs.readFileSync(this.dbPath).toString()); // invalid JSON or permission issue can happen here
 		} catch (error) {
-			if (this.envService.cliArgs.verboseLogging) {
+			if (this.envService.cliArgs.verbose) {
 				console.error(error);
 			}
 
@@ -105,7 +105,7 @@ export class StorageService implements IStorageService {
 		try {
 			fs.writeFileSync(this.dbPath, JSON.stringify(this.database, null, 4)); // permission issue can happen here
 		} catch (error) {
-			if (this.envService.cliArgs.verboseLogging) {
+			if (this.envService.cliArgs.verbose) {
 				console.error(error);
 			}
 		}
diff --git a/src/vs/code/electron-main/window.ts b/src/vs/code/electron-main/window.ts
index 00b71c40f8b..36760003d0d 100644
--- a/src/vs/code/electron-main/window.ts
+++ b/src/vs/code/electron-main/window.ts
@@ -408,7 +408,7 @@ export class VSCodeWindow {
 		// Some configuration things get inherited if the window is being reloaded and we are
 		// in plugin development mode. These options are all development related.
 		if (this.isPluginDevelopmentHost && cli) {
-			configuration.verboseLogging = cli.verboseLogging;
+			configuration.verbose = cli.verbose;
 			configuration.logExtensionHostCommunication = cli.logExtensionHostCommunication;
 			configuration.debugBrkFileWatcherPort = cli.debugBrkFileWatcherPort;
 			configuration.debugExtensionHostPort = cli.debugExtensionHostPort;
diff --git a/src/vs/code/electron-main/windows.ts b/src/vs/code/electron-main/windows.ts
index eea05a9767f..77766b09a4c 100644
--- a/src/vs/code/electron-main/windows.ts
+++ b/src/vs/code/electron-main/windows.ts
@@ -923,7 +923,7 @@ export class WindowsManager implements IWindowsService {
 			let currentWindowConfig = vscodeWindow.config;
 			if (!configuration.extensionDevelopmentPath && currentWindowConfig && !!currentWindowConfig.extensionDevelopmentPath) {
 				configuration.extensionDevelopmentPath = currentWindowConfig.extensionDevelopmentPath;
-				configuration.verboseLogging = currentWindowConfig.verboseLogging;
+				configuration.verbose = currentWindowConfig.verbose;
 				configuration.logExtensionHostCommunication = currentWindowConfig.logExtensionHostCommunication;
 				configuration.debugBrkFileWatcherPort = currentWindowConfig.debugBrkFileWatcherPort;
 				configuration.debugBrkExtensionHost = currentWindowConfig.debugBrkExtensionHost;
diff --git a/src/vs/platform/workspace/common/workspace.ts b/src/vs/platform/workspace/common/workspace.ts
index 0506f910289..a8abedaf6fc 100644
--- a/src/vs/platform/workspace/common/workspace.ts
+++ b/src/vs/platform/workspace/common/workspace.ts
@@ -124,7 +124,6 @@ export interface IEnvironment {
 
 	logExtensionHostCommunication: boolean;
 	debugBrkFileWatcherPort: number;
-	verboseLogging: boolean;
 	enablePerformance: boolean;
 
 	userExtensionsHome: string;