From 31db35e2e6f6f9464db6947230b8a7eda29852b5 Mon Sep 17 00:00:00 2001 From: Johnson Chu Date: Wed, 29 Nov 2023 14:06:41 +0800 Subject: [PATCH] fix(language-core): syntax breaks if option does not have trailing comma --- packages/language-core/src/generators/script.ts | 8 ++------ 1 file changed, 2 insertions(+), 6 deletions(-) diff --git a/packages/language-core/src/generators/script.ts b/packages/language-core/src/generators/script.ts index 9a0f859ea1..ac7e687117 100644 --- a/packages/language-core/src/generators/script.ts +++ b/packages/language-core/src/generators/script.ts @@ -600,19 +600,15 @@ declare function defineProp(value?: T | (() => T), required?: boolean, rest?: codes.push(`(await import('${vueCompilerOptions.lib}')).defineComponent({\n`); } - generateComponentOptions(functional); - codes.push(`setup() {\n`); codes.push(`return {\n`); - generateSetupReturns(); - if (scriptSetupRanges.expose.define) { codes.push(`...__VLS_exposed,\n`); } - codes.push(`};\n`); codes.push(`},\n`); + generateComponentOptions(functional); codes.push(`})`); } function generateComponentOptions(functional: boolean) { @@ -734,7 +730,6 @@ declare function defineProp(value?: T | (() => T), required?: boolean, rest?: if (scriptSetup && scriptSetupRanges) { codes.push(`const __VLS_internalComponent = (await import('${vueCompilerOptions.lib}')).defineComponent({\n`); - generateComponentOptions(functional); codes.push(`setup() {\n`); codes.push(`return {\n`); generateSetupReturns(); @@ -773,6 +768,7 @@ declare function defineProp(value?: T | (() => T), required?: boolean, rest?: } codes.push(`};\n`); // return { codes.push(`},\n`); // setup() { + generateComponentOptions(functional); codes.push(`});\n`); // defineComponent({ } else if (script) {