Skip to content

Fix NPE when calling macros inside ternary with variable condition #1310

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
mnobile-hs merged 2 commits into from
Apr 10, 2026
+27 −1
Merged

Fix NPE when calling macros inside ternary with variable condition #1310

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
92a0739
Fix NPE when calling macros inside ternary with variable condition
Apr 10, 2026
d57126e
Add test for macro in standard ternary (? :) syntax
Apr 10, 2026
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion src/main/java/com/hubspot/jinjava/el/ext/ExtendedParser.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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) &&
Expand Down
26 changes: 26 additions & 0 deletions src/test/java/com/hubspot/jinjava/lib/tag/MacroTagTest.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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') }}";
Copy link
Copy Markdown
Contributor

@jasmith-hs jasmith-hs Apr 10, 2026

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Could you add an adjacent test for a ternary using ? and : too to ensure that's also parsing properly

{{ 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");
}

@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();
}
Expand Down
Loading