fix user data home on web

sandy081 · sandy081 · commit a2b2d3171fa0 · 2019-07-05T10:40:51.000+02:00
diff --git a/src/vs/workbench/browser/web.main.ts b/src/vs/workbench/browser/web.main.ts
@@ -84,7 +84,8 @@ class CodeRendererMain extends Disposable {
 		serviceCollection.set(ILogService, logService);
 
 		// Environment
-		const environmentService = new BrowserWorkbenchEnvironmentService(this.configuration);
+		const remoteUserDataUri = this.getRemoteUserDataUri();
+		const environmentService = new BrowserWorkbenchEnvironmentService(this.configuration, remoteUserDataUri);
 		serviceCollection.set(IWorkbenchEnvironmentService, environmentService);
 
 		// Product
@@ -115,11 +116,8 @@ class CodeRendererMain extends Disposable {
 
 			fileService.registerProvider(Schemas.vscodeRemote, remoteFileSystemProvider);
 
-			if (!userDataProvider) {
-				const remoteUserDataUri = this.getRemoteUserDataUri();
-				if (remoteUserDataUri) {
-					userDataProvider = this._register(new FileUserDataProvider(remoteUserDataUri, dirname(remoteUserDataUri), remoteFileSystemProvider));
-				}
+			if (!userDataProvider && remoteUserDataUri) {
+				userDataProvider = this._register(new FileUserDataProvider(remoteUserDataUri, dirname(remoteUserDataUri), remoteFileSystemProvider));
 			}
 		}
 
diff --git a/src/vs/workbench/services/environment/browser/environmentService.ts b/src/vs/workbench/services/environment/browser/environmentService.ts
@@ -63,13 +63,13 @@ export class BrowserWorkbenchEnvironmentService implements IEnvironmentService {
 
 	readonly configuration: IWindowConfiguration = new BrowserWindowConfiguration();
 
-	constructor(configuration: IWorkbenchConstructionOptions) {
+	constructor(configuration: IWorkbenchConstructionOptions, remoteUserDataUri: URI | null) {
 		this.args = { _: [] };
 		this.appRoot = '/web/';
 		this.appNameLong = 'Visual Studio Code - Web';
 
 		this.configuration.remoteAuthority = configuration.remoteAuthority;
-		this.userRoamingDataHome = URI.file('/User').with({ scheme: Schemas.userData });
+		this.userRoamingDataHome = remoteUserDataUri ? remoteUserDataUri.with({ scheme: Schemas.userData }) : URI.file('/User').with({ scheme: Schemas.userData });
 		this.settingsResource = joinPath(this.userRoamingDataHome, 'settings.json');
 		this.keybindingsResource = joinPath(this.userRoamingDataHome, 'keybindings.json');
 		this.keyboardLayoutResource = joinPath(this.userRoamingDataHome, 'keyboardLayout.json');
