apply_change_to_project: fix group moves. #88
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
byohay
requested changes
Sep 8, 2022
| @@ -195,12 +195,17 @@ def apply_group_and_file_diffs(project, diffs) | |||
| end | |||
|
|
|||
| def apply_group_removals(project, removals) | |||
| removals.each do |change, path| | |||
| removals.reverse.each do |change, path| | |||
There was a problem hiding this comment.
I don't like it that it relies on the assumption that the inner groups come after the outer ones. I don't know if it's better, but since we know that only file changes were already removed, we can filter out only them:
removals.map do |change, path|
change_without_file_children = change.dup
change_without_file_children["children"] =
(change_without_file_children["children"] || []).select do |child_change|
%w[PBXGroup PBXVariantGroup].include?(child_change["isa"])
end
[change_without_file_children, path]
end.each do |change, path|
next unless %w[PBXGroup PBXVariantGroup].include?(change["isa"])
group_path = join_path(path, change["displayName"])
remove_component(project[group_path], change)
endThere was a problem hiding this comment.
fixed as discussed by sorting
| next unless %w[PBXGroup PBXVariantGroup].include?(change["isa"]) | ||
|
|
||
| group_path = join_path(path, change["displayName"]) | ||
|
|
||
| remove_component(project[group_path], change) | ||
| # by now we've deleted all of this group's children in the project, so we need to adapt the | ||
| # change to the expected current state of the group. |
There was a problem hiding this comment.
change to the expected current state of the group, that is, without any children
ashdnazg
force-pushed
the
feature/fix-group-moves
branch
2 times, most recently
from
8a230dc
to
08846a1
Compare
|
F&Sed |
byohay
approved these changes
Sep 12, 2022
ashdnazg
force-pushed
the
feature/fix-group-moves
branch
from
08846a1
to
f5622c5
Compare
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.