refactor: use ctx.inlayHints

vuejs · johnsoncodehk · Oct 23, 2024 · Aug 7, 2024 · Aug 7, 2024 · Aug 7, 2024
commit 3e7dc6e4673802c7263063dcb63668b082cb150a
diff --git a/packages/language-core/lib/codegen/template/element.ts b/packages/language-core/lib/codegen/template/element.ts
@@ -112,6 +112,9 @@ export function* generateComponent(
 		yield `]${endOfLine}`;
 	}
 	else if (dynamicTagInfo) {
+		if (dynamicTagInfo.isComponentIsShorthand) {
+			ctx.inlayHints.push(generateVBindShorthandInlayHint(dynamicTagInfo.exp.loc, 'is'));
+		}
 		yield `const ${var_originalComponent} = (`;
 		yield* generateInterpolation(
 			options,
@@ -121,11 +124,7 @@ export function* generateComponent(
 			dynamicTagInfo.offsets[0],
 			ctx.codeFeatures.all,
 			'(',
-			')',
-			dynamicTagInfo.isComponentIsShorthand ? [[
-				generateVBindShorthandInlayHint(dynamicTagInfo.exp.loc, 'is'),
-				dynamicTagInfo.exp.loc.end.offset
-			]] : undefined
+			')'
 		);
 		if (dynamicTagInfo.offsets[1] !== undefined) {
 			yield `,`;

diff --git a/packages/language-core/lib/codegen/template/elementProps.ts b/packages/language-core/lib/codegen/template/elementProps.ts
@@ -298,17 +298,7 @@ function* genereatePropExp(
 					features
 				);
 				if (enableCodeFeatures) {
-					ctx.inlayHints.push({
-						blockName: 'template',
-						offset: exp.loc.end.offset,
-						setting: 'vue.inlayHints.vBindShorthand',
-						label: `="${propVariableName}"`,
-						tooltip: [
-							`This is a shorthand for \`${exp.loc.source}="${propVariableName}"\`.`,
-							'To hide this hint, set `vue.inlayHints.vBindShorthand` to `false` in IDE settings.',
-							'[More info](https://github.com/vuejs/core/pull/9451)',
-						].join('\n\n'),
-					});
+					ctx.inlayHints.push(generateVBindShorthandInlayHint(exp.loc, propVariableName));
 				}
 			}
 		}

diff --git a/packages/language-core/lib/codegen/template/interpolation.ts b/packages/language-core/lib/codegen/template/interpolation.ts
@@ -14,8 +14,7 @@ export function* generateInterpolation(
 	start: number | undefined,
 	data: VueCodeInformation | ((offset: number) => VueCodeInformation) | undefined,
 	prefix: string,
-	suffix: string,
-	inlayHints: [Code, number][] = []
+	suffix: string
 ): Generator<Code> {
 	const code = prefix + _code + suffix;
 	const ast = createTsAst(options.ts, astHolder, code);

diff --git a/packages/language-core/lib/codegen/template/slotOutlet.ts b/packages/language-core/lib/codegen/template/slotOutlet.ts
@@ -82,6 +82,9 @@ export function* generateSlotOutlet(
 			&& nameProp.exp?.type === CompilerDOM.NodeTypes.SIMPLE_EXPRESSION
 		) {
 			const isShortHand = nameProp.arg?.loc.start.offset === nameProp.exp.loc.start.offset;
+			if (isShortHand) {
+				ctx.inlayHints.push(generateVBindShorthandInlayHint(nameProp.exp.loc, 'name'));
+			}
 			const slotExpVar = ctx.getInternalVariable();
 			yield `var ${slotExpVar} = `;
 			yield* generateInterpolation(
@@ -92,11 +95,7 @@ export function* generateSlotOutlet(
 				nameProp.exp.loc.start.offset,
 				ctx.codeFeatures.all,
 				'(',
-				')',
-				isShortHand ? [[
-					generateVBindShorthandInlayHint(nameProp.exp.loc, 'name'),
-					nameProp.exp.loc.end.offset
-				]] : undefined
+				')'
 			);
 			yield ` as const${endOfLine}`;
 			ctx.dynamicSlots.push({

diff --git a/packages/language-core/lib/codegen/template/vBindShorthand.ts b/packages/language-core/lib/codegen/template/vBindShorthand.ts
@@ -1,21 +1,16 @@
 import type * as CompilerDOM from '@vue/compiler-dom';
-import type { Code } from "../../types";
+import type { InlayHintInfo } from "../types";
 
-export function generateVBindShorthandInlayHint(loc: CompilerDOM.SourceLocation, variableName: string): Code {
-	return [
-		'',
-		'template',
-		loc.end.offset,
-		{
-			__hint: {
-				setting: 'vue.inlayHints.vBindShorthand',
-				label: `="${variableName}"`,
-				tooltip: [
-					`This is a shorthand for \`${loc.source}="${variableName}"\`.`,
-					'To hide this hint, set `vue.inlayHints.vBindShorthand` to `false` in IDE settings.',
-					'[More info](https://github.com/vuejs/core/pull/9451)',
-				].join('\n\n'),
-			},
-		},
-	];
+export function generateVBindShorthandInlayHint(loc: CompilerDOM.SourceLocation, variableName: string): InlayHintInfo {
+	return {
+		blockName: 'template',
+		offset: loc.end.offset,
+		setting: 'vue.inlayHints.vBindShorthand',
+		label: `="${variableName}"`,
+		tooltip: [
+			`This is a shorthand for \`${loc.source}="${variableName}"\`.`,
+			'To hide this hint, set `vue.inlayHints.vBindShorthand` to `false` in IDE settings.',
+			'[More info](https://github.com/vuejs/core/pull/9451)',
+		].join('\n\n'),
+	};
 };