Merge pull request microsoft#252071 from jeanp413/fix-251473

Fix "Assertion Failed: Argument is undefined or null" when renaming custom editor

Author: mjbvz

src/vs/workbench/api/browser/mainThreadCustomEditors.ts

@@ -201,7 +201,8 @@ export class MainThreadCustomEditors extends Disposable implements extHostProtoc
 				}
 
 				try {
-					await this._proxyCustomEditors.$resolveCustomEditor(this._uriIdentityService.asCanonicalUri(resource), handle, viewType, {
+					const actualResource = modelType === CustomEditorModelType.Text ? this._uriIdentityService.asCanonicalUri(resource) : resource;
+					await this._proxyCustomEditors.$resolveCustomEditor(actualResource, handle, viewType, {
 						title: webviewInput.getTitle(),
 						contentOptions: webviewInput.webview.contentOptions,
 						options: webviewInput.webview.options,

src/vs/workbench/contrib/customEditor/browser/customEditors.ts

@@ -55,7 +55,7 @@ export class CustomEditorService extends Disposable implements ICustomEditorServ
 	) {
 		super();
 
-		this._models = new CustomEditorModelManager(this.uriIdentityService);
+		this._models = new CustomEditorModelManager();
 
 		this._contributedEditors = this._register(new ContributedCustomEditors(storageService));
 		// Register the contribution points only emitting one change from the resolver

src/vs/workbench/contrib/customEditor/common/customEditorModelManager.ts

@@ -6,17 +6,9 @@
 import { createSingleCallFunction } from '../../../../base/common/functional.js';
 import { IReference } from '../../../../base/common/lifecycle.js';
 import { URI } from '../../../../base/common/uri.js';
-import { IUriIdentityService } from '../../../../platform/uriIdentity/common/uriIdentity.js';
 import { ICustomEditorModel, ICustomEditorModelManager } from './customEditor.js';
 
 export class CustomEditorModelManager implements ICustomEditorModelManager {
-	private readonly _uriIdentityService: IUriIdentityService;
-
-	constructor(
-		uriIdentityService: IUriIdentityService,
-	) {
-		this._uriIdentityService = uriIdentityService;
-	}
 
 	private readonly _references = new Map<string, {
 		readonly viewType: string;
@@ -84,7 +76,6 @@ export class CustomEditorModelManager implements ICustomEditorModelManager {
 	}
 
 	private key(resource: URI, viewType: string): string {
-		resource = this._uriIdentityService.asCanonicalUri(resource);
 		return `${resource.toString()}@@@${viewType}`;
 	}
 }