Merge pull request #1310 from HubSpot/mnobile_hubspot/fix-macro-ternary-npe

Fix NPE when calling macros inside ternary with variable condition

Author: mnobile-hs

src/main/java/com/hubspot/jinjava/el/ext/ExtendedParser.java

@@ -281,7 +281,7 @@ protected AstNode nonliteral() throws ScanException, ParseException {
     switch (getToken().getSymbol()) {
       case IDENTIFIER:
         String name = consumeToken().getImage();
-        if (getToken().getSymbol() == COLON) {
+        if (getToken().getSymbol() == COLON && getToken().getImage().equals(":")) {
           Symbol lookahead = lookahead(0).getSymbol();
           if (
             isPossibleExpTest(lookahead) &&

src/test/java/com/hubspot/jinjava/lib/tag/MacroTagTest.java

@@ -373,6 +373,32 @@ public void itCorrectlyScopesNestedMacroTags() {
     }
   }
 
+  @Test
+  public void itCallsMacroInTernaryWithVariableCondition() {
+    String template =
+      "{% macro greet(name) %}Hello {{ name }}{% endmacro %}" +
+      "{{ greet('world') if myVar else greet('nobody') }}";
+
+    context.put("myVar", true);
+    assertThat(jinjava.render(template, context).trim()).isEqualTo("Hello world");
+
+    context.put("myVar", false);
+    assertThat(jinjava.render(template, context).trim()).isEqualTo("Hello nobody");
+  }
+
+  @Test
+  public void itCallsMacroInStandardTernaryWithVariableCondition() {
+    String template =
+      "{% macro greet(name) %}Hello {{ name }}{% endmacro %}" +
+      "{{ myVar ? greet('world') : greet('nobody') }}";
+
+    context.put("myVar", true);
+    assertThat(jinjava.render(template, context).trim()).isEqualTo("Hello world");
+
+    context.put("myVar", false);
+    assertThat(jinjava.render(template, context).trim()).isEqualTo("Hello nobody");
+  }
+
   private Node snippet(String jinja) {
     return new TreeParser(interpreter, jinja).buildTree().getChildren().getFirst();
   }