fix(language-core): combine dollar variable keys from the upper level interface

partial-revert #5185

Author: KazariEX

packages/language-core/lib/codegen/template/index.ts

@@ -21,8 +21,6 @@ export interface TemplateCodegenOptions {
 	hasDefineSlots?: boolean;
 	slotsAssignName?: string;
 	propsAssignName?: string;
-	slotsReferenceNames: Set<string>;
-	attrsReferenceNames: Set<string>;
 	inheritAttrs: boolean;
 	selfComponentName?: string;
 }
@@ -36,12 +34,6 @@ export function* generateTemplate(options: TemplateCodegenOptions): Generator<Co
 	if (options.propsAssignName) {
 		ctx.addLocalVariable(options.propsAssignName);
 	}
-	for (const name of options.slotsReferenceNames) {
-		ctx.addLocalVariable(name);
-	}
-	for (const name of options.attrsReferenceNames) {
-		ctx.addLocalVariable(name);
-	}
 	const slotsPropertyName = getSlotsPropertyName(options.vueCompilerOptions.target);
 	ctx.specialVars.add(slotsPropertyName);
 	ctx.specialVars.add('$attrs');
@@ -64,7 +56,7 @@ export function* generateTemplate(options: TemplateCodegenOptions): Generator<Co
 	for (const [name, type] of speicalTypes) {
 		yield `${name}: ${type}${endOfLine}`;
 	}
-	yield `} & { [K in keyof typeof __VLS_ctx]: unknown }${endOfLine}`;
+	yield `} & { [K in keyof import('${options.vueCompilerOptions.lib}').ComponentPublicInstance]: unknown }${endOfLine}`;
 
 	yield* ctx.generateAutoImportCompletion();
 	return ctx;

packages/language-core/lib/codegen/template/slotOutlet.ts

@@ -80,12 +80,12 @@ export function* generateSlotOutlet(
 		else {
 			yield* wrapWith(
 				startTagOffset,
-				startTagEndOffset, 
+				startTagEndOffset,
 				ctx.codeFeatures.verification,
 				`${options.slotsAssignName ?? '__VLS_slots'}[`,
 				...wrapWith(
 					startTagOffset,
-					startTagEndOffset, 
+					startTagEndOffset,
 					ctx.codeFeatures.verification,
 					`'default'`
 				),

packages/language-core/lib/parsers/scriptSetupRanges.ts

@@ -54,15 +54,11 @@ type DefineOptions = {
 	inheritAttrs?: string;
 };
 
-type UseAttrs = CallExpressionRange & {
-	name?: string;
-};
+type UseAttrs = CallExpressionRange;
 
 type UseCssModule = CallExpressionRange;
 
-type UseSlots = CallExpressionRange & {
-	name?: string;
-};
+type UseSlots = CallExpressionRange;
 
 type UseTemplateRef = CallExpressionRange & {
 	name?: string;
@@ -370,13 +366,13 @@ export function parseScriptSetupRanges(
 				}
 			}
 			else if (vueCompilerOptions.composables.useAttrs.includes(callText)) {
-				useAttrs.push(parseCallExpressionAssignment(node, parent));
+				useAttrs.push(parseCallExpression(node));
 			}
 			else if (vueCompilerOptions.composables.useCssModule.includes(callText)) {
 				useCssModule.push(parseCallExpression(node));
 			}
 			else if (vueCompilerOptions.composables.useSlots.includes(callText)) {
-				useSlots.push(parseCallExpressionAssignment(node, parent));
+				useSlots.push(parseCallExpression(node));
 			}
 			else if (
 				vueCompilerOptions.composables.useTemplateRef.includes(callText)

packages/language-core/lib/plugins/vue-tsx.ts

@@ -170,24 +170,6 @@ function createTsx(
 		return value !== 'false';
 	});
 
-	const getSetupSlotsReferenceName = computedSet(
-		computed(() => {
-			const newNames = new Set(
-				getScriptSetupRanges()?.useSlots.map(({ name }) => name).filter(name => name !== undefined)
-			);
-			return newNames;
-		})
-	);
-
-	const getSetupAttrsReferenceName = computedSet(
-		computed(() => {
-			const newNames = new Set(
-				getScriptSetupRanges()?.useAttrs.map(({ name }) => name).filter(name => name !== undefined)
-			);
-			return newNames;
-		})
-	);
-
 	const getComponentSelfName = computed(() => {
 		const { exportDefault } = getScriptRanges() ?? {};
 		if (sfc.script && exportDefault?.nameOption) {
@@ -221,8 +203,6 @@ function createTsx(
 			hasDefineSlots: setupHasDefineSlots(),
 			slotsAssignName: getSetupSlotsAssignName(),
 			propsAssignName: getSetupPropsAssignName(),
-			slotsReferenceNames: getSetupSlotsReferenceName(),
-			attrsReferenceNames: getSetupAttrsReferenceName(),
 			inheritAttrs: getSetupInheritAttrs(),
 			selfComponentName: getComponentSelfName(),
 		});