Simple file dialog missing drive letter on windows local (fix microsoft#90116)

Author: bpasero

src/vs/workbench/services/textfile/browser/textFileService.ts

@@ -35,7 +35,7 @@ import { coalesce } from 'vs/base/common/arrays';
 import { suggestFilename } from 'vs/base/common/mime';
 import { INotificationService } from 'vs/platform/notification/common/notification';
 import { toErrorMessage } from 'vs/base/common/errorMessage';
-import { resolve } from 'vs/base/common/path';
+import { IRemotePathService } from 'vs/workbench/services/path/common/remotePathService';
 
 /**
  * The workbench file service implementation implements the raw file service spec and adds additional methods on top.
@@ -85,7 +85,8 @@ export abstract class AbstractTextFileService extends Disposable implements ITex
 		@IFilesConfigurationService protected readonly filesConfigurationService: IFilesConfigurationService,
 		@ITextModelService private readonly textModelService: ITextModelService,
 		@ICodeEditorService private readonly codeEditorService: ICodeEditorService,
-		@INotificationService private readonly notificationService: INotificationService
+		@INotificationService private readonly notificationService: INotificationService,
+		@IRemotePathService private readonly remotePathService: IRemotePathService
 	) {
 		super();
 
@@ -321,12 +322,12 @@ export abstract class AbstractTextFileService extends Disposable implements ITex
 
 				// Untitled with associated file path don't need to prompt
 				if (model.hasAssociatedFilePath) {
-					targetUri = this.suggestSavePath(resource);
+					targetUri = await this.suggestSavePath(resource);
 				}
 
 				// Otherwise ask user
 				else {
-					targetUri = await this.fileDialogService.pickFileToSave(this.suggestSavePath(resource), options?.availableFileSystems);
+					targetUri = await this.fileDialogService.pickFileToSave(await this.suggestSavePath(resource), options?.availableFileSystems);
 				}
 
 				// Save as if target provided
@@ -367,7 +368,7 @@ export abstract class AbstractTextFileService extends Disposable implements ITex
 
 		// Get to target resource
 		if (!target) {
-			target = await this.fileDialogService.pickFileToSave(this.suggestSavePath(source), options?.availableFileSystems);
+			target = await this.fileDialogService.pickFileToSave(await this.suggestSavePath(source), options?.availableFileSystems);
 		}
 
 		if (!target) {
@@ -546,7 +547,7 @@ export abstract class AbstractTextFileService extends Disposable implements ITex
 		return (await this.dialogService.confirm(confirm)).confirmed;
 	}
 
-	private suggestSavePath(resource: URI): URI {
+	private async suggestSavePath(resource: URI): Promise<URI> {
 
 		// Just take the resource as is if the file service can handle it
 		if (this.fileService.canHandleResource(resource)) {
@@ -582,16 +583,8 @@ export abstract class AbstractTextFileService extends Disposable implements ITex
 		}
 
 		// Try to place where last active file was if any
-		const defaultFilePath = this.fileDialogService.defaultFilePath();
-		if (defaultFilePath) {
-			return joinPath(defaultFilePath, suggestedFilename);
-		}
-
-		// Finally fallback to suggest just the file name
-		// Since we do not have a default file path to
-		// put, we use path.resolve() to make sure the path
-		// is absolute.
-		return toLocalResource(resource.with({ path: resolve(suggestedFilename) }), remoteAuthority);
+		// Otherwise fallback to user home
+		return joinPath(this.fileDialogService.defaultFilePath() || (await this.remotePathService.userHome), suggestedFilename);
 	}
 
 	//#endregion

src/vs/workbench/services/textfile/electron-browser/nativeTextFileService.ts

@@ -38,6 +38,7 @@ import { IFilesConfigurationService } from 'vs/workbench/services/filesConfigura
 import { ITextModelService } from 'vs/editor/common/services/resolverService';
 import { ICodeEditorService } from 'vs/editor/browser/services/codeEditorService';
 import { INotificationService } from 'vs/platform/notification/common/notification';
+import { IRemotePathService } from 'vs/workbench/services/path/common/remotePathService';
 
 export class NativeTextFileService extends AbstractTextFileService {
 
@@ -55,9 +56,10 @@ export class NativeTextFileService extends AbstractTextFileService {
 		@IFilesConfigurationService filesConfigurationService: IFilesConfigurationService,
 		@ITextModelService textModelService: ITextModelService,
 		@ICodeEditorService codeEditorService: ICodeEditorService,
-		@INotificationService notificationService: INotificationService
+		@INotificationService notificationService: INotificationService,
+		@IRemotePathService remotePathService: IRemotePathService
 	) {
-		super(fileService, untitledTextEditorService, lifecycleService, instantiationService, modelService, environmentService, dialogService, fileDialogService, textResourceConfigurationService, filesConfigurationService, textModelService, codeEditorService, notificationService);
+		super(fileService, untitledTextEditorService, lifecycleService, instantiationService, modelService, environmentService, dialogService, fileDialogService, textResourceConfigurationService, filesConfigurationService, textModelService, codeEditorService, notificationService, remotePathService);
 	}
 
 	private _encoding: EncodingOracle | undefined;

src/vs/workbench/test/browser/workbenchTestServices.ts

@@ -92,6 +92,7 @@ export import TestTextResourcePropertiesService = CommonWorkbenchTestServices.Te
 export import TestContextService = CommonWorkbenchTestServices.TestContextService;
 export import TestStorageService = CommonWorkbenchTestServices.TestStorageService;
 export import TestWorkingCopyService = CommonWorkbenchTestServices.TestWorkingCopyService;
+import { IRemotePathService } from 'vs/workbench/services/path/common/remotePathService';
 
 export function createFileInput(instantiationService: IInstantiationService, resource: URI): FileEditorInput {
 	return instantiationService.createInstance(FileEditorInput, resource, undefined, undefined);
@@ -118,7 +119,8 @@ export class TestTextFileService extends BrowserTextFileService {
 		@IFilesConfigurationService filesConfigurationService: IFilesConfigurationService,
 		@ITextModelService textModelService: ITextModelService,
 		@ICodeEditorService codeEditorService: ICodeEditorService,
-		@INotificationService notificationService: INotificationService
+		@INotificationService notificationService: INotificationService,
+		@IRemotePathService remotePathService: IRemotePathService
 	) {
 		super(
 			fileService,
@@ -133,7 +135,8 @@ export class TestTextFileService extends BrowserTextFileService {
 			filesConfigurationService,
 			textModelService,
 			codeEditorService,
-			notificationService
+			notificationService,
+			remotePathService
 		);
 	}
 

src/vs/workbench/test/electron-browser/workbenchTestServices.ts

@@ -29,6 +29,7 @@ import { createTextBufferFactoryFromStream } from 'vs/editor/common/model/textMo
 import { IOpenedWindow, IOpenEmptyWindowOptions, IWindowOpenable, IOpenWindowOptions, IWindowConfiguration } from 'vs/platform/windows/common/windows';
 import { parseArgs, OPTIONS } from 'vs/platform/environment/node/argv';
 import { LogLevel } from 'vs/platform/log/common/log';
+import { IRemotePathService } from 'vs/workbench/services/path/common/remotePathService';
 
 export const TestWindowConfiguration: IWindowConfiguration = {
 	windowId: 0,
@@ -61,7 +62,8 @@ export class TestTextFileService extends NativeTextFileService {
 		@IFilesConfigurationService filesConfigurationService: IFilesConfigurationService,
 		@ITextModelService textModelService: ITextModelService,
 		@ICodeEditorService codeEditorService: ICodeEditorService,
-		@INotificationService notificationService: INotificationService
+		@INotificationService notificationService: INotificationService,
+		@IRemotePathService remotePathService: IRemotePathService
 	) {
 		super(
 			fileService,
@@ -77,7 +79,8 @@ export class TestTextFileService extends NativeTextFileService {
 			filesConfigurationService,
 			textModelService,
 			codeEditorService,
-			notificationService
+			notificationService,
+			remotePathService
 		);
 	}