maxmustermann/vscode
1
0
Fork 0
Code Issues Pull requests Projects Releases Wiki Activity

fix #129296 keep authority, query, fragment when navigating simple file dialog (#129310)

Browse source
This commit is contained in:
John Murray 2021-08-02 15:12:49 +01:00 committed by GitHub
parent e4db88b0b1
commit 1bbe9cfd59
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
1 changed files with 8 additions and 8 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

16
src/vs/workbench/services/dialogs/browser/simpleFileDialog.ts
View file

@ -210,17 +210,17 @@ export class SimpleFileDialog {
return newOptions;
}
private remoteUriFrom(path: string): URI {
private remoteUriFrom(path: string, hintUri?: URI): URI {
if (!path.startsWith('\\\\')) {
path = path.replace(/\\/g, '/');
}
const uri: URI = this.scheme === Schemas.file ? URI.file(path) : URI.from({ scheme: this.scheme, path });
// If the default scheme is file, then we don't care about the remote authority
const authority = uri.scheme === Schemas.file ? undefined : this.remoteAuthority;
const uri: URI = this.scheme === Schemas.file ? URI.file(path) : URI.from({ scheme: this.scheme, path, query: hintUri?.query, fragment: hintUri?.fragment });
// If the default scheme is file, then we don't care about the remote authority or the hint authority
const authority = (uri.scheme === Schemas.file) ? undefined : (this.remoteAuthority ?? hintUri?.authority);
return resources.toLocalResource(uri, authority,
// If there is a remote authority, then we should use the system's default URI as the local scheme.
// If there is *no* remote authority, then we should use the default scheme for this dialog as that is already local.
authority ? this.pathService.defaultUriScheme : uri.scheme);
this.remoteAuthority ? this.pathService.defaultUriScheme : uri.scheme);
}
private getScheme(available: readonly string[] | undefined, defaultUri: URI | undefined): string {
@ -463,19 +463,19 @@ export class SimpleFileDialog {
private filePickBoxValue(): URI {
// The file pick box can't render everything, so we use the current folder to create the uri so that it is an existing path.
const directUri = this.remoteUriFrom(this.filePickBox.value.trimRight());
const directUri = this.remoteUriFrom(this.filePickBox.value.trimRight(), this.currentFolder);
const currentPath = this.pathFromUri(this.currentFolder);
if (equalsIgnoreCase(this.filePickBox.value, currentPath)) {
return this.currentFolder;
}
const currentDisplayUri = this.remoteUriFrom(currentPath);
const currentDisplayUri = this.remoteUriFrom(currentPath, this.currentFolder);
const relativePath = resources.relativePath(currentDisplayUri, directUri);
const isSameRoot = (this.filePickBox.value.length > 1 && currentPath.length > 1) ? equalsIgnoreCase(this.filePickBox.value.substr(0, 2), currentPath.substr(0, 2)) : false;
if (relativePath && isSameRoot) {
let path = resources.joinPath(this.currentFolder, relativePath);
const directBasename = resources.basename(directUri);
if ((directBasename === '.') || (directBasename === '..')) {
path = this.remoteUriFrom(this.pathAppend(path, directBasename));
path = this.remoteUriFrom(this.pathAppend(path, directBasename), this.currentFolder);
}
return resources.hasTrailingPathSeparator(directUri) ? resources.addTrailingPathSeparator(path) : path;
} else {