casid#285 default Content parameters work with binary templates

The default Content parameters are also generated in the renderMap() method as default parameters, so we need to wait with writing the static class fields until that part is complete.
edward3h · Oct 14, 2023 · 302ca59 · 302ca59
1 parent 478f494
commit 302ca59
Show file tree

Hide file tree

Showing 4 changed files with 48 additions and 28 deletions.
diff --git a/jte-kotlin/src/main/java/gg/jte/compiler/kotlin/KotlinCodeGenerator.java b/jte-kotlin/src/main/java/gg/jte/compiler/kotlin/KotlinCodeGenerator.java
@@ -123,20 +123,6 @@ public void onLineFinished() {
 
     @Override
     public void onComplete() {
-        // Line information must be updated before insert, otherwise the line info field is not up-to-date
-        int lineCount = 2;
-        if (!binaryTextParts.isEmpty()) {
-            lineCount += binaryTextParts.size() + 1;
-        }
-        kotlinCode.fillLines(fieldsMarker, lineCount);
-
-        StringBuilder fields = new StringBuilder();
-        addNameField(fields, classInfo.name);
-        addLineInfoField(fields);
-        writeBinaryTextParts(fields);
-
-        kotlinCode.insert(fieldsMarker, fields, false);
-
         kotlinCode.append("\t}\n");
 
         kotlinCode.append("\t@JvmStatic fun renderMap(");
@@ -172,6 +158,20 @@ public void onComplete() {
         kotlinCode.append("}\n");
         kotlinCode.append("}\n");
 
+        // Line information must be updated before insert, otherwise the line info field is not up-to-date
+        int lineCount = 2;
+        if (!binaryTextParts.isEmpty()) {
+            lineCount += binaryTextParts.size() + 1;
+        }
+        kotlinCode.fillLines(fieldsMarker, lineCount);
+
+        StringBuilder fields = new StringBuilder();
+        addNameField(fields, classInfo.name);
+        addLineInfoField(fields);
+        writeBinaryTextParts(fields);
+
+        kotlinCode.insert(fieldsMarker, fields, false);
+
         this.classInfo.lineInfo = kotlinCode.getLineInfo();
     }
 

diff --git a/jte-kotlin/src/test/java/gg/jte/kotlin/TemplateEngineTest.java b/jte-kotlin/src/test/java/gg/jte/kotlin/TemplateEngineTest.java
@@ -617,6 +617,16 @@ void tagWithDefaultParam_secondSet() {
         thenOutputIs("1, 5");
     }
 
+    @Test
+    void templateWithDefaultParam_content() {
+        givenTag("named", "@param one:gg.jte.Content = @`This is`\n" +
+                "@param two:Int = 2\n" +
+                "${one}: ${two}");
+        givenTemplate("@template.tag.named()");
+
+        thenOutputIs("This is: 2");
+    }
+
     @Test
     void tagWithVarArgs1() {
         givenTag("varargs",

diff --git a/jte/src/main/java/gg/jte/compiler/java/JavaCodeGenerator.java b/jte/src/main/java/gg/jte/compiler/java/JavaCodeGenerator.java
@@ -116,20 +116,6 @@ public void onLineFinished() {
 
     @Override
     public void onComplete() {
-        // Line information must be updated before insert, otherwise the line info field is not up-to-date
-        int lineCount = 2;
-        if (!binaryTextParts.isEmpty()) {
-            lineCount += binaryTextParts.size() + 1;
-        }
-        javaCode.fillLines(fieldsMarker, lineCount);
-
-        StringBuilder fields = new StringBuilder();
-        addNameField(fields, classInfo.name);
-        addLineInfoField(fields);
-        writeBinaryTextParts(fields);
-
-        javaCode.insert(fieldsMarker, fields, false);
-
         javaCode.append("\t}\n");
 
         javaCode.append("\tpublic static void renderMap(");
@@ -166,6 +152,20 @@ public void onComplete() {
 
         javaCode.append("}\n");
 
+        // Line information must be updated before insert, otherwise the line info field is not up-to-date
+        int lineCount = 2;
+        if (!binaryTextParts.isEmpty()) {
+            lineCount += binaryTextParts.size() + 1;
+        }
+        javaCode.fillLines(fieldsMarker, lineCount);
+
+        StringBuilder fields = new StringBuilder();
+        addNameField(fields, classInfo.name);
+        addLineInfoField(fields);
+        writeBinaryTextParts(fields);
+
+        javaCode.insert(fieldsMarker, fields, false);
+
         this.classInfo.lineInfo = javaCode.getLineInfo();
     }
 

diff --git a/jte/src/test/java/gg/jte/TemplateEngineTest.java b/jte/src/test/java/gg/jte/TemplateEngineTest.java
@@ -615,6 +615,16 @@ void templateWithDefaultParam_secondSet() {
         thenOutputIs("1, 5");
     }
 
+    @Test
+    void templateWithDefaultParam_content() {
+        givenTemplate("named.jte", "@param gg.jte.Content one = @`This is`\n" +
+                "@param int two = 2\n" +
+                "${one}: ${two}");
+        givenTemplate("@template.named()");
+
+        thenOutputIs("This is: 2");
+    }
+
     @Test
     void templateWithVarArgs1() {
         givenTemplate("varargs.jte",