Code refactor in PerformanceTest.swift

Author: StevenWong12

Sources/swift-parser-cli/Commands/PerformanceTest.swift

@@ -41,19 +41,21 @@ struct PerformanceTest: ParsableCommand {
       .filter { $0.pathExtension == "swift" }
       .map { try Data(contentsOf: $0) }
 
-    var fileTransition: [Data: (SourceFileSyntax, IncrementalParseNodeAffectRangeCollector)] = [:]
+    var fileTransition: [Data: (parseTransition: IncrementalParseTransition, nodeAffectRangeCollector: IncrementalParseNodeAffectRangeCollector)] = [:]
 
-    /// The initial parse
-    for file in files {
-      let incrementalParseAffectRangeCollector = self.incrementalParse ? IncrementalParseNodeAffectRangeCollector() : nil
-      file.withUnsafeBytes { buf in
-        let tree = Parser.parse(
-          source: buf.bindMemory(to: UInt8.self),
-          parseNodeAffectRange: incrementalParseAffectRangeCollector
-        )
+    if self.incrementalParse {
+      /// The initial parse for incremental parse
+      for file in files {
+        let incrementalParseAffectRangeCollector = IncrementalParseNodeAffectRangeCollector()
+        file.withUnsafeBytes { buf in
+          let tree = Parser.parse(
+            source: buf.bindMemory(to: UInt8.self),
+            parseNodeAffectRange: incrementalParseAffectRangeCollector
+          )
 
-        if self.incrementalParse == true {
-          fileTransition[file] = (tree, incrementalParseAffectRangeCollector!)
+          fileTransition[file] = (
+            IncrementalParseTransition(previousTree: tree, edits: ConcurrentEdits(fromSequential: [])), incrementalParseAffectRangeCollector
+          )
         }
       }
     }
@@ -62,19 +64,12 @@ struct PerformanceTest: ParsableCommand {
     let startInstructions = getInstructionsExecuted()
     for _ in 0..<self.iterations {
       for file in files {
-        let parseTransition =
-          incrementalParse ? IncrementalParseTransition(previousTree: fileTransition[file]!.0, edits: ConcurrentEdits(fromSequential: [])) : nil
-        let incrementalParseAffectRangeCollector = incrementalParse ? fileTransition[file]!.1 : nil
         file.withUnsafeBytes { buf in
-          let tree = Parser.parse(
+          _ = Parser.parse(
             source: buf.bindMemory(to: UInt8.self),
-            parseNodeAffectRange: incrementalParseAffectRangeCollector,
-            parseTransition: parseTransition
+            parseNodeAffectRange: fileTransition[file]?.nodeAffectRangeCollector,
+            parseTransition: fileTransition[file]?.parseTransition
           )
-
-          if self.incrementalParse == true {
-            fileTransition[file] = (tree, incrementalParseAffectRangeCollector!)
-          }
         }
       }
     }