refactor(language-core): resolve component ranges in parseScriptRanges, parseScriptSetupRanges

johnsoncodehk · johnsoncodehk · commit 2b0093db2ed4 · 2025-12-07T20:19:59.000+08:00
diff --git a/packages/language-core/lib/parsers/scriptRanges.ts b/packages/language-core/lib/parsers/scriptRanges.ts
@@ -1,11 +1,15 @@
 import type * as ts from 'typescript';
-import type { TextRange } from '../types';
+import type { TextRange, VueCompilerOptions } from '../types';
 import { getNodeText, getStartEnd } from '../utils/shared';
 import { getClosestMultiLineCommentRange, parseBindingRanges } from './utils';
 
 export interface ScriptRanges extends ReturnType<typeof parseScriptRanges> {}
 
-export function parseScriptRanges(ts: typeof import('typescript'), ast: ts.SourceFile, hasScriptSetup: boolean) {
+export function parseScriptRanges(
+	ts: typeof import('typescript'),
+	ast: ts.SourceFile,
+	vueCompilerOptions: VueCompilerOptions,
+) {
 	let exportDefault:
 		| TextRange & {
 			expression: TextRange;
@@ -24,7 +28,7 @@ export function parseScriptRanges(ts: typeof import('typescript'), ast: ts.Sourc
 		}
 		| undefined;
 
-	const bindings = hasScriptSetup ? parseBindingRanges(ts, ast) : [];
+	const { bindings, components } = parseBindingRanges(ts, ast, vueCompilerOptions.extensions);
 
 	ts.forEachChild(ast, raw => {
 		if (ts.isExportAssignment(raw)) {
@@ -92,6 +96,7 @@ export function parseScriptRanges(ts: typeof import('typescript'), ast: ts.Sourc
 		exportDefault,
 		componentOptions,
 		bindings,
+		components,
 	};
 
 	function _getStartEnd(node: ts.Node) {
diff --git a/packages/language-core/lib/parsers/scriptSetupRanges.ts b/packages/language-core/lib/parsers/scriptSetupRanges.ts
@@ -93,7 +93,7 @@ export function parseScriptSetupRanges(
 		range => tsCheckReg.test(text.slice(range.pos, range.end)),
 	)?.end ?? 0;
 
-	let bindings = parseBindingRanges(ts, ast);
+	let { bindings, components } = parseBindingRanges(ts, ast, vueCompilerOptions.extensions);
 	let foundNonImportExportNode = false;
 	let importSectionEndOffset = 0;
 
@@ -129,7 +129,7 @@ export function parseScriptSetupRanges(
 	ts.forEachChild(ast, node => visitNode(node, [ast]));
 
 	const templateRefNames = new Set(useTemplateRef.map(ref => ref.name));
-	bindings = bindings.filter(({ range }) => {
+	bindings = bindings.filter(range => {
 		const name = text.slice(range.start, range.end);
 		return !templateRefNames.has(name);
 	});
@@ -138,6 +138,7 @@ export function parseScriptSetupRanges(
 		leadingCommentEndOffset,
 		importSectionEndOffset,
 		bindings,
+		components,
 		defineModel,
 		defineProps,
 		withDefaults,
diff --git a/packages/language-core/lib/parsers/utils.ts b/packages/language-core/lib/parsers/utils.ts
@@ -3,39 +3,33 @@ import type { TextRange } from '../types';
 import { collectBindingRanges } from '../utils/collectBindings';
 import { getNodeText, getStartEnd } from '../utils/shared';
 
-export function parseBindingRanges(ts: typeof import('typescript'), ast: ts.SourceFile) {
-	const bindings: {
-		range: TextRange;
-		moduleName?: string;
-		isDefaultImport?: boolean;
-		isNamespace?: boolean;
-	}[] = [];
+export function parseBindingRanges(
+	ts: typeof import('typescript'),
+	ast: ts.SourceFile,
+	componentExtsensions: string[],
+) {
+	const bindings: TextRange[] = [];
+	const components: TextRange[] = [];
 
 	ts.forEachChild(ast, node => {
 		if (ts.isVariableStatement(node)) {
 			for (const decl of node.declarationList.declarations) {
 				const ranges = collectBindingRanges(ts, decl.name, ast);
-				bindings.push(...ranges.map(range => ({ range })));
+				bindings.push(...ranges);
 			}
 		}
 		else if (ts.isFunctionDeclaration(node)) {
 			if (node.name && ts.isIdentifier(node.name)) {
-				bindings.push({
-					range: _getStartEnd(node.name),
-				});
+				bindings.push(_getStartEnd(node.name));
 			}
 		}
 		else if (ts.isClassDeclaration(node)) {
 			if (node.name) {
-				bindings.push({
-					range: _getStartEnd(node.name),
-				});
+				bindings.push(_getStartEnd(node.name));
 			}
 		}
 		else if (ts.isEnumDeclaration(node)) {
-			bindings.push({
-				range: _getStartEnd(node.name),
-			});
+			bindings.push(_getStartEnd(node.name));
 		}
 
 		if (ts.isImportDeclaration(node)) {
@@ -45,38 +39,40 @@ export function parseBindingRanges(ts: typeof import('typescript'), ast: ts.Sour
 				const { name, namedBindings } = node.importClause;
 
 				if (name) {
-					bindings.push({
-						range: _getStartEnd(name),
-						moduleName,
-						isDefaultImport: true,
-					});
+					if (componentExtsensions.some(ext => moduleName.endsWith(ext))) {
+						components.push(_getStartEnd(name));
+					}
 				}
 				if (namedBindings) {
 					if (ts.isNamedImports(namedBindings)) {
 						for (const element of namedBindings.elements) {
 							if (element.isTypeOnly) {
 								continue;
 							}
-							bindings.push({
-								range: _getStartEnd(element.name),
-								moduleName,
-								isDefaultImport: element.propertyName?.text === 'default',
-							});
+							if (
+								element.propertyName
+								&& _getNodeText(element.propertyName) === 'default'
+								&& componentExtsensions.some(ext => moduleName.endsWith(ext))
+							) {
+								components.push(_getStartEnd(element.name));
+							}
+							else {
+								bindings.push(_getStartEnd(element.name));
+							}
 						}
 					}
 					else {
-						bindings.push({
-							range: _getStartEnd(namedBindings.name),
-							moduleName,
-							isNamespace: true,
-						});
+						bindings.push(_getStartEnd(namedBindings.name));
 					}
 				}
 			}
 		}
 	});
 
-	return bindings;
+	return {
+		bindings,
+		components,
+	};
 
 	function _getStartEnd(node: ts.Node) {
 		return getStartEnd(ts, node, ast);
diff --git a/packages/language-core/lib/plugins/vue-tsx.ts b/packages/language-core/lib/plugins/vue-tsx.ts
@@ -74,7 +74,7 @@ function useCodegen(
 
 	const getScriptRanges = computed(() =>
 		sfc.script && validLangs.has(sfc.script.lang)
-			? parseScriptRanges(ts, sfc.script.ast, !!sfc.scriptSetup)
+			? parseScriptRanges(ts, sfc.script.ast, getResolvedOptions())
 			: undefined
 	);
 
@@ -88,27 +88,13 @@ function useCodegen(
 		const names = new Set<string>();
 		const scriptSetupRanges = getScriptSetupRanges();
 		if (sfc.scriptSetup && scriptSetupRanges) {
-			for (const { range, moduleName, isDefaultImport, isNamespace } of scriptSetupRanges.bindings) {
-				if (
-					moduleName
-					&& isDefaultImport
-					&& !isNamespace
-					&& ctx.vueCompilerOptions.extensions.some(ext => moduleName.endsWith(ext))
-				) {
-					names.add(sfc.scriptSetup.content.slice(range.start, range.end));
-				}
+			for (const range of scriptSetupRanges.components) {
+				names.add(sfc.scriptSetup.content.slice(range.start, range.end));
 			}
 			const scriptRange = getScriptRanges();
 			if (sfc.script && scriptRange) {
-				for (const { range, moduleName, isDefaultImport, isNamespace } of scriptRange.bindings) {
-					if (
-						moduleName
-						&& isDefaultImport
-						&& !isNamespace
-						&& ctx.vueCompilerOptions.extensions.some(ext => moduleName.endsWith(ext))
-					) {
-						names.add(sfc.script.content.slice(range.start, range.end));
-					}
+				for (const range of scriptRange.components) {
+					names.add(sfc.script.content.slice(range.start, range.end));
 				}
 			}
 		}
@@ -214,13 +200,13 @@ function useCodegen(
 		if (!sfc.scriptSetup || !scriptSetupRanges) {
 			return allVars;
 		}
-		for (const { range } of scriptSetupRanges.bindings) {
+		for (const range of scriptSetupRanges.bindings) {
 			const name = sfc.scriptSetup.content.slice(range.start, range.end);
 			allVars.add(name);
 		}
 		const scriptRanges = getScriptRanges();
 		if (sfc.script && scriptRanges) {
-			for (const { range } of scriptRanges.bindings) {
+			for (const range of scriptRanges.bindings) {
 				const name = sfc.script.content.slice(range.start, range.end);
 				allVars.add(name);
 			}
@@ -276,6 +262,5 @@ function useCodegen(
 		getGeneratedTemplate,
 		getImportComponentNames,
 		getSetupExposed,
-		getSetupConsts,
 	};
 }
diff --git a/packages/language-service/lib/plugins/vue-template.ts b/packages/language-service/lib/plugins/vue-template.ts
@@ -685,7 +685,7 @@ export function create(
 									version++;
 								})());
 							}
-							const scriptSetupRanges = tsCodegen.get(root.sfc)?.getScriptSetupRanges();
+							const codegen = tsCodegen.get(root.sfc);
 							const names = new Set<string>();
 							const tags: html.ITagData[] = [];
 
@@ -698,13 +698,19 @@ export function create(
 								}
 							}
 
-							for (const binding of scriptSetupRanges?.bindings ?? []) {
-								const name = root.sfc.scriptSetup!.content.slice(binding.range.start, binding.range.end);
-								if (tagNameCasing === TagNameCasing.Kebab) {
-									names.add(hyphenateTag(name));
-								}
-								else {
-									names.add(name);
+							if (codegen) {
+								for (
+									const name of [
+										...codegen.getImportComponentNames(),
+										...codegen.getSetupExposed(),
+									]
+								) {
+									if (tagNameCasing === TagNameCasing.Kebab) {
+										names.add(hyphenateTag(name));
+									}
+									else {
+										names.add(name);
+									}
 								}
 							}
 
