HubSpot · jmoraleda · Mar 31, 2026 · Mar 31, 2026 · Apr 6, 2026 · Apr 11, 2026
diff --git a/src/main/java/com/hubspot/jinjava/tree/TreeParser.java b/src/main/java/com/hubspot/jinjava/tree/TreeParser.java
@@ -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 {
@@ -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 =
@@ -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
    */

diff --git a/src/main/java/com/hubspot/jinjava/tree/parse/ExpressionToken.java b/src/main/java/com/hubspot/jinjava/tree/parse/ExpressionToken.java
@@ -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);
   }

diff --git a/src/main/java/com/hubspot/jinjava/tree/parse/NoteToken.java b/src/main/java/com/hubspot/jinjava/tree/parse/NoteToken.java
@@ -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 = "";
   }