use remote agent service to get remote os

sbatten · sbatten · commit 352550535c00 · 2019-06-17T23:03:58.000Z
diff --git a/src/vs/workbench/contrib/remote/common/remote.contribution.ts b/src/vs/workbench/contrib/remote/common/remote.contribution.ts
@@ -7,38 +7,32 @@ import { IWorkbenchContribution, IWorkbenchContributionsRegistry, Extensions as
 import { Registry } from 'vs/platform/registry/common/platform';
 import { LifecyclePhase } from 'vs/platform/lifecycle/common/lifecycle';
 import { ILabelService } from 'vs/platform/label/common/label';
-import { isWeb } from 'vs/base/common/platform';
+import { isWeb, OperatingSystem } from 'vs/base/common/platform';
 import { IWorkbenchEnvironmentService } from 'vs/workbench/services/environment/common/environmentService';
 import { Schemas } from 'vs/base/common/network';
+import { IRemoteAgentService } from 'vs/workbench/services/remote/common/remoteAgentService';
 
 export class LabelContribution implements IWorkbenchContribution {
 	constructor(
 		@ILabelService private readonly labelService: ILabelService,
-		@IWorkbenchEnvironmentService private readonly environmentService: IWorkbenchEnvironmentService) {
+		@IWorkbenchEnvironmentService private readonly environmentService: IWorkbenchEnvironmentService,
+		@IRemoteAgentService private readonly remoteAgentService: IRemoteAgentService) {
 		this.registerFormatters();
 	}
 
-	private useWindowsPaths(): boolean {
-		if (this.environmentService.configuration.folderUri) {
-			return this.environmentService.configuration.folderUri.fsPath.indexOf('/') === -1;
-		}
-
-		if (this.environmentService.configuration.workspace) {
-			return this.environmentService.configuration.workspace.configPath.fsPath.indexOf('/') === -1;
-		}
-
-		return false;
-	}
-
 	private registerFormatters(): void {
 		if (isWeb) {
-			this.labelService.registerFormatter({
-				scheme: Schemas.vscodeRemote,
-				authority: this.environmentService.configuration.remoteAuthority,
-				formatting: {
-					label: '${path}',
-					separator: this.useWindowsPaths() ? '\\' : '/',
-					tildify: !this.useWindowsPaths()
+			this.remoteAgentService.getEnvironment().then(remoteEnvironment => {
+				if (remoteEnvironment) {
+					this.labelService.registerFormatter({
+						scheme: Schemas.vscodeRemote,
+						authority: this.environmentService.configuration.remoteAuthority,
+						formatting: {
+							label: '${path}',
+							separator: remoteEnvironment.os === OperatingSystem.Windows ? '\\' : '/',
+							tildify: remoteEnvironment.os !== OperatingSystem.Windows
+						}
+					});
 				}
 			});
 		}
