Format target: annotation = value? expressions
#5661
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
This was referenced Jul 10, 2023
|
Current dependencies on/for this PR:
This comment was auto-generated by Graphite. |
MichaReiser
force-pushed
the
format-annotated-assignment
branch
from
95afea9 to
5689102
Compare
MichaReiser
commented
Jul 10, 2023
| @@ -6,20 +6,20 @@ use ruff_text_size::TextSize; | |||
| use rustpython_parser::ast::Ranged; | |||
|
|
|||
| /// Adds parentheses and indents `content` if it doesn't fit on a line. | |||
| pub(crate) fn optional_parentheses<'ast, T>(content: &T) -> OptionalParentheses<'_, 'ast> | |||
| pub(crate) fn parenthesize_if_expands<'ast, T>(content: &T) -> ParenthesizeIfExpands<'_, 'ast> | |||
There was a problem hiding this comment.
I think this name is better. The rest of the code refers to optional parentheses that we sometimes omit because they are unnecessary. These are parentheses that we always add if the content expands.
| @@ -106,30 +105,9 @@ impl FormatRule<Expr, PyFormatContext<'_>> for FormatExpr { | |||
| // Add optional parentheses. Ignore if the item renders parentheses itself. | |||
| Parentheses::Optional => { | |||
| if can_omit_optional_parentheses(item, f.context()) { | |||
| let saved_level = f.context().node_level(); | |||
There was a problem hiding this comment.
I moved this, unchanged, to parentheses.rs
| return_annotation | ||
| .format() | ||
| .with_options(Parenthesize::IfBreaks) | ||
| optional_parentheses( |
There was a problem hiding this comment.
Function defs are weird. They add parentheses around subscript expressions.
| let options = PyFormatOptions::default(); | ||
| let options_path = input_path.with_extension("options.json"); | ||
|
|
||
| let options: PyFormatOptions = if let Ok(options_file) = fs::File::open(options_path) { |
There was a problem hiding this comment.
This adds support for options for black tests.
|
|
||
| -class F(A, C): ... | ||
|
|
||
| -def spam() -> None: ... | ||
| +class F(A, C): | ||
| + ... | ||
| + | ||
| + | ||
| +def spam() -> None: |
There was a problem hiding this comment.
Hmm, we'll need into single line bodies at some point. Potentially something that our suite refactor would simplify but we shouldn't be blocked by it.l
Closed
MichaReiser
force-pushed
the
format-annotated-assignment
branch
from
5689102 to
018b5d2
Compare
PR Check ResultsEcosystem✅ ecosystem check detected no changes. BenchmarkLinuxWindows |
konstin
approved these changes
Jul 10, 2023
MichaReiser
force-pushed
the
expression-ref
branch
from
32813bd to
9cc7c21
Compare
MichaReiser
force-pushed
the
format-annotated-assignment
branch
from
018b5d2 to
a9c9dd5
Compare
This was referenced Jul 11, 2023
MichaReiser
force-pushed
the
expression-ref
branch
from
9cc7c21 to
f3444d0
Compare
MichaReiser
force-pushed
the
format-annotated-assignment
branch
from
a9c9dd5 to
3fbd025
Compare
MichaReiser
force-pushed
the
format-annotated-assignment
branch
from
3fbd025 to
30e7756
Compare
konstin
pushed a commit
that referenced
this pull request
Jul 19, 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 implements formatting of
target: annotation (= value)?expressions.It resulted in me going down a rabbit hole because I then noticed that tuples inside of subscript should not be parenthesized. So I fixed that too.
Test Plan
I added new tests. I fixed the
skip_magic_commatest to run it with magic comma disabled (This test got me really confused because one test wanted to have trailing comma and this test wanted not to have trailing commas).