Skip to content

feat: add StringTokenScannerSymbols for configurable multi-character delimiters (fixes #195) #1305

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
jmoraleda wants to merge 5 commits into
base: master
Choose a base branch
from
Open

feat: add StringTokenScannerSymbols for configurable multi-character delimiters (fixes #195) #1305

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
5 commits
Select commit Hold shift + click to select a range
677aa06
Support arbitrary multi-character delimiter strings
jmoraleda Mar 31, 2026
6127243
Support single line logic for blocks and comments using a prefix
jmoraleda Mar 31, 2026
5017d43
Support for trim-modifier in single-line logic
jmoraleda Apr 6, 2026
f5ec0f9
Bugfix in single-line-logic trimming to match jinja output
jmoraleda Apr 11, 2026
4d42df5
Refactor StringTokenScanner to its file.
jmoraleda Apr 24, 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
11 changes: 10 additions & 1 deletion src/main/java/com/hubspot/jinjava/tree/TreeParser.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -32,13 +32,15 @@
import com.hubspot.jinjava.lib.tag.FlexibleTag;
import com.hubspot.jinjava.lib.tag.Tag;
import com.hubspot.jinjava.tree.parse.ExpressionToken;
import com.hubspot.jinjava.tree.parse.StringTokenScanner;
import com.hubspot.jinjava.tree.parse.TagToken;
import com.hubspot.jinjava.tree.parse.TextToken;
import com.hubspot.jinjava.tree.parse.Token;
import com.hubspot.jinjava.tree.parse.TokenScanner;
import com.hubspot.jinjava.tree.parse.TokenScannerSymbols;
import com.hubspot.jinjava.tree.parse.UnclosedToken;
import com.hubspot.jinjava.tree.parse.WhitespaceControlParser;
import java.util.Iterator;
import org.apache.commons.lang3.StringUtils;

public class TreeParser {
Expand All @@ -52,7 +54,7 @@ public class TreeParser {

public TreeParser(JinjavaInterpreter interpreter, String input) {
this.scanner =
Iterators.peekingIterator(new TokenScanner(input, interpreter.getConfig()));
Iterators.peekingIterator(createScanner(input, interpreter.getConfig()));
this.interpreter = interpreter;
this.symbols = interpreter.getConfig().getTokenScannerSymbols();
this.whitespaceControlParser =
Expand Down Expand Up @@ -104,6 +106,13 @@ public Node buildTree() {
return root;
}

private static Iterator<Token> createScanner(String input, JinjavaConfig config) {
if (config.getTokenScannerSymbols().isStringBased()) {
return new StringTokenScanner(input, config);
}
return new TokenScanner(input, config);
}

/**
* @return null if EOF or error
*/
Expand Down
9 changes: 8 additions & 1 deletion src/main/java/com/hubspot/jinjava/tree/parse/ExpressionToken.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -54,7 +54,14 @@ public int getType() {

@Override
protected void parse() {
this.expr = WhitespaceUtils.unwrap(image, "{{", "}}");
// Use the symbols-derived delimiter strings instead of the hardcoded "{{" / "}}"
// so that custom delimiters (e.g. "\VAR{" / "}") are stripped correctly.
this.expr =
WhitespaceUtils.unwrap(
image,
getSymbols().getExpressionStart(),
getSymbols().getExpressionEnd()
);
this.expr = handleTrim(expr);
this.expr = StringUtils.trimToEmpty(this.expr);
}
Expand Down
7 changes: 5 additions & 2 deletions src/main/java/com/hubspot/jinjava/tree/parse/NoteToken.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -48,8 +48,11 @@ public int getType() {
*/
@Override
protected void parse() {
if (image.length() > 4) { // {# #}
handleTrim(image.substring(2, image.length() - 2));
int startLen = getSymbols().getCommentStartLength();
int endLen = getSymbols().getCommentEndLength();

if (image.length() > startLen + endLen) {
handleTrim(image.substring(startLen, image.length() - endLen));
}
content = "";
}
Expand Down
Loading