Merge pull request #710 from HubSpot/for-in-whitespace

Use regex to match whitespace for locating the "in" in a for loop
HubSpot · Jul 14, 2021 · 1d08530 · 1d08530
2 parents ada1b59 + 3f771ee
commit 1d08530
Show file tree

Hide file tree

Showing 2 changed files with 14 additions and 3 deletions.
diff --git a/src/main/java/com/hubspot/jinjava/lib/tag/ForTag.java b/src/main/java/com/hubspot/jinjava/lib/tag/ForTag.java
@@ -45,6 +45,8 @@
 import java.util.Map;
 import java.util.Map.Entry;
 import java.util.Optional;
+import java.util.regex.Matcher;
+import java.util.regex.Pattern;
 import org.apache.commons.lang3.tuple.Pair;
 
 /**
@@ -93,6 +95,7 @@ public class ForTag implements Tag {
 
   private static final long serialVersionUID = 6175143875754966497L;
   private static final String LOOP = "loop";
+  private static final Pattern IN_PATTERN = Pattern.compile("\\sin\\s");
 
   @Override
   public boolean isRenderedInValidationMode() {
@@ -246,9 +249,9 @@ public Pair<List<String>, String> getLoopVarsAndExpression(TagToken tagToken) {
   }
 
   private Optional<String> getLoopExpression(String helpers) {
-    int inIndex = helpers.indexOf(" in ");
-    if (inIndex > 0) {
-      return Optional.of(helpers.substring(inIndex + 4).trim());
+    Matcher matcher = IN_PATTERN.matcher(helpers);
+    if (matcher.find()) {
+      return Optional.of(helpers.substring(matcher.end()).trim());
     }
     return Optional.empty();
   }

diff --git a/src/test/java/com/hubspot/jinjava/lib/tag/ForTagTest.java b/src/test/java/com/hubspot/jinjava/lib/tag/ForTagTest.java
@@ -308,6 +308,14 @@ public void itShouldHandleSpacesInMaps() {
     assertThat(rendered).isEqualTo("foo?\nbar?\n");
   }
 
+  @Test
+  public void itHandlesUnconventionalSpacing() {
+    String template = "{% for item\nin \t[0,1] %}" + "{{ item }}\n" + "{% endfor %}";
+
+    String rendered = jinjava.render(template, context);
+    assertThat(rendered).isEqualTo("0\n1\n");
+  }
+
   private Node fixture(String name) {
     try {
       return new TreeParser(