From cd9de1ee2e00656cc3fdddf262f3d037d69dba02 Mon Sep 17 00:00:00 2001 From: Benjamin Pasero Date: Wed, 28 Jun 2023 15:01:02 +0200 Subject: [PATCH] dialogs - workaround mangler issue #186494 (#186496) --- .../services/dialogs/browser/abstractFileDialogService.ts | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/src/vs/workbench/services/dialogs/browser/abstractFileDialogService.ts b/src/vs/workbench/services/dialogs/browser/abstractFileDialogService.ts index 557e05e7adc..94cf61f940d 100644 --- a/src/vs/workbench/services/dialogs/browser/abstractFileDialogService.ts +++ b/src/vs/workbench/services/dialogs/browser/abstractFileDialogService.ts @@ -11,7 +11,7 @@ import { IHistoryService } from 'vs/workbench/services/history/common/history'; import { IWorkbenchEnvironmentService } from 'vs/workbench/services/environment/common/environmentService'; import { URI } from 'vs/base/common/uri'; import * as resources from 'vs/base/common/resources'; -import * as path from 'vs/base/common/path'; +import { isAbsolute as localPathIsAbsolute, normalize as localPathNormalize } from 'vs/base/common/path'; import { IInstantiationService, } from 'vs/platform/instantiation/common/instantiation'; import { ISimpleFileDialog, SimpleFileDialog } from 'vs/workbench/services/dialogs/browser/simpleFileDialog'; import { IWorkspacesService } from 'vs/platform/workspaces/common/workspaces'; @@ -98,9 +98,9 @@ export abstract class AbstractFileDialogService implements IFileDialogService { const preferredHomeConfig = this.configurationService.inspect('files.dialog.defaultPath'); const preferredHomeCandidate = preferLocal ? preferredHomeConfig.userLocalValue : preferredHomeConfig.userRemoteValue; if (preferredHomeCandidate) { - const pathLib = preferLocal ? path : await this.pathService.path; - if (pathLib.isAbsolute(preferredHomeCandidate)) { - const preferredHomeNormalized = pathLib.normalize(preferredHomeCandidate); + const isPreferredHomeCandidateAbsolute = preferLocal ? localPathIsAbsolute(preferredHomeCandidate) : (await this.pathService.path).isAbsolute(preferredHomeCandidate); + if (isPreferredHomeCandidateAbsolute) { + const preferredHomeNormalized = preferLocal ? localPathNormalize(preferredHomeCandidate) : (await this.pathService.path).normalize(preferredHomeCandidate); const preferredHome = resources.toLocalResource(await this.pathService.fileURI(preferredHomeNormalized), this.environmentService.remoteAuthority, this.pathService.defaultUriScheme); if (await this.fileService.exists(preferredHome)) { return preferredHome;