Merge pull request #1325 from ahoppen/fix-topological-sorting

ahoppen · web-flow · commit 44acd0d55082 · 2024-05-21T22:03:41.000-07:00
Fix issue that caused topological order to be incorrect
diff --git a/Sources/SKSwiftPMWorkspace/SwiftPMBuildSystem.swift b/Sources/SKSwiftPMWorkspace/SwiftPMBuildSystem.swift
@@ -433,7 +433,7 @@ extension SwiftPMBuildSystem: SKCore.BuildSystem {
   public func topologicalSort(of targets: [ConfiguredTarget]) -> [ConfiguredTarget]? {
     return targets.sorted { (lhs: ConfiguredTarget, rhs: ConfiguredTarget) -> Bool in
       let lhsIndex = self.targets[lhs]?.index ?? self.targets.count
-      let rhsIndex = self.targets[lhs]?.index ?? self.targets.count
+      let rhsIndex = self.targets[rhs]?.index ?? self.targets.count
       return lhsIndex < rhsIndex
     }
   }

Original file line number	Diff line number	Diff line change
`@@ -433,7 +433,7 @@ extension SwiftPMBuildSystem: SKCore.BuildSystem {`
`433`	`433`	`public func topologicalSort(of targets: [ConfiguredTarget]) -> [ConfiguredTarget]? {`
`434`	`434`	`return targets.sorted { (lhs: ConfiguredTarget, rhs: ConfiguredTarget) -> Bool in`
`435`	`435`	`let lhsIndex = self.targets[lhs]?.index ?? self.targets.count`
`436`		`- let rhsIndex = self.targets[lhs]?.index ?? self.targets.count`
	`436`	`+ let rhsIndex = self.targets[rhs]?.index ?? self.targets.count`
`437`	`437`	`return lhsIndex < rhsIndex`
`438`	`438`	`}`
`439`	`439`	`}`