Use defaultUri scheme for window scheme

alexr00 · alexr00 · commit 212209316b5a · 2020-07-09T10:13:48.000+02:00
Fixes microsoft/vscode-internalbacklog#1179
diff --git a/src/vs/workbench/services/dialogs/browser/abstractFileDialogService.ts b/src/vs/workbench/services/dialogs/browser/abstractFileDialogService.ts
@@ -230,12 +230,12 @@ export abstract class AbstractFileDialogService implements IFileDialogService {
 		return remoteFileDialog.showSaveDialog(options);
 	}
 
-	protected getSchemeFilterForWindow(): string {
-		return !this.environmentService.configuration.remoteAuthority ? Schemas.file : REMOTE_HOST_SCHEME;
+	protected getSchemeFilterForWindow(defaultUriScheme?: string): string {
+		return !this.environmentService.configuration.remoteAuthority ? (!defaultUriScheme || defaultUriScheme === Schemas.file ? Schemas.file : defaultUriScheme) : REMOTE_HOST_SCHEME;
 	}
 
 	protected getFileSystemSchema(options: { availableFileSystems?: readonly string[], defaultUri?: URI }): string {
-		return options.availableFileSystems && options.availableFileSystems[0] || this.getSchemeFilterForWindow();
+		return options.availableFileSystems && options.availableFileSystems[0] || this.getSchemeFilterForWindow(options.defaultUri?.scheme);
 	}
 
 	abstract pickFileFolderAndOpen(options: IPickAndOpenOptions): Promise<void>;

Original file line number	Diff line number	Diff line change
`@@ -230,12 +230,12 @@ export abstract class AbstractFileDialogService implements IFileDialogService {`
`230`	`230`	`return remoteFileDialog.showSaveDialog(options);`
`231`	`231`	`}`
`232`	`232`
`233`		`- protected getSchemeFilterForWindow(): string {`
`234`		`- return !this.environmentService.configuration.remoteAuthority ? Schemas.file : REMOTE_HOST_SCHEME;`
	`233`	`+ protected getSchemeFilterForWindow(defaultUriScheme?: string): string {`
	`234`	`+ return !this.environmentService.configuration.remoteAuthority ? (!defaultUriScheme \|\| defaultUriScheme === Schemas.file ? Schemas.file : defaultUriScheme) : REMOTE_HOST_SCHEME;`
`235`	`235`	`}`
`236`	`236`
`237`	`237`	`protected getFileSystemSchema(options: { availableFileSystems?: readonly string[], defaultUri?: URI }): string {`
`238`		`- return options.availableFileSystems && options.availableFileSystems[0] \|\| this.getSchemeFilterForWindow();`
	`238`	`+ return options.availableFileSystems && options.availableFileSystems[0] \|\| this.getSchemeFilterForWindow(options.defaultUri?.scheme);`
`239`	`239`	`}`
`240`	`240`
`241`	`241`	`abstract pickFileFolderAndOpen(options: IPickAndOpenOptions): Promise<void>;`