Skip to content

Fix filter and exptest chaining #1228

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

Open
jasmith-hs wants to merge 1 commit into
base: master
Choose a base branch
from
Open

Fix filter and exptest chaining #1228

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
42 changes: 20 additions & 22 deletions 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 @@ -529,11 +529,9 @@ protected AstNode value() throws ScanException, ParseException {
}
}

private AstNode parseOperators(AstNode left) throws ScanException, ParseException {
if ("|".equals(getToken().getImage()) && lookahead(0).getSymbol() == IDENTIFIER) {
AstNode v = left;

do {
private AstNode parseOperators(AstNode v) throws ScanException, ParseException {
while (true) {
if ("|".equals(getToken().getImage()) && lookahead(0).getSymbol() == IDENTIFIER) {
consumeToken(); // '|'
String filterName = consumeToken().getImage();
List<AstNode> filterParams = Lists.newArrayList(v, interpreter());
Expand All @@ -552,25 +550,25 @@ private AstNode parseOperators(AstNode left) throws ScanException, ParseExceptio
true
);
v = createAstMethod(filterProperty, createAstParameters(filterParams)); // function("filter:" + filterName, new AstParameters(filterParams));
} while ("|".equals(getToken().getImage()));

return v;
} else if (
"is".equals(getToken().getImage()) &&
"not".equals(lookahead(0).getImage()) &&
isPossibleExpTest(lookahead(1).getSymbol())
) {
consumeToken(); // 'is'
consumeToken(); // 'not'
return buildAstMethodForIdentifier(left, "evaluateNegated");
} else if (
"is".equals(getToken().getImage()) && isPossibleExpTest(lookahead(0).getSymbol())
) {
consumeToken(); // 'is'
return buildAstMethodForIdentifier(left, "evaluate");
} else if (
"is".equals(getToken().getImage()) &&
"not".equals(lookahead(0).getImage()) &&
isPossibleExpTest(lookahead(1).getSymbol())
) {
consumeToken(); // 'is'
consumeToken(); // 'not'
v = buildAstMethodForIdentifier(v, "evaluateNegated");
} else if (
"is".equals(getToken().getImage()) && isPossibleExpTest(lookahead(0).getSymbol())
) {
consumeToken(); // 'is'
v = buildAstMethodForIdentifier(v, "evaluate");
} else {
break;
}
}

return left;
return v;
}

protected AstParameters createAstParameters(List<AstNode> nodes) {
Expand Down
6 changes: 6 additions & 0 deletions src/test/java/com/hubspot/jinjava/interpret/JinjavaInterpreterTest.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -600,4 +600,10 @@ public void itOutputsUndefinedVariableError() {
assertThat(outputtingErrorInterpreters.getErrors().get(0).getCategoryErrors())
.isEqualTo(ImmutableMap.of("variable", "bar"));
}

@Test
public void itGivesFiltersAndExpTestsSamePrecedence() {
String template = "{{ 'A' | lower is defined | string | upper }}";
assertThat(jinjava.render(template, new HashMap<>())).isEqualTo("TRUE");
}
}
Loading