From 39fd0c8e4870620c8af241df2687a8791f9d5972 Mon Sep 17 00:00:00 2001 From: JesseBrault0709 <62299747+JesseBrault0709@users.noreply.github.com> Date: Sat, 1 Jun 2024 09:43:36 +0200 Subject: [PATCH] Attr closure values now are reduced to single expressions if possible. --- .../web/transpile/DefaultValueNodeTranspiler.java | 12 ++++-------- 1 file changed, 4 insertions(+), 8 deletions(-) diff --git a/web-view-components-compiler/src/main/java/groowt/view/component/web/transpile/DefaultValueNodeTranspiler.java b/web-view-components-compiler/src/main/java/groowt/view/component/web/transpile/DefaultValueNodeTranspiler.java index 899d6d9..60be4bc 100644 --- a/web-view-components-compiler/src/main/java/groowt/view/component/web/transpile/DefaultValueNodeTranspiler.java +++ b/web-view-components-compiler/src/main/java/groowt/view/component/web/transpile/DefaultValueNodeTranspiler.java @@ -4,7 +4,9 @@ import groowt.view.component.web.ast.node.*; import groowt.view.component.web.transpile.groovy.GroovyUtil; import groowt.view.component.web.transpile.groovy.GroovyUtil.ConvertResult; import org.codehaus.groovy.ast.Parameter; -import org.codehaus.groovy.ast.expr.*; +import org.codehaus.groovy.ast.expr.ClosureExpression; +import org.codehaus.groovy.ast.expr.ConstantExpression; +import org.codehaus.groovy.ast.expr.Expression; import org.codehaus.groovy.ast.stmt.BlockStatement; import org.codehaus.groovy.ast.stmt.EmptyStatement; import org.codehaus.groovy.ast.stmt.ExpressionStatement; @@ -35,13 +37,7 @@ public class DefaultValueNodeTranspiler implements ValueNodeTranspiler { final BlockStatement closureCode = (BlockStatement) convertedClosure.getCode(); if (!closureCode.isEmpty() && closureCode.getStatements().getFirst() instanceof ExpressionStatement expressionStatement) { - final Expression expression = expressionStatement.getExpression(); - return switch (expression) { - case ConstantExpression ignored -> expression; - case VariableExpression ignored -> expression; - case PropertyExpression ignored -> expression; - default -> convertedClosure; - }; + return expressionStatement.getExpression(); } return convertedClosure; }