Whitespace control else failure fix #478

Author: jknack

handlebars/src/main/antlr4/com/github/jknack/handlebars/internal/HbsLexer.g4

@@ -293,7 +293,7 @@ BOOLEAN
 
 ELSE
   :
-   '~'? 'else' '~'?
+   'else'
   ;
 
 QID

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

@@ -261,7 +261,7 @@ public boolean decorate() {
   public Template inverse(final String inverseLabel, final Template inverse) {
     notNull(inverseLabel, "The inverseLabel can't be null.");
     isTrue(inverseLabel.equals("^") || inverseLabel.equals("else"),
-        "The inverseLabel must be one of '^' or 'else'.");
+        "The inverseLabel must be one of '^' or 'else'. Found: " + inverseLabel);
     this.inverseLabel = inverseLabel;
     this.inverse = notNull(inverse, "The inverse's template is required.");
     return this;

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

@@ -229,9 +229,10 @@ public Template visitBlock(final BlockContext ctx) {
     block.filename(source.filename());
     block.position(nameStart.getLine(), nameStart.getCharPositionInLine());
     String startDelim = ctx.start.getText();
+    String endDelim = ctx.stop.getText();
     startDelim = startDelim.substring(0, startDelim.length() - 1);
     block.startDelimiter(startDelim);
-    block.endDelimiter(ctx.stop.getText());
+    block.endDelimiter(endDelim);
 
     Template body = visitBody(ctx.thenBody);
     if (body != null) {
@@ -249,6 +250,9 @@ public Template visitBlock(final BlockContext ctx) {
           if (inverseLabel.startsWith(startDelim)) {
             inverseLabel = inverseLabel.substring(startDelim.length());
           }
+          if (inverseLabel.endsWith("~")) {
+            inverseLabel = inverseLabel.substring(0, inverseLabel.length() - 1);
+          }
           elseroot.inverse(inverseLabel, unless);
         }
       } else {

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

@@ -167,7 +167,7 @@ private void trim(final Token startToken, final Token endToken) {
     }
 
     String end = text(endToken);
-    if (end.indexOf("~") == 0) {
+    if (end.indexOf("~") >= 0) {
       pending += 1;
     }
 

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

@@ -0,0 +1,22 @@
+package com.github.jknack.handlebars.issues;
+
+import com.github.jknack.handlebars.v4Test;
+import org.junit.Test;
+
+import java.io.IOException;
+
+public class Issue478 extends v4Test {
+
+  @Test
+  public void whiteSpaceControlShouldWorkOnElse() throws IOException {
+    shouldCompileTo("\n{{~#if bold~}}\n<b>\n{{else}}\n<i>\n{{~/if~}}\n", $("hash", $("bold", true)), "<b>\n");
+    shouldCompileTo("\n{{~#if bold~}}\n<b>\n{{else}}\n<i>\n{{~/if~}}\n", $("hash", $("bold", false)), "\n<i>");
+
+    shouldCompileTo("\n{{~#if bold~}}\n<b>\n{{~else~}}\n<i>\n{{~/if~}}\n", $("hash", $("bold", true)), "<b>");
+    shouldCompileTo("\n{{~#if bold~}}\n<b>\n{{~else~}}\n<i>\n{{~/if~}}\n", $("hash", $("bold", false)), "<i>");
+
+    shouldCompileTo("\n{{~#if bold~}}\n<b>\n{{~^~}}\n<i>\n{{~/if~}}\n", $("hash", $("bold", true)), "<b>");
+    shouldCompileTo("\n{{~#if bold~}}\n<b>\n{{~^~}}\n<i>\n{{~/if~}}\n", $("hash", $("bold", false)), "<i>");
+  }
+
+}