From 1d81fbfbdf3617f555f89d5bfbbe0cfeedd00621 Mon Sep 17 00:00:00 2001
From: Benjamin Pasero <benjpas@microsoft.com>
Date: Wed, 17 Aug 2016 14:10:31 +0200
Subject: [PATCH] use logExtensionHostCommunication from env service

---
 src/vs/code/electron-main/window.ts                             | 1 -
 src/vs/code/electron-main/windows.ts                            | 1 -
 src/vs/platform/environment/common/environment.ts               | 2 ++
 src/vs/platform/environment/node/environmentService.ts          | 1 +
 src/vs/platform/workspace/common/workspace.ts                   | 2 --
 .../workbench/services/thread/electron-browser/threadService.ts | 2 +-
 6 files changed, 4 insertions(+), 5 deletions(-)

diff --git a/src/vs/code/electron-main/window.ts b/src/vs/code/electron-main/window.ts
index 7b64782330c..6f426bf0e85 100644
--- a/src/vs/code/electron-main/window.ts
+++ b/src/vs/code/electron-main/window.ts
@@ -384,7 +384,6 @@ export class VSCodeWindow {
 		// in plugin development mode. These options are all development related.
 		if (this.isPluginDevelopmentHost && cli) {
 			configuration.verbose = cli.verbose;
-			configuration.logExtensionHostCommunication = cli.logExtensionHostCommunication;
 			configuration.debugBrkFileWatcherPort = cli.debugBrkFileWatcherPort;
 			configuration.debugPluginHost = cli.debugPluginHost;
 			configuration.debugBrkPluginHost = cli.debugBrkPluginHost;
diff --git a/src/vs/code/electron-main/windows.ts b/src/vs/code/electron-main/windows.ts
index b9973e8ec1c..0b9be2e79f9 100644
--- a/src/vs/code/electron-main/windows.ts
+++ b/src/vs/code/electron-main/windows.ts
@@ -901,7 +901,6 @@ export class WindowsManager implements IWindowsService {
 			if (!configuration.extensionDevelopmentPath && currentWindowConfig && !!currentWindowConfig.extensionDevelopmentPath) {
 				configuration.extensionDevelopmentPath = currentWindowConfig.extensionDevelopmentPath;
 				configuration.verbose = currentWindowConfig.verbose;
-				configuration.logExtensionHostCommunication = currentWindowConfig.logExtensionHostCommunication;
 				configuration.debugBrkFileWatcherPort = currentWindowConfig.debugBrkFileWatcherPort;
 				configuration.debugBrkPluginHost = currentWindowConfig.debugBrkPluginHost;
 				configuration.debugPluginHost = currentWindowConfig.debugPluginHost;
diff --git a/src/vs/platform/environment/common/environment.ts b/src/vs/platform/environment/common/environment.ts
index 9ab6e10c1e8..b5b3f61e7ad 100644
--- a/src/vs/platform/environment/common/environment.ts
+++ b/src/vs/platform/environment/common/environment.ts
@@ -26,6 +26,8 @@ export interface IEnvironmentService {
 	debugExtensionHostPort: number;
 	debugBrkExtensionHost: boolean;
 
+	logExtensionHostCommunication: boolean;
+
 	isBuilt: boolean;
 	verbose: boolean;
 	performance: boolean;
diff --git a/src/vs/platform/environment/node/environmentService.ts b/src/vs/platform/environment/node/environmentService.ts
index 8e46db9c60b..9500874288a 100644
--- a/src/vs/platform/environment/node/environmentService.ts
+++ b/src/vs/platform/environment/node/environmentService.ts
@@ -56,6 +56,7 @@ export class EnvironmentService implements IEnvironmentService {
 	get isBuilt(): boolean { return !process.env['VSCODE_DEV']; }
 	get verbose(): boolean { return this.args.verbose; }
 	get performance(): boolean { return this.args.performance; }
+	get logExtensionHostCommunication(): boolean { return this.args.logExtensionHostCommunication; }
 
 	private _debugBrkFileWatcherPort: number;
 	get debugBrkFileWatcherPort(): number { return this._debugBrkFileWatcherPort; }
diff --git a/src/vs/platform/workspace/common/workspace.ts b/src/vs/platform/workspace/common/workspace.ts
index c9bc4cb0cf7..ff524ab9ded 100644
--- a/src/vs/platform/workspace/common/workspace.ts
+++ b/src/vs/platform/workspace/common/workspace.ts
@@ -91,8 +91,6 @@ export interface IEnvironment {
 
 	disableExtensions: boolean;
 
-	logExtensionHostCommunication: boolean;
-
 	userExtensionsHome: string;
 	extensionDevelopmentPath: string;
 	extensionTestsPath: string;
diff --git a/src/vs/workbench/services/thread/electron-browser/threadService.ts b/src/vs/workbench/services/thread/electron-browser/threadService.ts
index 52b43adda1d..2367d78a897 100644
--- a/src/vs/workbench/services/thread/electron-browser/threadService.ts
+++ b/src/vs/workbench/services/thread/electron-browser/threadService.ts
@@ -55,7 +55,7 @@ export class MainThreadService extends AbstractThreadService implements IThreadS
 
 		this.extensionHostProcessManager = new ExtensionHostProcessManager(contextService, messageService, windowService, lifecycleService, environmentService);
 
-		let logCommunication = logExtensionHostCommunication || contextService.getConfiguration().env.logExtensionHostCommunication;
+		let logCommunication = logExtensionHostCommunication || environmentService.logExtensionHostCommunication;
 
 		// Message: Window --> Extension Host
 		this.remoteCom = create((msg) => {