INSP: select a better location for attaching file to modules #5937
Conversation
This file contains hidden or 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
Undin
reviewed
Aug 17, 2020
src/main/kotlin/org/rust/ide/inspections/fixes/AttachFileToModuleFix.kt
Outdated
Show resolved
Hide resolved
src/main/kotlin/org/rust/ide/inspections/fixes/AttachFileToModuleFix.kt
Outdated
Show resolved
Hide resolved
src/main/kotlin/org/rust/ide/inspections/fixes/AttachFileToModuleFix.kt
Outdated
Show resolved
Hide resolved
src/main/kotlin/org/rust/ide/inspections/fixes/AttachFileToModuleFix.kt
Outdated
Show resolved
Hide resolved
Undin
reviewed
Aug 17, 2020
src/main/kotlin/org/rust/ide/inspections/fixes/AttachFileToModuleFix.kt
Outdated
Show resolved
Hide resolved
Kobzol
force-pushed
the
insp-attach-mod-location-fix
branch
from
9d7551e to
d543867
Compare
|
Build succeeded: |
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.
This PR adds a simple heuristic to
AttachFileToModuleFixthat tries to find a good place where to insert themoditem. If it finds an existing mod items in the file, it will append the new item after the last one. Otherwise, it will skip comments and attributes at the beginning of the module.If there was a mod item before an attribute in the target module, it could still fail to compile after the fix, but in such case it would also fail to compile before the fix, so I think that is an edge case that we don't have to deal with.
I copied the
firstItemimplementation and changed it slightly so that it also works for empty modules. I can also check if the module is empty and do not usefirstItemin such case.Fixes: #5903
Fixes: #5934