From 7258b995f63827ff1b179f47722e500296d64c35 Mon Sep 17 00:00:00 2001
From: Daniel Imms <daimms@microsoft.com>
Date: Wed, 13 Mar 2019 17:41:18 -0700
Subject: [PATCH] Add userHome to IEnvironment

---
 src/vs/workbench/api/node/extHost.protocol.ts                  | 1 +
 .../services/extensions/electron-browser/extensionHost.ts      | 3 ++-
 src/vs/workbench/services/extensions/node/extensionHostMain.ts | 1 +
 .../services/remote/node/remoteAgentEnvironmentChannel.ts      | 2 ++
 src/vs/workbench/services/remote/node/remoteAgentService.ts    | 1 +
 5 files changed, 7 insertions(+), 1 deletion(-)

diff --git a/src/vs/workbench/api/node/extHost.protocol.ts b/src/vs/workbench/api/node/extHost.protocol.ts
index 16ae7934138..efe38198ac4 100644
--- a/src/vs/workbench/api/node/extHost.protocol.ts
+++ b/src/vs/workbench/api/node/extHost.protocol.ts
@@ -54,6 +54,7 @@ export interface IEnvironment {
 	extensionDevelopmentLocationURI?: URI;
 	extensionTestsLocationURI?: URI;
 	globalStorageHome: URI;
+	userHome: URI;
 }
 
 export interface IStaticWorkspaceData {
diff --git a/src/vs/workbench/services/extensions/electron-browser/extensionHost.ts b/src/vs/workbench/services/extensions/electron-browser/extensionHost.ts
index f38c951ae41..dc7e4284ddc 100644
--- a/src/vs/workbench/services/extensions/electron-browser/extensionHost.ts
+++ b/src/vs/workbench/services/extensions/electron-browser/extensionHost.ts
@@ -432,7 +432,8 @@ export class ExtensionHostProcessWorker implements IExtensionHostStarter {
 						appSettingsHome: this._environmentService.appSettingsHome ? URI.file(this._environmentService.appSettingsHome) : undefined,
 						extensionDevelopmentLocationURI: this._environmentService.extensionDevelopmentLocationURI,
 						extensionTestsLocationURI: this._environmentService.extensionTestsLocationURI,
-						globalStorageHome: URI.file(this._environmentService.globalStorageHome)
+						globalStorageHome: URI.file(this._environmentService.globalStorageHome),
+						userHome: URI.file(this._environmentService.userHome)
 					},
 					workspace: this._contextService.getWorkbenchState() === WorkbenchState.EMPTY ? undefined : {
 						configuration: withNullAsUndefined(workspace.configuration),
diff --git a/src/vs/workbench/services/extensions/node/extensionHostMain.ts b/src/vs/workbench/services/extensions/node/extensionHostMain.ts
index 58d6cf6b7c1..976f614a3a6 100644
--- a/src/vs/workbench/services/extensions/node/extensionHostMain.ts
+++ b/src/vs/workbench/services/extensions/node/extensionHostMain.ts
@@ -155,6 +155,7 @@ export class ExtensionHostMain {
 		initData.environment.extensionDevelopmentLocationURI = URI.revive(rpcProtocol.transformIncomingURIs(initData.environment.extensionDevelopmentLocationURI));
 		initData.environment.extensionTestsLocationURI = URI.revive(rpcProtocol.transformIncomingURIs(initData.environment.extensionTestsLocationURI));
 		initData.environment.globalStorageHome = URI.revive(rpcProtocol.transformIncomingURIs(initData.environment.globalStorageHome));
+		initData.environment.userHome = URI.revive(rpcProtocol.transformIncomingURIs(initData.environment.userHome));
 		initData.logsLocation = URI.revive(rpcProtocol.transformIncomingURIs(initData.logsLocation));
 		initData.workspace = rpcProtocol.transformIncomingURIs(initData.workspace);
 		return initData;
diff --git a/src/vs/workbench/services/remote/node/remoteAgentEnvironmentChannel.ts b/src/vs/workbench/services/remote/node/remoteAgentEnvironmentChannel.ts
index 224b27d9a75..83a9d2f21ad 100644
--- a/src/vs/workbench/services/remote/node/remoteAgentEnvironmentChannel.ts
+++ b/src/vs/workbench/services/remote/node/remoteAgentEnvironmentChannel.ts
@@ -23,6 +23,7 @@ export interface IRemoteAgentEnvironmentDTO {
 	extensionsPath: UriComponents;
 	extensionHostLogsPath: UriComponents;
 	globalStorageHome: UriComponents;
+	userHome: UriComponents;
 	extensions: IExtensionDescription[];
 	os: platform.OperatingSystem;
 	syncExtensions: boolean;
@@ -48,6 +49,7 @@ export class RemoteExtensionEnvironmentChannelClient {
 					extensionsPath: URI.revive(data.extensionsPath),
 					extensionHostLogsPath: URI.revive(data.extensionHostLogsPath),
 					globalStorageHome: URI.revive(data.globalStorageHome),
+					userHome: URI.revive(data.userHome),
 					extensions: data.extensions.map(ext => { (<any>ext).extensionLocation = URI.revive(ext.extensionLocation); return ext; }),
 					os: data.os,
 					syncExtensions: data.syncExtensions
diff --git a/src/vs/workbench/services/remote/node/remoteAgentService.ts b/src/vs/workbench/services/remote/node/remoteAgentService.ts
index 6c7d6706701..703bee3f1d1 100644
--- a/src/vs/workbench/services/remote/node/remoteAgentService.ts
+++ b/src/vs/workbench/services/remote/node/remoteAgentService.ts
@@ -22,6 +22,7 @@ export interface IRemoteAgentEnvironment {
 	extensionsPath: URI;
 	extensionHostLogsPath: URI;
 	globalStorageHome: URI;
+	userHome: URI;
 	extensions: IExtensionDescription[];
 	os: OperatingSystem;
 	syncExtensions: boolean;
-- 
GitLab