yonaskolb/XcodeGen
1
1
Fork 0
mirror of https://github.com/yonaskolb/XcodeGen.git synced 2024-08-17 00:30:29 +03:00
Code Issues Projects Releases Wiki Activity

Merge 5aaae5e1ec into 447cc7f9ac

Browse Source
This commit is contained in:
Michael Thole 2024-04-11 10:08:37 -05:00 committed by GitHub
commit 9f8b555340
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194
1 changed files with 30 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

41
Sources/XcodeGenKit/PBXProjGenerator.swift
View File

@ -593,21 +593,40 @@ public class PBXProjGenerator {
func sortGroups(group: PBXGroup) {
// sort children
let children = group.children
.sorted { child1, child2 in
let sortOrder1 = child1.getSortOrder(groupSortPosition: project.options.groupSortPosition)
let sortOrder2 = child2.getSortOrder(groupSortPosition: project.options.groupSortPosition)
let children: [PBXFileElement]
if group.name == "Packages",
let packagesOrdering = project.options.groupOrdering.first(where: { $0.pattern == "Packages" }) {
var sortedPackages = [PBXFileElement]()
var unsortedPackages = Array(group.children)
for packageName in packagesOrdering.order {
guard let matchingPackage = unsortedPackages.first(where: { $0.nameOrPath == packageName }) else {
continue
}
if sortOrder1 != sortOrder2 {
return sortOrder1 < sortOrder2
} else {
if (child1.name, child1.path) != (child2.name, child2.path) {
return PBXFileElement.sortByNamePath(child1, child2)
sortedPackages.append(matchingPackage)
unsortedPackages.removeAll { $0 == matchingPackage }
}
children = sortedPackages + unsortedPackages
} else {
children = group.children
.sorted { child1, child2 in
let sortOrder1 = child1.getSortOrder(groupSortPosition: project.options.groupSortPosition)
let sortOrder2 = child2.getSortOrder(groupSortPosition: project.options.groupSortPosition)
if sortOrder1 != sortOrder2 {
return sortOrder1 < sortOrder2
} else {
return child1.context ?? "" < child2.context ?? ""
if (child1.name, child1.path) != (child2.name, child2.path) {
return PBXFileElement.sortByNamePath(child1, child2)
} else {
return child1.context ?? "" < child2.context ?? ""
}
}
}
}
}
group.children = children.filter { $0 != group }
// sort sub groups