Skip to content

Commit

Permalink
Update Black Tests (#9455)
Browse files Browse the repository at this point in the history
  • Loading branch information
MichaReiser authored Jan 10, 2024
1 parent ac02d3a commit 58fcd96
Show file tree
Hide file tree
Showing 28 changed files with 602 additions and 56 deletions.
Original file line number Diff line number Diff line change
Expand Up @@ -11,6 +11,7 @@ class ClassWithSpaceParentheses:


class ClassWithEmptyFunc(object):

def func_with_blank_parentheses():
return 5

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -65,3 +65,25 @@ def something():
if flat
else ValuesListIterable
)


def foo(wait: bool = True):
# This comment is two
# lines long

# This is only one
time.sleep(1) if wait else None
time.sleep(1) if wait else None

# With newline above
time.sleep(1) if wait else None
# Without newline above
time.sleep(1) if wait else None


a = "".join(
(
"", # comment
"" if True else "",
)
)
Original file line number Diff line number Diff line change
Expand Up @@ -88,3 +88,23 @@ def something():
if named
else FlatValuesListIterable if flat else ValuesListIterable
)


def foo(wait: bool = True):
# This comment is two
# lines long

# This is only one
time.sleep(1) if wait else None
time.sleep(1) if wait else None

# With newline above
time.sleep(1) if wait else None
# Without newline above
time.sleep(1) if wait else None


