fix(language-core): do not generate useTemplateRef parameter repeatedly

fixes vuejs#5009 (comment)
Hawthorne001 · Dec 18, 2024 · edf161a · edf161a
1 parent b38a8db
commit edf161a
Show file tree

Hide file tree

Showing 3 changed files with 24 additions and 14 deletions.
diff --git a/packages/language-core/lib/codegen/globalTypes.ts b/packages/language-core/lib/codegen/globalTypes.ts
@@ -15,6 +15,7 @@ export function generateGlobalTypes(lib: string, target: number, strictTemplates
 	const __VLS_intrinsicElements: __VLS_IntrinsicElements;
 	const __VLS_directiveBindingRestFields: { instance: null, oldValue: null, modifiers: any, dir: any };
 	const __VLS_unref: typeof import('${lib}').unref;
+	const __VLS_placeholder: any;
 
 	const __VLS_nativeElements = {
 		...{} as SVGElementTagNameMap,

diff --git a/packages/language-core/lib/codegen/script/scriptSetup.ts b/packages/language-core/lib/codegen/script/scriptSetup.ts
@@ -226,17 +226,19 @@ function* generateSetupFunction(
 	}
 	const isTs = options.lang !== 'js' && options.lang !== 'jsx';
 	for (const { callExp, exp, arg } of scriptSetupRanges.useTemplateRef) {
-		const templateRefType = arg ? [
-			`__VLS_TemplateResult['refs'][`,
-			generateSfcBlockSection(scriptSetup, arg.start, arg.end, codeFeatures.navigation),
-			`]`
-		] : [`unknown`];
+		const templateRefType = arg
+			? [
+				`__VLS_TemplateResult['refs'][`,
+				generateSfcBlockSection(scriptSetup, arg.start, arg.end, codeFeatures.all),
+				`]`
+			]
+			: [`unknown`];
 		if (isTs) {
 			setupCodeModifies.push([
 				[
 					`<`,
 					...templateRefType,
-					`, keyof __VLS_TemplateResult['refs']>`
+					`>`
 				],
 				exp.end,
 				exp.end
@@ -257,6 +259,13 @@ function* generateSetupFunction(
 				callExp.end
 			]);
 		}
+		if (arg) {
+			setupCodeModifies.push([
+				[`(__VLS_placeholder)`],
+				arg.start,
+				arg.end
+			]);
+		}
 	}
 	setupCodeModifies = setupCodeModifies.sort((a, b) => a[1] - b[1]);
 

diff --git a/packages/language-server/tests/renaming.spec.ts b/packages/language-server/tests/renaming.spec.ts
@@ -939,25 +939,25 @@ describe('Renaming', async () => {
 			        "newText": "bar",
 			        "range": {
 			          "end": {
-			            "character": 34,
-			            "line": 7,
+			            "character": 16,
+			            "line": 2,
 			          },
 			          "start": {
-			            "character": 31,
-			            "line": 7,
+			            "character": 13,
+			            "line": 2,
 			          },
 			        },
 			      },
 			      {
 			        "newText": "bar",
 			        "range": {
 			          "end": {
-			            "character": 16,
-			            "line": 2,
+			            "character": 34,
+			            "line": 7,
 			          },
 			          "start": {
-			            "character": 13,
-			            "line": 2,
+			            "character": 31,
+			            "line": 7,
 			          },
 			        },
 			      },