-
Notifications
You must be signed in to change notification settings - Fork 1.2k
New issue
Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.
By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.
Already on GitHub? Sign in to your account
Track formatted comments #4979
Merged
Merged
Track formatted comments #4979
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
This was referenced Jun 9, 2023
Merged
Current dependencies on/for this PR:
This comment was auto-generated by Graphite. |
MichaReiser
added
internal
An internal refactor or improvement
formatter
Related to the formatter
labels
Jun 9, 2023
PR Check ResultsEcosystem✅ ecosystem check detected no changes. BenchmarkLinux
Windows
|
konstin
approved these changes
Jun 9, 2023
MichaReiser
force-pushed
the
fix-bin-oip-with-leading-comments
branch
from
June 9, 2023 08:46
4cf24dc
to
7458b5b
Compare
MichaReiser
force-pushed
the
skip-formatted-comments
branch
from
June 9, 2023 08:46
48356d4
to
192261b
Compare
MichaReiser
force-pushed
the
fix-bin-oip-with-leading-comments
branch
from
June 9, 2023 08:56
7458b5b
to
e341c1c
Compare
MichaReiser
force-pushed
the
skip-formatted-comments
branch
from
June 9, 2023 09:04
ca58055
to
f444677
Compare
konstin
pushed a commit
that referenced
this pull request
Jun 13, 2023
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.
Summary
This PR removes the debug-only condition from
SourceComment::formatted
and now uses it to track whether a comment has already been formatted and,if so, skip it during the
leading
/dangling
/trailing
comments formatting. The motivation for this change is that it is sometimes necessary thatthe parent node formats the comments and we then need a way to prevent that the
FormatNodeRule
formats the same comments again. One such exampleis the boolean operation formatting:
You can see that the leading comments of the right hand side must be formatted before the operator but the default comment formatting
formats them after. Another use case is that the leading comments of a
*args
or**kwargs
must be formatted before the*
or**
.The
*args
and**kwargs
use case used a one-off solution so far which was easy enough to implement because it only applies toArg
. Doing the samewith boolean operations isn't as straightforward because the
value
can be an arbitraryExpr
.Test Plan
cargo test
(the*args
and**kwargs
formatting still work as expected without any explicit handling)Performance
I don't expect this to change performance much because the overhead is per comment and programs often only have few comments