a = "".join((
"", # comment
"" if True else "",
))
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@ def foo2(parameter_1, parameter_2, parameter_3, parameter_4, parameter_5, parame
def foo3(parameter_1, parameter_2, parameter_3, parameter_4, parameter_5, parameter_6, parameter_7): pass
def foo4(parameter_1, parameter_2, parameter_3, parameter_4, parameter_5, parameter_6, parameter_7): pass

# Adding some unformatted code covering a wide range of syntaxes.
# Adding some unformated code covering a wide range of syntaxes.

if True:
# Incorrectly indented prefix comments.
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -28,7 +28,7 @@ def foo3(

def foo4(parameter_1, parameter_2, parameter_3, parameter_4, parameter_5, parameter_6, parameter_7): pass

# Adding some unformatted code covering a wide range of syntaxes.
# Adding some unformated code covering a wide range of syntaxes.

if True:
# Incorrectly indented prefix comments.
Expand Down
Original file line number Diff line number Diff line change
@@ -1,5 +1,6 @@
"""I am a very helpful module docstring.
With trailing spaces:
Lorem ipsum dolor sit amet, consectetur adipiscing elit,
sed do eiusmod tempor incididunt ut labore et dolore magna aliqua.
Ut enim ad minim veniam,
Expand Down
Original file line number Diff line number Diff line change
@@ -1,5 +1,6 @@
"""I am a very helpful module docstring.

With trailing spaces:
Lorem ipsum dolor sit amet, consectetur adipiscing elit,
sed do eiusmod tempor incididunt ut labore et dolore magna aliqua.
Ut enim ad minim veniam,
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -16,3 +16,15 @@ if sys.version_info > (3, 7):
def function_definition(self): ...
assignment = 1
def f2(self) -> str: ...


class TopLevel:
class Nested1:
foo: int
def bar(self): ...
field = 1

class Nested2:
def bar(self): ...
foo: int
field = 1
Original file line number Diff line number Diff line change
Expand Up @@ -20,3 +20,16 @@ if sys.version_info > (3, 7):
assignment = 1

def f2(self) -> str: ...

class TopLevel:
class Nested1:
foo: int
def bar(self): ...

field = 1

class Nested2:
def bar(self): ...
foo: int

field = 1
Original file line number Diff line number Diff line change
Expand Up @@ -19,7 +19,7 @@
z: (int) = 2.3
z: ((int)) = foo()

# In case I go for not enforcing parentheses, this might get improved at the same time
# In case I go for not enforcing parantheses, this might get improved at the same time
x = (
z
== 9999999999999999999999999999999999999999
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -28,7 +28,7 @@ z: Short | Short2 | Short3 | Short4 = 8
z: int = 2.3
z: int = foo()

# In case I go for not enforcing parentheses, this might get improved at the same time
# In case I go for not enforcing parantheses, this might get improved at the same time
x = (
z
== 9999999999999999999999999999999999999999
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -60,3 +60,23 @@ class Cls:
def method(self):

pass


async def async_fn():

"""Docstring."""


@decorated
async def async_fn():

"""Docstring."""


def top_level(
a: int,
b: str,
) -> Whatever[Generic, Something]:

def nested(x: int) -> int:
pass
Original file line number Diff line number Diff line change
Expand Up @@ -57,6 +57,25 @@ def quux():


class Cls:

def method(self):

pass


async def async_fn():
"""Docstring."""


@decorated
async def async_fn():
"""Docstring."""


def top_level(
a: int,
b: str,
) -> Whatever[Generic, Something]:

def nested(x: int) -> int:
pass
Original file line number Diff line number Diff line change
Expand Up @@ -56,3 +56,14 @@ def has_comment():
...

if already_dummy: ...

class AsyncCls:
async def async_method(self):
...

async def async_function(self):
...

@decorated
async def async_function(self):
...
Original file line number Diff line number Diff line change
Expand Up @@ -59,3 +59,14 @@ if some_condition:

if already_dummy:
...


class AsyncCls:
async def async_method(self): ...


async def async_function(self): ...


@decorated
async def async_function(self): ...
Original file line number Diff line number Diff line change
Expand Up @@ -79,6 +79,7 @@ def bar(a=1, b: bool = False):


class Baz:

def __init__(self):
pass

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -27,3 +27,7 @@ class MultilineDocstringsAsWell:
and on so many lines...
"""

class SingleQuotedDocstring:

"I'm a docstring but I don't even get triple quotes."
Original file line number Diff line number Diff line change
Expand Up @@ -22,3 +22,7 @@ class MultilineDocstringsAsWell:

and on so many lines...
"""


class SingleQuotedDocstring:
"I'm a docstring but I don't even get triple quotes."
Original file line number Diff line number Diff line change
@@ -1,2 +1,2 @@
x[(a := 0):]
x[:(a := 0)]
x[(a := 0) :]
x[: (a := 0)]
Original file line number Diff line number Diff line change
@@ -0,0 +1,119 @@
---
source: crates/ruff_python_formatter/tests/fixtures.rs
input_file: crates/ruff_python_formatter/resources/test/fixtures/black/cases/class_blank_parentheses.py
---
## Input

```python
class SimpleClassWithBlankParentheses():
pass
class ClassWithSpaceParentheses ( ):
first_test_data = 90
second_test_data = 100
def test_func(self):
return None
class ClassWithEmptyFunc(object):
def func_with_blank_parentheses():
return 5
def public_func_with_blank_parentheses():
return None
def class_under_the_func_with_blank_parentheses():
class InsideFunc():
pass
class NormalClass (
):
def func_for_testing(self, first, second):
sum = first + second
return sum
```

## Black Differences

```diff
--- Black
+++ Ruff
@@ -11,7 +11,6 @@
class ClassWithEmptyFunc(object):
-
def func_with_blank_parentheses():
return 5
```

## Ruff Output

```python
class SimpleClassWithBlankParentheses:
pass
class ClassWithSpaceParentheses:
first_test_data = 90
second_test_data = 100
def test_func(self):
return None
class ClassWithEmptyFunc(object):
def func_with_blank_parentheses():
return 5
def public_func_with_blank_parentheses():
return None
def class_under_the_func_with_blank_parentheses():
class InsideFunc:
pass
class NormalClass:
def func_for_testing(self, first, second):
sum = first + second
return sum
```

## Black Output

```python
class SimpleClassWithBlankParentheses:
pass
class ClassWithSpaceParentheses:
first_test_data = 90
second_test_data = 100
def test_func(self):
return None
class ClassWithEmptyFunc(object):
def func_with_blank_parentheses():
return 5
def public_func_with_blank_parentheses():
return None
def class_under_the_func_with_blank_parentheses():
class InsideFunc:
pass
class NormalClass:
def func_for_testing(self, first, second):
sum = first + second
return sum
```


Loading

0 comments on commit 58fcd96

Please sign in to comment.