refactor(language-core): remove resolveRenameNewName, resolveRenameEditText hooks

johnsoncodehk · johnsoncodehk · commit f5c60fa3390a · 2025-03-09T00:01:54.000+08:00
close #176
diff --git a/packages/language-core/lib/editorFeatures.ts b/packages/language-core/lib/editorFeatures.ts
@@ -115,17 +115,3 @@ export function shouldReportDiagnostics(info: CodeInformation, source: string |
 		? info.verification.shouldReport?.(source, code) ?? true
 		: !!info.verification;
 }
-
-//  resolve...
-
-export function resolveRenameNewName(newName: string, info: CodeInformation): string {
-	return typeof info.navigation === 'object'
-		? info.navigation.resolveRenameNewName?.(newName) ?? newName
-		: newName;
-}
-
-export function resolveRenameEditText(text: string, info: CodeInformation): string {
-	return typeof info.navigation === 'object'
-		? info.navigation.resolveRenameEditText?.(text) ?? text
-		: text;
-}
diff --git a/packages/language-core/lib/types.ts b/packages/language-core/lib/types.ts
@@ -100,8 +100,6 @@ export interface CodeInformation {
 	/** virtual code is expected correctly reflect reference relationships of the source code */
 	navigation?: boolean | {
 		shouldRename?(): boolean;
-		resolveRenameNewName?(newName: string): string;
-		resolveRenameEditText?(newText: string): string;
 	};
 	/** virtual code is expected correctly reflect the structural information of the source code */
 	structure?: boolean;
diff --git a/packages/language-service/lib/features/provideRenameEdits.ts b/packages/language-service/lib/features/provideRenameEdits.ts
@@ -1,4 +1,4 @@
-import { isRenameEnabled, resolveRenameNewName, type CodeInformation } from '@volar/language-core';
+import { isRenameEnabled } from '@volar/language-core';
 import type * as vscode from 'vscode-languageserver-protocol';
 import type { TextDocument } from 'vscode-languageserver-textdocument';
 import { URI } from 'vscode-uri';
@@ -17,14 +17,10 @@ export function register(context: LanguageServiceContext) {
 			uri,
 			() => ({ position, newName }),
 			function* (docs) {
-				let _data!: CodeInformation;
-				for (const mappedPosition of getGeneratedPositions(docs, position, data => {
-					_data = data;
-					return isRenameEnabled(data);
-				})) {
+				for (const mappedPosition of getGeneratedPositions(docs, position, isRenameEnabled)) {
 					yield {
 						position: mappedPosition,
-						newName: resolveRenameNewName(newName, _data),
+						newName,
 					};
 				};
 			},
diff --git a/packages/language-service/lib/utils/transform.ts b/packages/language-service/lib/utils/transform.ts
@@ -1,4 +1,4 @@
-import { isDocumentLinkEnabled, isRenameEnabled, resolveRenameEditText, type CodeInformation } from '@volar/language-core';
+import { isDocumentLinkEnabled, isRenameEnabled } from '@volar/language-core';
 import type * as vscode from 'vscode-languageserver-protocol';
 import type { TextDocument } from 'vscode-languageserver-textdocument';
 import { URI } from 'vscode-uri';
@@ -373,17 +373,12 @@ export function transformWorkspaceEdit(
 				for (const tsEdit of tsEdits) {
 					if (mode === 'rename' || mode === 'fileName' || mode === 'codeAction') {
 
-						let _data!: CodeInformation;
-
-						const range = getSourceRange(docs, tsEdit.range, data => {
-							_data = data;
-							return isRenameEnabled(data);
-						});
+						const range = getSourceRange(docs, tsEdit.range, isRenameEnabled);
 
 						if (range) {
 							sourceResult.changes[sourceDocument.uri] ??= [];
 							sourceResult.changes[sourceDocument.uri].push({
-								newText: resolveRenameEditText(tsEdit.newText, _data),
+								newText: tsEdit.newText,
 								range,
 							});
 							hasResult = true;
@@ -436,16 +431,11 @@ export function transformWorkspaceEdit(
 						} satisfies vscode.TextDocumentEdit;
 						for (const tsEdit of tsDocEdit.edits) {
 							if (mode === 'rename' || mode === 'fileName' || mode === 'codeAction') {
-								let _data!: CodeInformation;
-								const range = getSourceRange(docs, tsEdit.range, data => {
-									_data = data;
-									// fix https://github.com/johnsoncodehk/volar/issues/1091
-									return isRenameEnabled(data);
-								});
+								const range = getSourceRange(docs, tsEdit.range, isRenameEnabled);
 								if (range) {
 									sourceEdit.edits.push({
 										annotationId: 'annotationId' in tsEdit ? tsEdit.annotationId : undefined,
-										newText: resolveRenameEditText(tsEdit.newText, _data),
+										newText: tsEdit.newText,
 										range,
 									});
 								}
