WIP: Code refactor

Author: StevenWong12

CodeGeneration/Sources/SyntaxSupport/Node.swift

@@ -128,12 +128,11 @@ public class Node {
           continue
         }
 
+        choices.append(contentsOf: getChildTokenChoice(child))
+        
         if !child.isOptional {
-          choices.append(contentsOf: getChildTokenChoice(child))
           break
         }
-
-        choices.append(contentsOf: getChildTokenChoice(child))
       }
       return choices
     }

CodeGeneration/Sources/generate-swiftsyntax/templates/swiftparser/IncrementalParseUtilsFile.swift

@@ -83,13 +83,13 @@ let IncrementalParseUtilsFile = SourceFileSyntax(leadingTrivia: copyrightHeader)
           lastNonNilChildIdx != children.endIndex
         {
 
-          var nextPotentialNodeIndex = children.distance(from: children.startIndex, to: children.index(after: lastNonNilChildIdx))
+          var nextPotentialNodeIndex = children.index(after: lastNonNilChildIdx)
 
           if self.kind.syntaxLayout[nextPotentialNodeIndex].allSatisfy({ $0 == .unexpectedNodes }) {
-            nextPotentialNodeIndex += 1
+            nextPotentialNodeIndex = children.index(after: nextPotentialNodeIndex)
           }
 
-          if nextPotentialNodeIndex == children.count {
+          if nextPotentialNodeIndex == children.endIndex {
             return []
           }
 

Sources/SwiftParser/generated/IncrementalParseUtils.swift

@@ -7669,15 +7669,15 @@ extension RawSyntax {
       lastNonNilChildIdx != children.endIndex
     {
 
-      var nextPotentialNodeIndex = children.distance(from: children.startIndex, to: children.index(after: lastNonNilChildIdx))
+      var nextPotentialNodeIndex = children.index(after: lastNonNilChildIdx)
 
       if self.kind.syntaxLayout[nextPotentialNodeIndex].allSatisfy({
           $0 == .unexpectedNodes
         }) {
-        nextPotentialNodeIndex += 1
+        nextPotentialNodeIndex = children.index(after: nextPotentialNodeIndex)
       }
 
-      if nextPotentialNodeIndex == children.count {
+      if nextPotentialNodeIndex == children.endIndex {
         return []
       }