Document Visitor only pushes path on Continue (#1673)

* feat(Validation): visitor pushs path only on continue * fixformat Co-authored-by: Michael Staib <michael@chillicream.com>
ChilliCream · Apr 9, 2020 · 0443581 · 0443581
1 parent 53c41c5
commit 0443581
Show file tree

Hide file tree

Showing 3 changed files with 22 additions and 6 deletions.
diff --git a/src/HotChocolate/Core/src/Validation/DocumentValidatorVisitor.cs b/src/HotChocolate/Core/src/Validation/DocumentValidatorVisitor.cs
@@ -15,9 +15,13 @@ protected DocumentValidatorVisitor(SyntaxVisitorOptions options = default)
         protected override IDocumentValidatorContext OnAfterEnter(
             ISyntaxNode node,
             ISyntaxNode? parent,
-            IDocumentValidatorContext context)
+            IDocumentValidatorContext context,
+            ISyntaxVisitorAction action)
         {
-            context.Path.Push(node);
+            if (action.IsContinue())
+            {
+                context.Path.Push(node);
+            }
             return context;
         }
 

diff --git a/src/HotChocolate/Language/src/Language.Visitors/SyntaxVisitor~1.cs b/src/HotChocolate/Language/src/Language.Visitors/SyntaxVisitor~1.cs
@@ -51,7 +51,7 @@ public SyntaxVisitor(SyntaxVisitorOptions options = default)
         {
             var localContext = OnBeforeEnter(node, parent, context);
             var result = Enter(node, localContext);
-            localContext = OnAfterEnter(node, parent, localContext);
+            localContext = OnAfterEnter(node, parent, localContext, result);
 
             if (result.Kind == SyntaxVisitorActionKind.Break)
             {
@@ -64,7 +64,7 @@ public SyntaxVisitor(SyntaxVisitorOptions options = default)
 
                 localContext = OnBeforeLeave(node, parent, localContext);
                 result = Leave(node, localContext);
-                localContext = OnAfterLeave(node, parent, localContext);
+                localContext = OnAfterLeave(node, parent, localContext, result);
             }
 
             return result;
@@ -89,7 +89,8 @@ public SyntaxVisitor(SyntaxVisitorOptions options = default)
         protected virtual TContext OnAfterEnter(
             ISyntaxNode node,
             ISyntaxNode? parent,
-            TContext context) =>
+            TContext context,
+            ISyntaxVisitorAction action) =>
             context;
 
         protected virtual TContext OnBeforeLeave(
@@ -101,7 +102,8 @@ public SyntaxVisitor(SyntaxVisitorOptions options = default)
         protected virtual TContext OnAfterLeave(
             ISyntaxNode node,
             ISyntaxNode? parent,
-            TContext context) =>
+            TContext context,
+            ISyntaxVisitorAction action) =>
             context;
     }
 }
diff --git a/src/HotChocolate/Language/src/Language.Visitors/Utilities/SyntaxVisitorActionExtension.cs b/src/HotChocolate/Language/src/Language.Visitors/Utilities/SyntaxVisitorActionExtension.cs
@@ -6,5 +6,15 @@ public static bool IsBreak(this ISyntaxVisitorAction action)
         {
             return action.Kind == SyntaxVisitorActionKind.Break;
         }
+
+        public static bool IsContinue(this ISyntaxVisitorAction action)
+        {
+            return action.Kind == SyntaxVisitorActionKind.Continue;
+        }
+
+        public static bool IsSkip(this ISyntaxVisitorAction action)
+        {
+            return action.Kind == SyntaxVisitorActionKind.Skip;
+        }
     }
 }