averello/swift-mirror
1
0
Fork 0
mirror of https://github.com/apple/swift.git synced 2025-12-14 20:36:38 +01:00
Code Issues Packages Projects Releases Wiki Activity

[xcodegen] Fix hasPrefix for paths

Browse Source 
The intention here was to do a component-wise
prefix check, not sure why I did a string prefix
check. Switch to component prefix and rename to
`starts(with:)` to match `FilePath`.
This commit is contained in:
Hamish Knight
2025-01-01 13:34:48 +00:00
parent b3b538ef62
commit 38c1d28197
3 changed files with 9 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

9
utils/swift-xcodegen/Sources/SwiftXcodeGen/Generator/ProjectGenerator.swift
View File

@@ -154,8 +154,9 @@ fileprivate final class ProjectGenerator {
guard let path else { return true }
// Not very efficient, but excludedPaths should be small in practice.
guard let excluded = spec.excludedPaths.first(where: { path.hasPrefix($0.path) })
else {
guard let excluded = spec.excludedPaths.first(
where: { path.starts(with: $0.path) }
) else {
return true
}
if let description, let reason = excluded.reason {
@@ -238,7 +239,9 @@ fileprivate final class ProjectGenerator {
group(for: repoRelativePath.appending(parentPath)) != nil else {
// If this isn't a child of an explicitly added reference, something
// has probably gone wrong.
if !spec.referencesToAdd.contains(where: { parentPath.hasPrefix($0.path) }) {
if !spec.referencesToAdd.contains(
where: { parentPath.starts(with: $0.path) }
) {
log.warning("""
Target '\(name)' at '\(repoRelativePath.appending(parentPath))' is \
nested in a folder reference; skipping. This is likely an xcodegen bug.