editors - cleanup canonical todo

Benjamin Pasero · Benjamin Pasero · commit aa013aa27b17 · 2020-06-10T10:33:08.000+02:00
diff --git a/src/vs/workbench/contrib/files/common/editors/fileEditorInput.ts b/src/vs/workbench/contrib/files/common/editors/fileEditorInput.ts
@@ -86,12 +86,6 @@ export class FileEditorInput extends AbstractTextResourceEditorInput implements
 
 		// Once the text file model is created, we keep it inside
 		// the input to be able to implement some methods properly
-		// TODO@ben once we are certain that models will only be
-		// created with canonical URIs, this should use the URI
-		// identity service. But as long as there is a chance
-		// that a model is created with same path but different
-		// case, we can only accept that model here if the URIs
-		// are 100% identical.
 		if (extUri.isEqual(model.resource, this.resource)) {
 			this.model = model;
 
diff --git a/src/vs/workbench/services/editor/browser/editorService.ts b/src/vs/workbench/services/editor/browser/editorService.ts
@@ -15,7 +15,7 @@ import { IFileService, FileOperationEvent, FileOperation, FileChangesEvent, File
 import { Schemas } from 'vs/base/common/network';
 import { Event, Emitter } from 'vs/base/common/event';
 import { URI } from 'vs/base/common/uri';
-import { basename, joinPath } from 'vs/base/common/resources';
+import { basename, joinPath, extUri } from 'vs/base/common/resources';
 import { DiffEditorInput } from 'vs/workbench/common/editor/diffEditorInput';
 import { IEditorGroupsService, IEditorGroup, GroupsOrder, IEditorReplacement, GroupChangeKind, preferredSideBySideGroupDirection, OpenEditorContext } from 'vs/workbench/services/editor/common/editorGroupsService';
 import { IResourceEditorInputType, SIDE_GROUP, IResourceEditorReplacement, IOpenEditorOverrideHandler, IEditorService, SIDE_GROUP_TYPE, ACTIVE_GROUP_TYPE, ISaveEditorsOptions, ISaveAllEditorsOptions, IRevertAllEditorsOptions, IBaseSaveRevertAllEditorOptions, IOpenEditorOverrideEntry, ICustomEditorViewTypesHandler, ICustomEditorInfo } from 'vs/workbench/services/editor/common/editorService';
@@ -938,19 +938,13 @@ export class EditorService extends Disposable implements EditorServiceImpl {
 	}
 
 	private asCanonicalEditorResource(resource: URI): URI {
-		// We prefer to use the canonical form unless we know that a model
-		// for the given URI already exists.
-		// If no model exists, we do not trust the resource that is being
-		// passed in as being the truth (e.g. in terms of path casing) and
-		// as such we ask the URI service to give us the canconical form of
-		// the URI. As such we ensure that any editor that is being opened
-		// will use the same canonical form of the URI.
-		let canonicalResource: URI;
-		if (this.modelService?.getModel(resource)) {
-			// TODO@Ben remove this check once canonical URIs are adopted in ITextModelResolerService
-			canonicalResource = resource;
-		} else {
-			canonicalResource = this.uriIdentityService.asCanonicalUri(resource);
+		const canonicalResource: URI = this.uriIdentityService.asCanonicalUri(resource);
+
+		// In the unlikely case that a model exists for the original resource but
+		// differs from the canonical resource, we print a warning as this means
+		// the model will not be able to be opened as editor.
+		if (!extUri.isEqual(resource, canonicalResource) && this.modelService?.getModel(resource)) {
+			console.warn(`EditorService: a model exists for a resource that is not canonical: ${resource.toString(true)}`);
 		}
 
 		return canonicalResource;
