jessebrault/groowt
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Fixed false positive warning for script statements in preamble.

Browse Source
This commit is contained in:
JesseBrault0709 2024-05-27 10:53:55 +02:00
parent 566f7921e5
commit 4800ceb34f
2 changed files with 14 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
web-view-components-compiler/src/main/java/groowt/view/component/web/transpile/DefaultGroovyTranspiler.java
View File

@ -1,6 +1,5 @@
package groowt.view.component.web.transpile; package groowt.view.component.web.transpile;
import groovy.transform.Field;
import groowt.view.component.compiler.ComponentTemplateCompileException; import groowt.view.component.compiler.ComponentTemplateCompileException;
import groowt.view.component.compiler.ComponentTemplateCompileUnit; import groowt.view.component.compiler.ComponentTemplateCompileUnit;
import groowt.view.component.compiler.ComponentTemplateCompilerConfiguration; import groowt.view.component.compiler.ComponentTemplateCompilerConfiguration;
@ -32,8 +31,6 @@ public class DefaultGroovyTranspiler implements GroovyTranspiler {
private static final Logger logger = LoggerFactory.getLogger(DefaultGroovyTranspiler.class); private static final Logger logger = LoggerFactory.getLogger(DefaultGroovyTranspiler.class);
private static final ClassNode FIELD_ANNOTATION = ClassHelper.make(Field.class);
protected TranspilerConfiguration getConfiguration( protected TranspilerConfiguration getConfiguration(
ClassLoaderComponentClassNodeResolver classLoaderComponentClassNodeResolver ClassLoaderComponentClassNodeResolver classLoaderComponentClassNodeResolver
) { ) {
@ -122,7 +119,10 @@ public class DefaultGroovyTranspiler implements GroovyTranspiler {
} }
final BlockStatement preambleBlock = convertResult.blockStatement(); final BlockStatement preambleBlock = convertResult.blockStatement();
if (preambleBlock != null) { if (!(preambleBlock == null
|| preambleBlock.isEmpty()
|| preambleBlock.getStatements().getFirst() instanceof ReturnStatement)
) {
logger.warn( logger.warn(
"{} contains script statements which are not supported. Currently, only classes and" "{} contains script statements which are not supported. Currently, only classes and"
+ " methods are supported. The rest will be ignored.", + " methods are supported. The rest will be ignored.",

10
web-view-components-compiler/src/testFixtures/java/groowt/view/component/web/transpiler/GroovyTranspilerTests.java
View File

@ -89,4 +89,14 @@ public abstract class GroovyTranspilerTests {
this.doTranspile("<GroovyTranspilerTests.Greeter target='World' />"); this.doTranspile("<GroovyTranspilerTests.Greeter target='World' />");
} }
@Test
public void withPackageInPreamble() {
this.doTranspile("""
---
package test
---
Hello, World!
""".stripIndent().trim());
}
} }