From 126796edb9ae18f804499ddeae5ea3e6b9eec6e7 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E4=B8=89=E5=92=B2=E6=99=BA=E5=AD=90=20Kevin=20Deng?= Date: Thu, 8 Feb 2024 21:43:05 +0800 Subject: [PATCH] fix(compiler-vapor): add newline after effect body --- .../__tests__/transforms/__snapshots__/vOn.spec.ts.snap | 9 ++++++--- packages/compiler-vapor/src/generators/operation.ts | 8 ++++---- 2 files changed, 10 insertions(+), 7 deletions(-) diff --git a/packages/compiler-vapor/__tests__/transforms/__snapshots__/vOn.spec.ts.snap b/packages/compiler-vapor/__tests__/transforms/__snapshots__/vOn.spec.ts.snap index 90c772467..9bb4db0b0 100644 --- a/packages/compiler-vapor/__tests__/transforms/__snapshots__/vOn.spec.ts.snap +++ b/packages/compiler-vapor/__tests__/transforms/__snapshots__/vOn.spec.ts.snap @@ -340,7 +340,8 @@ export function render(_ctx) { _renderEffect(() => { _on(n1, (_ctx.event) === "click" ? "mouseup" : (_ctx.event), () => _ctx.test, undefined, { modifiers: ["middle"] - })}) + }) + }) return n0 }" `; @@ -370,7 +371,8 @@ export function render(_ctx) { _on(n1, (_ctx.event) === "click" ? "contextmenu" : (_ctx.event), () => _ctx.test, undefined, { modifiers: ["right"], keys: ["right"] - })}) + }) + }) return n0 }" `; @@ -398,7 +400,8 @@ export function render(_ctx) { _on(n1, _ctx.e, () => _ctx.test, undefined, { modifiers: ["left"], keys: ["left"] - })}) + }) + }) return n0 }" `; diff --git a/packages/compiler-vapor/src/generators/operation.ts b/packages/compiler-vapor/src/generators/operation.ts index ca48cd49f..3dbb75f94 100644 --- a/packages/compiler-vapor/src/generators/operation.ts +++ b/packages/compiler-vapor/src/generators/operation.ts @@ -76,14 +76,14 @@ export function genEffect({ operations }: IREffect, context: CodegenContext) { `${vaporHelper('renderEffect')}(() => `, ) - const [fragOps, pushOps] = buildCodeFragment() + const [operationsExps, pushOps] = buildCodeFragment() operations.forEach(op => pushOps(...genOperation(op, context))) - const newlineCount = fragOps.filter(frag => frag === NEWLINE).length + const newlineCount = operationsExps.filter(frag => frag === NEWLINE).length if (newlineCount > 1) { - push('{', INDENT_START, ...fragOps, INDENT_END, '})') + push('{', INDENT_START, ...operationsExps, INDENT_END, NEWLINE, '})') } else { - push(...fragOps.filter(frag => frag !== NEWLINE), ')') + push(...operationsExps.filter(frag => frag !== NEWLINE), ')') } return frag