Skip to content

Fix crash when sorting project references with missing PBXFileElement.name #1056

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
Ant-tree wants to merge 1 commit into
base: main
Choose a base branch
from
Open

Fix crash when sorting project references with missing PBXFileElement.name #1056

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
17 changes: 10 additions & 7 deletions Sources/XcodeProj/Objects/Project/PBXProjEncoder.swift
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -484,13 +484,16 @@ final class PBXProjEncoder {
for project in projects {
/// The project references are sorted alphabetically based on the name of the project it's being referenced.
project.projectReferences = project.projectReferences.sorted(by: { lhs, rhs in
let lProjectRef = lhs["ProjectRef"]!
let lFile: PBXFileElement = lProjectRef.getObject()!
let rProjectRef = rhs["ProjectRef"]!
let rFile: PBXFileElement = rProjectRef.getObject()!
let lName = lFile.name!
let rName = rFile.name!
return lName.compare(rName, options: .caseInsensitive) == .orderedAscending
guard
let lRef = lhs["ProjectRef"],
let rRef = rhs["ProjectRef"],
let lFile: PBXFileElement = lRef.getObject(),
let rFile: PBXFileElement = rRef.getObject()
else { return false }

let lDisplay = lFile.name ?? lFile.path ?? ""
let rDisplay = rFile.name ?? rFile.path ?? ""
return lDisplay.localizedCaseInsensitiveCompare(rDisplay) == .orderedAscending
})
}
}
Expand Down