Microsoft/vscode
1
0
Fork 0
mirror of https://github.com/microsoft/vscode.git synced 2026-05-01 14:01:38 +01:00
Code Issues Packages Projects Releases Wiki Activity

Path is not ~ prefixed for editors right on startup (fix #148420)

Browse Source
This commit is contained in:
Benjamin Pasero
2022-05-02 08:16:00 +02:00
parent 1d03d3d65c
commit ae8302564c
5 changed files with 44 additions and 25 deletions
Download Patch File Download Diff File Expand all files Collapse all files

18
src/vs/workbench/services/label/common/labelService.ts
View File

@@ -23,6 +23,7 @@ import { IPathService } from 'vs/workbench/services/path/common/pathService';
import { isProposedApiEnabled } from 'vs/workbench/services/extensions/common/extensions';
import { OperatingSystem, OS } from 'vs/base/common/platform';
import { IRemoteAgentService } from 'vs/workbench/services/remote/common/remoteAgentService';
import { Schemas } from 'vs/base/common/network';
const resourceLabelFormattersExtPoint = ExtensionsRegistry.registerExtensionPoint<ResourceLabelFormatter[]>({
extensionPoint: 'resourceLabelFormatters',
@@ -109,8 +110,8 @@ export class LabelService extends Disposable implements ILabelService {
private readonly _onDidChangeFormatters = this._register(new Emitter<IFormatterChangeEvent>({ leakWarningThreshold: 400 }));
readonly onDidChangeFormatters = this._onDidChangeFormatters.event;
private os = OS;
private userHome: URI | undefined = undefined;
private os: OperatingSystem;
private userHome: URI | undefined;
constructor(
@IWorkbenchEnvironmentService private readonly environmentService: IWorkbenchEnvironmentService,
@@ -120,11 +121,18 @@ export class LabelService extends Disposable implements ILabelService {
) {
super();
// Resolve OS & Paths with remote in mind
this.resolveEnvironment();
// Find some meaningful defaults until the remote environment
// is resolved, by taking the current OS we are running in
// and by taking the local `userHome` if we run on a local
// file scheme.
this.os = OS;
this.userHome = pathService.defaultUriScheme === Schemas.file ? this.pathService.userHome({ preferLocal: true }) : undefined;
// Remote environment is potentially long running
this.resolveRemoteEnvironment();
}
private async resolveEnvironment(): Promise<void> {
private async resolveRemoteEnvironment(): Promise<void> {
// OS
const env = await this.remoteAgentService.getEnvironment();