Merge branch 'main' into 241a1really
This commit is contained in:
commit
034fd94ec2
@ -21,7 +21,7 @@
|
|||||||
docstring (#4060)
|
docstring (#4060)
|
||||||
- Fix crash in preview mode when using a short `--line-length` (#4086)
|
- Fix crash in preview mode when using a short `--line-length` (#4086)
|
||||||
- Keep suites consisting of only an ellipsis on their own lines if they are not
|
- Keep suites consisting of only an ellipsis on their own lines if they are not
|
||||||
functions or class definitions (#4066)
|
functions or class definitions (#4066) (#4103)
|
||||||
|
|
||||||
### Configuration
|
### Configuration
|
||||||
|
|
||||||
|
@ -56,6 +56,8 @@ def has_comment():
|
|||||||
if some_condition:
|
if some_condition:
|
||||||
...
|
...
|
||||||
|
|
||||||
|
if already_dummy: ...
|
||||||
|
|
||||||
# output
|
# output
|
||||||
|
|
||||||
from typing import NoReturn, Protocol, Union, overload
|
from typing import NoReturn, Protocol, Union, overload
|
||||||
@ -116,3 +118,6 @@ def has_comment(): ... # still a dummy
|
|||||||
|
|
||||||
if some_condition:
|
if some_condition:
|
||||||
...
|
...
|
||||||
|
|
||||||
|
if already_dummy:
|
||||||
|
...
|
||||||
|
@ -317,7 +317,7 @@ def test_expression_diff(self) -> None:
|
|||||||
msg = (
|
msg = (
|
||||||
"Expected diff isn't equal to the actual. If you made changes to"
|
"Expected diff isn't equal to the actual. If you made changes to"
|
||||||
" expression.py and this is an anticipated difference, overwrite"
|
" expression.py and this is an anticipated difference, overwrite"
|
||||||
f" tests/data/expression.diff with {dump}"
|
f" tests/data/cases/expression.diff with {dump}"
|
||||||
)
|
)
|
||||||
self.assertEqual(expected, actual, msg)
|
self.assertEqual(expected, actual, msg)
|
||||||
|
|
||||||
|
Loading…
Reference in New Issue
Block a user