Implement closing-block procedure without relying on missed_span module #3691
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
topecongiro
commented
Jul 17, 2019
Note: empty_item_single_line seems to be not working properly, but this will be fixed in a separate PR.
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.
In this PR I have updated
close_blockso that it does not rely onmissed_spanswhen dealing with the comment between the last statement and the closing brace. This fixes some issues related to the block formatting: see the commits that update tests for detail.The background and the motivation of this PR:
missed_spansis a necessary evil for recovering unformattable code and formatting missing comments. However, it should be the last resort since it's extremely complicated and buggish, especially on handling comments. Also, it's nigh-impossible to implementblank_lines_lower_boundandblank_lines_upper_boundcorrectly if we rely onmissed_spansfor handling comments between items, statements and blocks.The current implementation is not really well-thought, adding a better abstraction will be future work. I am planning to do it on fixing
blank_lines_lower_bound.