debt - adopt defaultUriScheme also for userHome

Benjamin Pasero · Benjamin Pasero · commit b1b5b8a9a3b4 · 2020-09-10T17:49:45.000+02:00
diff --git a/src/vs/workbench/services/path/browser/pathService.ts b/src/vs/workbench/services/path/browser/pathService.ts
@@ -10,31 +10,31 @@ import { URI } from 'vs/base/common/uri';
 import { Schemas } from 'vs/base/common/network';
 import { IWorkbenchEnvironmentService } from 'vs/workbench/services/environment/common/environmentService';
 import { IWorkspaceContextService } from 'vs/platform/workspace/common/workspace';
-import { memoize } from 'vs/base/common/decorators';
 
 export class BrowserPathService extends AbstractPathService {
 
+	readonly defaultUriScheme = defaultUriScheme(this.environmentService, this.contextService);
+
 	constructor(
 		@IRemoteAgentService remoteAgentService: IRemoteAgentService,
 		@IWorkbenchEnvironmentService private readonly environmentService: IWorkbenchEnvironmentService,
 		@IWorkspaceContextService private readonly contextService: IWorkspaceContextService
 	) {
-		super(URI.from({ scheme: Schemas.vscodeRemote, authority: environmentService.configuration.remoteAuthority, path: '/' }), remoteAgentService);
+		super(URI.from({ scheme: defaultUriScheme(environmentService, contextService), authority: environmentService.configuration.remoteAuthority, path: '/' }), remoteAgentService);
 	}
+}
 
-	@memoize
-	get defaultUriScheme(): string {
-		if (this.environmentService.configuration.remoteAuthority) {
-			return Schemas.vscodeRemote;
-		}
-
-		const firstFolder = this.contextService.getWorkspace().folders[0];
-		if (!firstFolder) {
-			throw new Error('Empty workspace is not supported in browser when there is no remote connection.');
-		}
+function defaultUriScheme(environmentService: IWorkbenchEnvironmentService, contextService: IWorkspaceContextService): string {
+	if (environmentService.configuration.remoteAuthority) {
+		return Schemas.vscodeRemote;
+	}
 
-		return firstFolder.uri.scheme;
+	const firstFolder = contextService.getWorkspace().folders[0];
+	if (!firstFolder) {
+		throw new Error('Empty workspace is not supported in browser when there is no remote connection.');
 	}
+
+	return firstFolder.uri.scheme;
 }
 
 registerSingleton(IPathService, BrowserPathService, true);
