refactor(language-core): remove text range from component options

Author: KazariEX

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

@@ -48,7 +48,7 @@ function* generateScript(
 		yield* generateScriptSetupImports(options.sfc.scriptSetup, options.scriptSetupRanges);
 	}
 	if (options.sfc.script && options.scriptRanges) {
-		const exportDefault = options.scriptRanges.componentOptions ?? options.scriptRanges.exportDefault;
+		const { exportDefault, componentOptions } = options.scriptRanges;
 		if (options.sfc.scriptSetup && options.scriptSetupRanges) {
 			if (exportDefault) {
 				yield generateSfcBlockSection(options.sfc.script, 0, exportDefault.start, codeFeatures.all);
@@ -60,16 +60,18 @@ function* generateScript(
 			}
 		}
 		else if (exportDefault) {
+			const { expression } = componentOptions ?? exportDefault;
+
 			let wrapLeft: string | undefined;
 			let wrapRight: string | undefined;
 			if (
-				options.sfc.script.content[exportDefault.expression.start] === '{'
+				options.sfc.script.content[expression.start] === '{'
 				&& options.vueCompilerOptions.optionsWrapper.length
 			) {
 				[wrapLeft, wrapRight] = options.vueCompilerOptions.optionsWrapper;
 				ctx.inlayHints.push({
 					blockName: options.sfc.script.name,
-					offset: exportDefault.expression.start,
+					offset: expression.start,
 					setting: 'vue.inlayHints.optionsWrapper',
 					label: wrapLeft || '[Missing optionsWrapper[0]]',
 					tooltip: [
@@ -78,7 +80,7 @@ function* generateScript(
 					].join('\n\n'),
 				}, {
 					blockName: options.sfc.script.name,
-					offset: exportDefault.expression.end,
+					offset: expression.end,
 					setting: 'vue.inlayHints.optionsWrapper',
 					label: wrapRight || '[Missing optionsWrapper[1]]',
 				});
@@ -89,12 +91,7 @@ function* generateScript(
 			if (wrapLeft) {
 				yield wrapLeft;
 			}
-			yield generateSfcBlockSection(
-				options.sfc.script,
-				exportDefault.expression.start,
-				exportDefault.expression.end,
-				codeFeatures.all,
-			);
+			yield generateSfcBlockSection(options.sfc.script, expression.start, expression.end, codeFeatures.all);
 			if (wrapRight) {
 				yield wrapRight;
 			}
@@ -149,7 +146,7 @@ export function* generateConstExport(
 	if (options.sfc.script) {
 		yield* generatePartiallyEnding(
 			options.sfc.script.name,
-			options.scriptRanges?.componentOptions?.start ?? options.sfc.script.content.length,
+			options.scriptRanges?.exportDefault?.start ?? options.sfc.script.content.length,
 			'#3632/script.vue',
 		);
 	}

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

@@ -12,7 +12,7 @@ export function parseScriptRanges(ts: typeof import('typescript'), ast: ts.Sourc
 		}
 		| undefined;
 	let componentOptions:
-		| TextRange & {
+		| {
 			expression: TextRange;
 			args: TextRange;
 			argsNode: ts.ObjectLiteralExpression;
@@ -32,6 +32,10 @@ export function parseScriptRanges(ts: typeof import('typescript'), ast: ts.Sourc
 				..._getStartEnd(raw),
 				expression: _getStartEnd(raw.expression),
 			};
+			const comment = getClosestMultiLineCommentRange(ts, raw, [], ast);
+			if (comment) {
+				exportDefault.start = comment.start;
+			}
 
 			let node: ts.AsExpression | ts.ExportAssignment | ts.ParenthesizedExpression = raw;
 			while (isAsExpression(node.expression) || ts.isParenthesizedExpression(node.expression)) { // fix https://github.com/vuejs/language-tools/issues/1882
@@ -71,7 +75,6 @@ export function parseScriptRanges(ts: typeof import('typescript'), ast: ts.Sourc
 					}
 				});
 				componentOptions = {
-					..._getStartEnd(raw),
 					expression: _getStartEnd(node.expression),
 					args: _getStartEnd(obj),
 					argsNode: obj,
@@ -81,10 +84,6 @@ export function parseScriptRanges(ts: typeof import('typescript'), ast: ts.Sourc
 					name: nameOptionNode ? _getStartEnd(nameOptionNode) : undefined,
 					inheritAttrs: inheritAttrsOption,
 				};
-				const comment = getClosestMultiLineCommentRange(ts, raw, [], ast);
-				if (comment) {
-					componentOptions.start = comment.start;
-				}
 			}
 		}
 	});