resources - tweaks

Benjamin Pasero · Benjamin Pasero · commit fe2efa12c577 · 2019-04-09T11:24:33.000+02:00
diff --git a/src/vs/base/common/resources.ts b/src/vs/base/common/resources.ts
@@ -311,13 +311,15 @@ export class ResourceGlobMatcher {
 	}
 }
 
-export function toLocalResource(resource: URI, remoteAuthority: string | undefined): URI {
-	let scheme: string;
-	if (remoteAuthority) {
-		scheme = Schemas.vscodeRemote;
-	} else {
-		scheme = Schemas.file;
+export function toLocalResource(resource: URI, authority: string | undefined): URI {
+	if (authority) {
+		let path = resource.path;
+		if (path && path[0] !== paths.posix.sep) {
+			path = paths.posix.sep + path;
+		}
+
+		return resource.with({ scheme: Schemas.vscodeRemote, authority, path });
 	}
 
-	return resource.with({ scheme });
+	return resource.with({ scheme: Schemas.file });
 }
diff --git a/src/vs/workbench/services/textfile/common/textFileService.ts b/src/vs/workbench/services/textfile/common/textFileService.ts
@@ -30,7 +30,7 @@ import { IContextKey, IContextKeyService } from 'vs/platform/contextkey/common/c
 import { createTextBufferFactoryFromSnapshot, createTextBufferFactoryFromStream } from 'vs/editor/common/model/textModel';
 import { IModelService } from 'vs/editor/common/services/modelService';
 import { INotificationService, Severity } from 'vs/platform/notification/common/notification';
-import { isEqualOrParent, isEqual, joinPath, dirname, extname, basename } from 'vs/base/common/resources';
+import { isEqualOrParent, isEqual, joinPath, dirname, extname, basename, toLocalResource } from 'vs/base/common/resources';
 import { posix } from 'vs/base/common/path';
 import { getConfirmMessage, IDialogService, IFileDialogService, ISaveDialogOptions, IConfirmation } from 'vs/platform/dialogs/common/dialogs';
 import { IModeService } from 'vs/editor/common/services/modeService';
@@ -570,7 +570,7 @@ export class TextFileService extends Disposable implements ITextFileService {
 
 					// Untitled with associated file path don't need to prompt
 					if (this.untitledEditorService.hasAssociatedFilePath(untitled)) {
-						targetUri = this.untitledToAssociatedFileResource(untitled);
+						targetUri = toLocalResource(untitled, this.environmentService.configuration.remoteAuthority);
 					}
 
 					// Otherwise ask user
@@ -607,18 +607,6 @@ export class TextFileService extends Disposable implements ITextFileService {
 		});
 	}
 
-	private untitledToAssociatedFileResource(untitled: URI): URI {
-		const authority = this.environmentService.configuration.remoteAuthority;
-		if (authority) {
-			let path = untitled.path;
-			if (path && path[0] !== posix.sep) {
-				path = posix.sep + path;
-			}
-			return untitled.with({ scheme: Schemas.vscodeRemote, authority, path });
-		}
-		return untitled.with({ scheme: Schemas.file });
-	}
-
 	private doSaveAllFiles(resources?: URI[], options: ISaveOptions = Object.create(null)): Promise<ITextFileOperationResult> {
 		const dirtyFileModels = this.getDirtyFileModels(Array.isArray(resources) ? resources : undefined /* Save All */)
 			.filter(model => {
@@ -762,7 +750,7 @@ export class TextFileService extends Disposable implements ITextFileService {
 			// path. This can happen if the file was created after the untitled file was opened.
 			// See https://github.com/Microsoft/vscode/issues/67946
 			let confirmWrite: Promise<boolean>;
-			if (sourceModel instanceof UntitledEditorModel && sourceModel.hasAssociatedFilePath && targetExists && isEqual(target, this.untitledToAssociatedFileResource(sourceModel.getResource()))) {
+			if (sourceModel instanceof UntitledEditorModel && sourceModel.hasAssociatedFilePath && targetExists && isEqual(target, toLocalResource(sourceModel.getResource(), this.environmentService.configuration.remoteAuthority))) {
 				confirmWrite = this.confirmOverwrite(target);
 			} else {
 				confirmWrite = Promise.resolve(true);

Original file line number	Diff line number	Diff line change
`@@ -311,13 +311,15 @@ export class ResourceGlobMatcher {`
`311`	`311`	`}`
`312`	`312`	`}`
`313`	`313`
`314`		`-export function toLocalResource(resource: URI, remoteAuthority: string \| undefined): URI {`
`315`		`- let scheme: string;`
`316`		`- if (remoteAuthority) {`
`317`		`- scheme = Schemas.vscodeRemote;`
`318`		`- } else {`
`319`		`- scheme = Schemas.file;`
	`314`	`+export function toLocalResource(resource: URI, authority: string \| undefined): URI {`
	`315`	`+ if (authority) {`
	`316`	`+ let path = resource.path;`
	`317`	`+ if (path && path[0] !== paths.posix.sep) {`
	`318`	`+ path = paths.posix.sep + path;`
	`319`	`+ }`
	`320`	`+`
	`321`	`+ return resource.with({ scheme: Schemas.vscodeRemote, authority, path });`
`320`	`322`	`}`
`321`	`323`
`322`		`- return resource.with({ scheme });`
	`324`	`+ return resource.with({ scheme: Schemas.file });`
`323`	`325`	`}`