remove changes to visitor

Author: spirit-at-canva

commonmark/src/main/java/org/commonmark/node/AbstractVisitor.java

@@ -7,19 +7,6 @@
  * call {@link #visitChildren}.
  */
 public abstract class AbstractVisitor implements Visitor {
-    private final int maxDepth;
-    private int currentDepth;
-
-    public AbstractVisitor() {
-        this(Integer.MAX_VALUE);
-    }
-
-    protected AbstractVisitor(int maxDepth) {
-        if (maxDepth < 0) {
-            throw new IllegalArgumentException("maxDepth must be >= 0");
-        }
-        this.maxDepth = maxDepth;
-    }
 
     @Override
     public void visit(BlockQuote blockQuote) {
@@ -142,20 +129,12 @@ public void visit(CustomNode customNode) {
      * @param parent the parent node whose children should be visited
      */
     protected void visitChildren(Node parent) {
-        if (currentDepth >= maxDepth) {
-            return;
-        }
         Node node = parent.getFirstChild();
         while (node != null) {
             // A subclass of this visitor might modify the node, resulting in getNext returning a different node or no
             // node after visiting it. So get the next node before visiting.
             Node next = node.getNext();
-            currentDepth++;
-            try {
-                node.accept(this);
-            } finally {
-                currentDepth--;
-            }
+            node.accept(this);
             node = next;
         }
     }

commonmark/src/test/java/org/commonmark/test/AbstractVisitorTest.java

@@ -3,38 +3,9 @@
 import org.commonmark.node.*;
 import org.junit.jupiter.api.Test;
 
-import java.util.ArrayList;
-import java.util.List;
-
 import static org.assertj.core.api.Assertions.assertThat;
-import static org.assertj.core.api.Assertions.assertThatThrownBy;
 
 public class AbstractVisitorTest {
-    @Test
-    public void maxDepthMustBeZeroOrGreater() {
-        assertThatThrownBy(() -> new RecordingVisitor(-1))
-                .isInstanceOf(IllegalArgumentException.class);
-    }
-
-    @Test
-    public void maxDepthZeroVisitsOnlyRoot() {
-        var paragraph = paragraphTree();
-        var visitor = new RecordingVisitor(0);
-
-        paragraph.accept(visitor);
-
-        assertThat(visitor.visited).containsExactly("paragraph");
-    }
-
-    @Test
-    public void maxDepthOneVisitsDirectChildrenButNotGrandchildren() {
-        var paragraph = paragraphTree();
-        var visitor = new RecordingVisitor(1);
-
-        paragraph.accept(visitor);
-
-        assertThat(visitor.visited).containsExactly("paragraph", "emphasis", "text:tail");
-    }
 
     @Test
     public void replacingNodeInVisitorShouldNotDestroyVisitOrder() {
@@ -63,39 +34,4 @@ private static void assertCode(String expectedLiteral, Node node) {
         Code code = (Code) node;
         assertThat(code.getLiteral()).isEqualTo(expectedLiteral);
     }
-
-    private static Paragraph paragraphTree() {
-        var paragraph = new Paragraph();
-        var emphasis = new Emphasis();
-        emphasis.appendChild(new Text("nested"));
-        paragraph.appendChild(emphasis);
-        paragraph.appendChild(new Text("tail"));
-        return paragraph;
-    }
-
-    private static final class RecordingVisitor extends AbstractVisitor {
-        private final List<String> visited = new ArrayList<>();
-
-        private RecordingVisitor(int maxDepth) {
-            super(maxDepth);
-        }
-
-        @Override
-        public void visit(Paragraph paragraph) {
-            visited.add("paragraph");
-            super.visit(paragraph);
-        }
-
-        @Override
-        public void visit(Emphasis emphasis) {
-            visited.add("emphasis");
-            super.visit(emphasis);
-        }
-
-        @Override
-        public void visit(Text text) {
-            visited.add("text:" + text.getLiteral());
-            super.visit(text);
-        }
-    }
 }

commonmark/src/test/java/org/commonmark/test/ParserTest.java

@@ -206,6 +206,55 @@ public void maxOpenBlockParsersAlsoLimitsMixedListAndBlockQuoteNesting() {
         assertThat(deepestParagraph.getNext()).isNull();
     }
 
+    @Test
+    public void maxOpenBlockParsersAlignsWithVisitorDepthAtDocumentRoot() {
+        var parser = Parser.builder().maxOpenBlockParsers(5).build();
+
+        var document = parser.parse(String.join("\n",
+                "- level1",
+                "  > level2",
+                "  > > level3",
+                "  > > > level4"));
+        var listBlock = document.getFirstChild();
+        var listItem = listBlock.getFirstChild();
+        var blockQuote1 = listItem.getLastChild();
+        var blockQuote2 = blockQuote1.getLastChild();
+        var deepestParagraph = blockQuote2.getLastChild();
+        var depthFiveVisitor = new RecordingVisitor(5);
+        var unlimitedVisitor = new RecordingVisitor();
+
+        assertThat(depth(deepestParagraph.getFirstChild())).isEqualTo(6);
+        assertThat(depth(deepestParagraph.getLastChild())).isEqualTo(6);
+
+        document.accept(depthFiveVisitor);
+        document.accept(unlimitedVisitor);
+
+        assertThat(depthFiveVisitor.visited).containsExactly(
+                "document",
+                "bulletList",
+                "listItem",
+                "paragraph",
+                "text:level1",
+                "blockQuote",
+                "paragraph",
+                "text:level2",
+                "blockQuote",
+                "paragraph");
+        assertThat(unlimitedVisitor.visited).containsExactly(
+                "document",
+                "bulletList",
+                "listItem",
+                "paragraph",
+                "text:level1",
+                "blockQuote",
+                "paragraph",
+                "text:level2",
+                "blockQuote",
+                "paragraph",
+                "text:level3",
+                "text:> level4");
+    }
+
     private String firstText(Node n) {
         while (!(n instanceof Text)) {
             assertThat(n).isNotNull();
@@ -244,4 +293,60 @@ private String alternatingNestedList(int levels) {
         }
         return String.join("\n", lines);
     }
+
+    private int depth(Node node) {
+        int depth = 0;
+        while (node.getParent() != null) {
+            node = node.getParent();
+            depth++;
+        }
+        return depth;
+    }
+
+    private static final class RecordingVisitor extends AbstractVisitor {
+        private final List<String> visited = new ArrayList<>();
+
+        private RecordingVisitor() {
+        }
+
+        private RecordingVisitor(int maxDepth) {
+            super(maxDepth);
+        }
+
+        @Override
+        public void visit(Document document) {
+            visited.add("document");
+            super.visit(document);
+        }
+
+        @Override
+        public void visit(BulletList bulletList) {
+            visited.add("bulletList");
+            super.visit(bulletList);
+        }
+
+        @Override
+        public void visit(ListItem listItem) {
+            visited.add("listItem");
+            super.visit(listItem);
+        }
+
+        @Override
+        public void visit(BlockQuote blockQuote) {
+            visited.add("blockQuote");
+            super.visit(blockQuote);
+        }
+
+        @Override
+        public void visit(Paragraph paragraph) {
+            visited.add("paragraph");
+            super.visit(paragraph);
+        }
+
+        @Override
+        public void visit(Text text) {
+            visited.add("text:" + text.getLiteral());
+            super.visit(text);
+        }
+    }
 }