visit: simplify handling of root node

Cito · Cito · commit e893287aeeb5 · 2022-04-06T22:14:31.000+02:00
Replicates graphql/graphql-js@f2ecc28
diff --git a/src/graphql/language/visitor.py b/src/graphql/language/visitor.py
@@ -200,22 +200,23 @@ def visit(
     keys: Tuple[Node, ...] = (root,)
     idx = -1
     edits: List[Any] = []
+    node: Any = root
+    key: Any = None
     parent: Any = None
     path: List[Any] = []
     path_append = path.append
     path_pop = path.pop
     ancestors: List[Any] = []
     ancestors_append = ancestors.append
     ancestors_pop = ancestors.pop
-    new_root = root
 
     while True:
         idx += 1
         is_leaving = idx == len(keys)
         is_edited = is_leaving and edits
         if is_leaving:
             key = path[-1] if ancestors else None
-            node: Any = parent
+            node = parent
             parent = ancestors_pop() if ancestors else None
             if is_edited:
                 if in_array:
@@ -238,21 +239,16 @@ def visit(
             edits = stack.edits
             in_array = stack.in_array
             stack = stack.prev
-        else:
-            if parent:
-                if in_array:
-                    key = idx
-                    node = parent[key]
-                else:
-                    key = keys[idx]
-                    node = getattr(parent, key, None)
+        elif parent:
+            if in_array:
+                key = idx
+                node = parent[key]
             else:
-                key = None
-                node = new_root
+                key = keys[idx]
+                node = getattr(parent, key, None)
             if node is None:
                 continue
-            if parent:
-                path_append(key)
+            path_append(key)
 
         if isinstance(node, tuple):
             result = None
@@ -303,9 +299,9 @@ def visit(
             break
 
     if edits:
-        new_root = edits[-1][1]
+        return edits[-1][1]
 
-    return new_root
+    return root
 
 
 class ParallelVisitor(Visitor):
