Embedded helper produces invalid template for {{else if}} block fix #619

Author: jknack

handlebars/src/main/java/com/github/jknack/handlebars/internal/Block.java

@@ -309,7 +309,7 @@ public Template body() {
 
   @Override
   public String text() {
-    return text(true);
+    return text(true, true);
   }
 
   /**
@@ -318,7 +318,7 @@ public String text() {
    * @param complete True if the inner block should be added.
    * @return A string version of this block.
    */
-  private String text(final boolean complete) {
+  private String text(final boolean complete, boolean close) {
     StringBuilder buffer = new StringBuilder();
     buffer.append(startDelimiter).append(type).append(name);
     String params = paramsToString(this.params);
@@ -335,15 +335,25 @@ private String text(final boolean complete) {
     buffer.append(endDelimiter);
     if (complete) {
       buffer.append(body == null ? "" : body.text());
-      buffer.append(inverse == Template.EMPTY ? "" : "{{" + inverseLabel + "}}" + inverse.text());
+      if (inverse != EMPTY) {
+        if (inverse instanceof Block) {
+          String elseif = ((Block) inverse).text(true, false);
+          buffer.append(elseif);
+        } else {
+          buffer.append(startDelimiter).append(inverseLabel).append(endDelimiter)
+              .append(inverse.text());
+        }
+      }
     } else {
       buffer.append("\n...\n");
     }
-    buffer.append(startDelimiter);
-    if (type.equals("{{")) {
-      buffer.append("{{");
+    if (close) {
+      buffer.append(startDelimiter);
+      if (type.equals("{{")) {
+        buffer.append("{{");
+      }
+      buffer.append('/').append(name).append(endDelimiter);
     }
-    buffer.append('/').append(name).append(endDelimiter);
     return buffer.toString();
   }
 

handlebars/src/main/java/com/github/jknack/handlebars/internal/TemplateBuilder.java

@@ -216,7 +216,7 @@ public Template visitBlock(final BlockContext ctx) {
     }
 
     hasTag(true);
-    Block block = null;
+    Block block;
     if (decorator) {
       block = new BlockDecorator(handlebars, name, false, params(sexpr.param()),
           hash(sexpr.hash()), blockParams(ctx.blockParams()), level == 1);
@@ -258,12 +258,16 @@ public Template visitBlock(final BlockContext ctx) {
         SexprContext elseexpr = elseStmtChain.sexpr();
         Token elsenameStart = elseexpr.QID().getSymbol();
         String elsename = elsenameStart.getText();
-        Block elseblock = new Block(handlebars, elsename, false, "#", params(elseexpr.param()),
+        String type = elseStmtChain.inverseToken.getText();
+        if (type.equals("else")) {
+          type = "else ";
+        }
+        Block elseblock = new Block(handlebars, elsename, false, type, params(elseexpr.param()),
             hash(elseexpr.hash()), blockParams(elseStmtChain.blockParams()));
         elseblock.filename(source.filename());
         elseblock.position(elsenameStart.getLine(), elsenameStart.getCharPositionInLine());
         elseblock.startDelimiter(startDelim);
-        elseblock.endDelimiter(elseBlock.stop.getText());
+        elseblock.endDelimiter(elseStmtChain.END().getText());
         Template elsebody = visitBody(elseStmtChain.unlessBody);
         elseblock.body(elsebody);
 

handlebars/src/test/java/com/github/jknack/handlebars/issues/Issue614.java

@@ -1,38 +1,14 @@
 package com.github.jknack.handlebars.issues;
 
-import com.github.jknack.handlebars.Handlebars;
 import com.github.jknack.handlebars.v4Test;
-import org.junit.BeforeClass;
-import org.junit.Test;
-
 import static org.junit.Assert.assertEquals;
-
-import java.io.IOException;
-import java.util.Arrays;
+import org.junit.Test;
 
 public class Issue614 extends v4Test {
 
-  @Override protected void configure(Handlebars handlebars) {
-    try {
-      handlebars.registerHelpers("helpers.js",
-          "Handlebars.registerHelper('number', function(value) {\n"
-              + "   return value;\n"
-              + "});\n"
-              + "\n"
-              + "Handlebars.registerHelper('len', function(array) {\n"
-              + "   return array.length;\n"
-              + "});");
-    } catch (Exception x) {
-      throw new IllegalStateException(x);
-    }
-  }
-
   @Test
   public void shouldFavorIntOverDouble() throws Exception {
-    shouldCompileTo("{{number this}}", $("hash", 3), "3");
-    shouldCompileTo("{{number this}}", $("hash", 3.1), "3.1");
-
-    shouldCompileTo("{{len this}}", $("hash", new Object[]{1, 2, 3, 4}), "4");
-    shouldCompileTo("{{len this}}", $("hash", Arrays.asList(1, 2, 3, 4)), "4");
+    String text = compile("{{#if a}}a{{else if b}}b{{else}}c{{/if}}").text();
+    assertEquals("{{#if a}}a{{else if b}}b{{else}}c{{/if}}", text);
   }
 }

handlebars/src/test/java/com/github/jknack/handlebars/issues/Issue619.java

@@ -0,0 +1,34 @@
+package com.github.jknack.handlebars.issues;
+
+import com.github.jknack.handlebars.Handlebars;
+import com.github.jknack.handlebars.v4Test;
+import org.junit.Test;
+
+import java.util.Arrays;
+
+public class Issue619 extends v4Test {
+
+  @Override protected void configure(Handlebars handlebars) {
+    try {
+      handlebars.registerHelpers("helpers.js",
+          "Handlebars.registerHelper('number', function(value) {\n"
+              + "   return value;\n"
+              + "});\n"
+              + "\n"
+              + "Handlebars.registerHelper('len', function(array) {\n"
+              + "   return array.length;\n"
+              + "});");
+    } catch (Exception x) {
+      throw new IllegalStateException(x);
+    }
+  }
+
+  @Test
+  public void shouldFavorIntOverDouble() throws Exception {
+    shouldCompileTo("{{number this}}", $("hash", 3), "3");
+    shouldCompileTo("{{number this}}", $("hash", 3.1), "3.1");
+
+    shouldCompileTo("{{len this}}", $("hash", new Object[]{1, 2, 3, 4}), "4");
+    shouldCompileTo("{{len this}}", $("hash", Arrays.asList(1, 2, 3, 4)), "4");
+  }
+}