Whitespace around {{else}} and {{^}} not stripped in pretty print mode fix #584

Author: jknack

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

@@ -136,6 +136,10 @@ public void enterUnless(final UnlessContext ctx) {
     hasTag(true);
   }
 
+  @Override public void enterElseBlock(HbsParser.ElseBlockContext ctx) {
+    hasTag(true);
+  }
+
   @Override
   public void exitUnless(final UnlessContext ctx) {
     hasTag(true);

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

@@ -0,0 +1,39 @@
+package com.github.jknack.handlebars.issues;
+
+import com.github.jknack.handlebars.Handlebars;
+import com.github.jknack.handlebars.v4Test;
+import org.junit.Test;
+
+import java.io.IOException;
+
+public class Issue584 extends v4Test {
+
+  @Override protected void configure(Handlebars handlebars) {
+    handlebars.setPrettyPrint(true);
+  }
+
+  @Test
+  public void shouldRemoveBlankAroundElse()
+      throws IOException {
+    shouldCompileTo("A\n"
+            + "{{#if someVariableWhichIsFalse}}\n"
+            + "B\n"
+            + "{{else}}\n"
+            + "C\n"
+            + "{{/if}}\n"
+            + "D", $, "A\n"
+        + "C\n"
+        + "D");
+
+    shouldCompileTo("A\n"
+        + "{{#if someVariableWhichIsFalse}}\n"
+        + "B\n"
+        + "{{^}}\n"
+        + "C\n"
+        + "{{/if}}\n"
+        + "D", $, "A\n"
+        + "C\n"
+        + "D");
+  }
+
+}

handlebars/src/test/resources/com/github/jknack/handlebars/helpers.yml

@@ -179,7 +179,6 @@ tests:
 
     expected: |
       <div class="entry">
-
         <h1>Unknown Author</h1>
       </div>