chore(language-core): code adjust

vuejs · Apr 21, 2024 · fa7a072 · fa7a072
1 parent 74643b9
commit fa7a072
Show file tree

Hide file tree

Showing 2 changed files with 16 additions and 11 deletions.
diff --git a/packages/language-core/lib/codegen/template/element.ts b/packages/language-core/lib/codegen/template/element.ts
@@ -138,11 +138,14 @@ export function* generateElement(
 	if (options.vueCompilerOptions.strictTemplates) {
 		// with strictTemplates, generate once for props type-checking + instance type
 		yield `const ${var_componentInstance} = ${var_functionalComponent}(`;
-		yield ['', 'template', startTagOffset, ctx.codeFeatures.verification];
-		yield `{`;
-		yield* generateElementProps(options, ctx, node, props, 'normal', propsFailedExps);
-		yield `}`;
-		yield ['', 'template', startTagOffset + tag.length, ctx.codeFeatures.verification];
+		yield* wrapWith(
+			startTagOffset,
+			startTagOffset + tag.length,
+			ctx.codeFeatures.verification,
+			`{`,
+			...generateElementProps(options, ctx, node, props, 'normal', propsFailedExps),
+			`}`,
+		);
 		yield `, ...__VLS_functionalComponentArgsRest(${var_functionalComponent}))${endOfLine}`;
 	}
 	else {
@@ -152,11 +155,14 @@ export function* generateElement(
 		yield `}, ...__VLS_functionalComponentArgsRest(${var_functionalComponent}))${endOfLine}`;
 		// and this for props type-checking
 		yield `({} as (props: __VLS_FunctionalComponentProps<typeof ${var_originalComponent}, typeof ${var_componentInstance}> & Record<string, unknown>) => void)(`;
-		yield ['', 'template', startTagOffset, ctx.codeFeatures.verification];
-		yield `{`;
-		yield* generateElementProps(options, ctx, node, props, 'normal', propsFailedExps);
-		yield `}`;
-		yield ['', 'template', startTagOffset + tag.length, ctx.codeFeatures.verification];
+		yield* wrapWith(
+			startTagOffset,
+			startTagOffset + tag.length,
+			ctx.codeFeatures.verification,
+			`{`,
+			...generateElementProps(options, ctx, node, props, 'normal', propsFailedExps),
+			`}`,
+		);
 		yield `)${endOfLine}`;
 	}
 

diff --git a/packages/language-core/lib/codegen/template/elementProps.ts b/packages/language-core/lib/codegen/template/elementProps.ts
@@ -291,7 +291,6 @@ function* generateAttrValue(attrNode: CompilerDOM.TextNode, features: VueCodeInf
 		content = content.slice(1, -1);
 	}
 	if (needToUnicode(content)) {
-		yield ['', 'template', start, features];
 		yield* wrapWith(
 			start,
 			end,