Fix duplicate sources in groups, fixes #141 #142
Merged
Conversation
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
keith
approved these changes
Nov 9, 2017
yonaskolb
reviewed
Nov 9, 2017
| @@ -504,7 +504,7 @@ public class PBXProjGenerator { | |||
| func getSingleGroup(path: Path, mergingChildren children: [String], depth: Int = 0) -> PBXGroup { | |||
| let group: PBXGroup | |||
| if let cachedGroup = groupsByPath[path] { | |||
| cachedGroup.children += children | |||
| cachedGroup.children = Array(Set(cachedGroup.children + children)) | |||
There was a problem hiding this comment.
This means we lose ordering of files
There was a problem hiding this comment.
And if we just sort this we lose alphabetical ordering of files
There was a problem hiding this comment.
By the way, I changed things up so that all files and groups are now sorted at the end, so we don't have to worry about this sort of thing anymore
bkase
force-pushed
the
fix-duplicate-sources
branch
from
f274b49 to
a27a25e
Compare
|
It's less efficient now, but I think it should be okay. There shouldn't ever be too many files in a single group in practice |
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
No description provided.