Merge pull request #413 from Roobun/treeParser

Several parse errors
HubSpot · Mar 19, 2020 · 672d778 · 672d778
2 parents de78549 + 0f6f34a
commit 672d778
Show file tree

Hide file tree

Showing 2 changed files with 51 additions and 11 deletions.
diff --git a/src/main/java/com/hubspot/jinjava/tree/TreeParser.java b/src/main/java/com/hubspot/jinjava/tree/TreeParser.java
@@ -66,18 +66,21 @@ public Node buildTree() {
  }
  }
 
- if (parent != root) {
- interpreter.addError(
- TemplateError.fromException(
- new MissingEndTagException(
- ((TagNode) parent).getEndName(),
- parent.getMaster().getImage(),
- parent.getLineNumber(),
- parent.getStartPosition()
+ do {
+ if (parent != root) {
+ interpreter.addError(
+ TemplateError.fromException(
+ new MissingEndTagException(
+ ((TagNode) parent).getEndName(),
+ parent.getMaster().getImage(),
+ parent.getLineNumber(),
+ parent.getStartPosition()
+ )
  )
- )
- );
- }
+ );
+ parent = parent.getParent();
+ }
+ } while (parent.getParent() != null);
 
  return root;
  }

diff --git a/src/test/java/com/hubspot/jinjava/tree/TreeParserTest.java b/src/test/java/com/hubspot/jinjava/tree/TreeParserTest.java
@@ -108,6 +108,43 @@ public void itWarnsAgainstUnclosedComment() {
  assertThat(interpreter.getErrors().get(0).getFieldName()).isEqualTo("comment");
  }
 
+ @Test
+ public void itWarnsTwiceAgainstUnclosedForTag() {
+ String expression = "{% for item in list %}\n{% for elem in items %}";
+ final Node tree = new TreeParser(interpreter, expression).buildTree();
+ assertThat(interpreter.getErrors()).hasSize(2);
+ assertThat(interpreter.getErrors().get(0).getFieldName())
+ .isEqualTo("{% for elem in items %}");
+ assertThat(interpreter.getErrors().get(0).getLineno()).isEqualTo(2);
+ assertThat(interpreter.getErrors().get(1).getFieldName())
+ .isEqualTo("{% for item in list %}");
+ assertThat(interpreter.getErrors().get(1).getLineno()).isEqualTo(1);
+ }
+
+ @Test
+ public void itWarnsTwiceAgainstUnclosedIfTag() {
+ String expression = "{% if 1 > 2 %}\n{% if 2 > 1 %}";
+ final Node tree = new TreeParser(interpreter, expression).buildTree();
+ assertThat(interpreter.getErrors()).hasSize(2);
+ assertThat(interpreter.getErrors().get(0).getFieldName()).isEqualTo("{% if 2 > 1 %}");
+ assertThat(interpreter.getErrors().get(0).getLineno()).isEqualTo(2);
+ assertThat(interpreter.getErrors().get(1).getFieldName()).isEqualTo("{% if 1 > 2 %}");
+ assertThat(interpreter.getErrors().get(1).getLineno()).isEqualTo(1);
+ }
+
+ @Test
+ public void itWarnsTwiceAgainstUnclosedBlockTag() {
+ String expression = "{% block first %}\n{% block second %}";
+ final Node tree = new TreeParser(interpreter, expression).buildTree();
+ assertThat(interpreter.getErrors()).hasSize(2);
+ assertThat(interpreter.getErrors().get(0).getFieldName())
+ .isEqualTo("{% block second %}");
+ assertThat(interpreter.getErrors().get(0).getLineno()).isEqualTo(2);
+ assertThat(interpreter.getErrors().get(1).getFieldName())
+ .isEqualTo("{% block first %}");
+ assertThat(interpreter.getErrors().get(1).getLineno()).isEqualTo(1);
+ }
+
  Node parse(String fixture) {
  try {
  return new TreeParser(