Fixed flattening of relative paths (#525) #550
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
jstubenrauch
approved these changes
Mar 28, 2019
|
Thanks for this @sroebert. Are you able to add a unit test to You'll also need to rebase to fix the conflicts |
|
Done! |
yonaskolb
reviewed
Apr 9, 2019
| @@ -247,7 +247,7 @@ class SourceGenerator { | |||
| let isOutOfBasePath = !path.absolute().string.contains(project.basePath.absolute().string) | |||
|
|
|||
| // has no valid parent paths | |||
| let isRootPath = isOutOfBasePath || path.parent() == project.basePath | |||
| let isRootPath = (isBaseGroup && isOutOfBasePath) || path.parent() == project.basePath | |||
There was a problem hiding this comment.
The isBaseGroup param is a newer addition than the rest of this line. I wonder if that's all we need
yonaskolb
approved these changes
Apr 9, 2019
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.
Currently when adding relative paths as a source root, all folders are flattened as root groups in the Xcode project (#525). This fix makes sure the folder structure is kept without flattening.