Fix MergingBehaviour::Last creating unintuitive import trees #6102
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
|
Perfect, I noticed these odd-looking imports showing up bors r+ |
bors bot
added a commit
that referenced
this pull request
Oct 2, 2020
6105: Fix path comparison not comparing paths correctly with unequal lengths r=matklad a=Veykril ~~This PR includes the commit from #6102 there as I found a bug while writing that(so either merging this or both in order works) so I included a test there already which was just ignored.~~ This PR fixes that, basically inserting imports didn't consider path length for equality, so depending on the order it might insert the path before or after another import if they only differ in segment length. ~~Diff without the commit of #6102 2d90d3937d71f9a00f3d44c15b20679215311637~~ Co-authored-by: Lukas Wirth <lukastw97@gmail.com>
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.
The way this behaviour currently works is actually a bit weird. Imagine the following three imports get requested for insertion in the given order:
winapi::um::d3d11::ID3D11Devicewinapi::shared::dxgiformat::DXGI_FORMATwinapi::um::d3d11::D3D11_FILTERAfter the first two you will have the following tree:
which is to be expected as they arent nested this kind of merging is allowed, but now importing the third one will result in:
which is still fine according to the rules, but it looks weird(at least in my eyes) due to the long paths that are quite similar. The changes in this PR will change the criteria for when to reject
Lastmerging, it still disallows multiple nesting but it also only allows single segment paths inside of theUseTreeList. With this change you get the following tree after the first two imports:and after the third:
Which I believe looks more like what you would expect.