diff --git a/crates/ruff_python_formatter/src/expression/expr_call.rs b/crates/ruff_python_formatter/src/expression/expr_call.rs index 3f73b6cbbd..2e48d6aa56 100644 --- a/crates/ruff_python_formatter/src/expression/expr_call.rs +++ b/crates/ruff_python_formatter/src/expression/expr_call.rs @@ -10,11 +10,20 @@ use rustpython_parser::ast::ExprCall; pub struct FormatExprCall; impl FormatNodeRule for FormatExprCall { - fn fmt_fields(&self, _item: &ExprCall, f: &mut PyFormatter) -> FormatResult<()> { - write!( - f, - [not_yet_implemented_custom_text("NOT_IMPLEMENTED_call()")] - ) + fn fmt_fields(&self, item: &ExprCall, f: &mut PyFormatter) -> FormatResult<()> { + if item.args.is_empty() && item.keywords.is_empty() { + write!( + f, + [not_yet_implemented_custom_text("NOT_IMPLEMENTED_call()")] + ) + } else { + write!( + f, + [not_yet_implemented_custom_text( + "NOT_IMPLEMENTED_call(NOT_IMPLEMENTED_arg)" + )] + ) + } } } diff --git a/crates/ruff_python_formatter/src/lib.rs b/crates/ruff_python_formatter/src/lib.rs index ec332985a3..0faf824f09 100644 --- a/crates/ruff_python_formatter/src/lib.rs +++ b/crates/ruff_python_formatter/src/lib.rs @@ -247,12 +247,12 @@ mod tests { let input = r#" # preceding if True: - print( "hi" ) + pass # trailing "#; let expected = r#"# preceding if True: - NOT_IMPLEMENTED_call() + pass # trailing "#; let actual = format_module(input)?.as_code().to_string(); diff --git a/crates/ruff_python_formatter/src/snapshots/ruff_python_formatter__tests__black_test__attribute_access_on_number_literals_py.snap b/crates/ruff_python_formatter/src/snapshots/ruff_python_formatter__tests__black_test__attribute_access_on_number_literals_py.snap index 72a7fd2ecd..62da55712c 100644 --- a/crates/ruff_python_formatter/src/snapshots/ruff_python_formatter__tests__black_test__attribute_access_on_number_literals_py.snap +++ b/crates/ruff_python_formatter/src/snapshots/ruff_python_formatter__tests__black_test__attribute_access_on_number_literals_py.snap @@ -62,7 +62,7 @@ y = 100(no) +x = (123456789.123456789E123456789).real +x = NOT_IMPLEMENTED_call() +x = 123456789J.real -+x = NOT_IMPLEMENTED_call() ++x = NOT_IMPLEMENTED_call(NOT_IMPLEMENTED_arg) +x = NOT_IMPLEMENTED_call() +x = NOT_IMPLEMENTED_call() +x = (0O777).real @@ -74,7 +74,7 @@ y = 100(no) y = 100[no] -y = 100(no) -+y = NOT_IMPLEMENTED_call() ++y = NOT_IMPLEMENTED_call(NOT_IMPLEMENTED_arg) ``` ## Ruff Output @@ -90,7 +90,7 @@ x = NOT_IMPLEMENTED_call() x = (123456789.123456789E123456789).real x = NOT_IMPLEMENTED_call() x = 123456789J.real -x = NOT_IMPLEMENTED_call() +x = NOT_IMPLEMENTED_call(NOT_IMPLEMENTED_arg) x = NOT_IMPLEMENTED_call() x = NOT_IMPLEMENTED_call() x = (0O777).real @@ -101,7 +101,7 @@ if (10).real: ... y = 100[no] -y = NOT_IMPLEMENTED_call() +y = NOT_IMPLEMENTED_call(NOT_IMPLEMENTED_arg) ``` ## Black Output diff --git a/crates/ruff_python_formatter/src/snapshots/ruff_python_formatter__tests__black_test__beginning_backslash_py.snap b/crates/ruff_python_formatter/src/snapshots/ruff_python_formatter__tests__black_test__beginning_backslash_py.snap index e6b8b1a44b..6b56a193c0 100644 --- a/crates/ruff_python_formatter/src/snapshots/ruff_python_formatter__tests__black_test__beginning_backslash_py.snap +++ b/crates/ruff_python_formatter/src/snapshots/ruff_python_formatter__tests__black_test__beginning_backslash_py.snap @@ -22,13 +22,13 @@ print("hello, world") +++ Ruff @@ -1 +1 @@ -print("hello, world") -+NOT_IMPLEMENTED_call() ++NOT_IMPLEMENTED_call(NOT_IMPLEMENTED_arg) ``` ## Ruff Output ```py -NOT_IMPLEMENTED_call() +NOT_IMPLEMENTED_call(NOT_IMPLEMENTED_arg) ``` ## Black Output diff --git a/crates/ruff_python_formatter/src/snapshots/ruff_python_formatter__tests__black_test__collections_py.snap b/crates/ruff_python_formatter/src/snapshots/ruff_python_formatter__tests__black_test__collections_py.snap index b567509488..4dd883ec2f 100644 --- a/crates/ruff_python_formatter/src/snapshots/ruff_python_formatter__tests__black_test__collections_py.snap +++ b/crates/ruff_python_formatter/src/snapshots/ruff_python_formatter__tests__black_test__collections_py.snap @@ -178,7 +178,7 @@ if True: division_result_tuple = (6 / 2,) -print("foo %r", (foo.bar,)) -+NOT_IMPLEMENTED_call() ++NOT_IMPLEMENTED_call(NOT_IMPLEMENTED_arg) if True: IGNORED_TYPES_FOR_ATTRIBUTE_CHECKING = ( @@ -204,9 +204,9 @@ if True: - "Delay": 5, - }, - ) -+ NOT_IMPLEMENTED_call() -+ NOT_IMPLEMENTED_call() -+ NOT_IMPLEMENTED_call() ++ NOT_IMPLEMENTED_call(NOT_IMPLEMENTED_arg) ++ NOT_IMPLEMENTED_call(NOT_IMPLEMENTED_arg) ++ NOT_IMPLEMENTED_call(NOT_IMPLEMENTED_arg) ``` ## Ruff Output @@ -259,7 +259,7 @@ for (x,) in (1,), (2,), (3,): [1, 2, 3] division_result_tuple = (6 / 2,) -NOT_IMPLEMENTED_call() +NOT_IMPLEMENTED_call(NOT_IMPLEMENTED_arg) if True: IGNORED_TYPES_FOR_ATTRIBUTE_CHECKING = ( @@ -268,9 +268,9 @@ if True: ) if True: - NOT_IMPLEMENTED_call() - NOT_IMPLEMENTED_call() - NOT_IMPLEMENTED_call() + NOT_IMPLEMENTED_call(NOT_IMPLEMENTED_arg) + NOT_IMPLEMENTED_call(NOT_IMPLEMENTED_arg) + NOT_IMPLEMENTED_call(NOT_IMPLEMENTED_arg) ``` ## Black Output diff --git a/crates/ruff_python_formatter/src/snapshots/ruff_python_formatter__tests__black_test__comments2_py.snap b/crates/ruff_python_formatter/src/snapshots/ruff_python_formatter__tests__black_test__comments2_py.snap index 42acde710a..1a5581f602 100644 --- a/crates/ruff_python_formatter/src/snapshots/ruff_python_formatter__tests__black_test__comments2_py.snap +++ b/crates/ruff_python_formatter/src/snapshots/ruff_python_formatter__tests__black_test__comments2_py.snap @@ -243,19 +243,19 @@ instruction()#comment with bad spacing Cheese, - Cheese("Wensleydale"), - SubBytes(b"spam"), -+ NOT_IMPLEMENTED_call(), -+ NOT_IMPLEMENTED_call(), ++ NOT_IMPLEMENTED_call(NOT_IMPLEMENTED_arg), ++ NOT_IMPLEMENTED_call(NOT_IMPLEMENTED_arg), ] -if "PYTHON" in os.environ: - add_compiler(compiler_from_env()) +if NOT_IMPLEMENTED_left < NOT_IMPLEMENTED_right: -+ NOT_IMPLEMENTED_call() ++ NOT_IMPLEMENTED_call(NOT_IMPLEMENTED_arg) else: # for compiler in compilers.values(): # add_compiler(compiler) - add_compiler(compilers[(7.0, 32)]) -+ NOT_IMPLEMENTED_call() ++ NOT_IMPLEMENTED_call(NOT_IMPLEMENTED_arg) # add_compiler(compilers[(7.1, 64)]) @@ -307,7 +307,7 @@ instruction()#comment with bad spacing -""", - arg3=True, - ) -+ NOT_IMPLEMENTED_call() ++ NOT_IMPLEMENTED_call(NOT_IMPLEMENTED_arg) ############################################################################ @@ -342,7 +342,7 @@ instruction()#comment with bad spacing - # right - if element is not None - ] -+ NOT_IMPLEMENTED_call() ++ NOT_IMPLEMENTED_call(NOT_IMPLEMENTED_arg) + lcomp = [i for i in []] + lcomp2 = [i for i in []] + lcomp3 = [i for i in []] @@ -357,7 +357,7 @@ instruction()#comment with bad spacing - syms.simple_stmt, - [Node(statement, result), Leaf(token.NEWLINE, "\n")], # FIXME: \r\n? - ) -+ return NOT_IMPLEMENTED_call() ++ return NOT_IMPLEMENTED_call(NOT_IMPLEMENTED_arg) -CONFIG_FILES = ( @@ -434,16 +434,16 @@ not_shareables = [ "NOT_YET_IMPLEMENTED_STRING", # user-defined types and objects Cheese, - NOT_IMPLEMENTED_call(), - NOT_IMPLEMENTED_call(), + NOT_IMPLEMENTED_call(NOT_IMPLEMENTED_arg), + NOT_IMPLEMENTED_call(NOT_IMPLEMENTED_arg), ] if NOT_IMPLEMENTED_left < NOT_IMPLEMENTED_right: - NOT_IMPLEMENTED_call() + NOT_IMPLEMENTED_call(NOT_IMPLEMENTED_arg) else: # for compiler in compilers.values(): # add_compiler(compiler) - NOT_IMPLEMENTED_call() + NOT_IMPLEMENTED_call(NOT_IMPLEMENTED_arg) # add_compiler(compilers[(7.1, 64)]) @@ -489,11 +489,11 @@ def inline_comments_in_brackets_ruin_everything(): ] # no newline after - NOT_IMPLEMENTED_call() + NOT_IMPLEMENTED_call(NOT_IMPLEMENTED_arg) ############################################################################ - NOT_IMPLEMENTED_call() + NOT_IMPLEMENTED_call(NOT_IMPLEMENTED_arg) lcomp = [i for i in []] lcomp2 = [i for i in []] lcomp3 = [i for i in []] @@ -505,7 +505,7 @@ def inline_comments_in_brackets_ruin_everything(): # and round and round we go # let's return - return NOT_IMPLEMENTED_call() + return NOT_IMPLEMENTED_call(NOT_IMPLEMENTED_arg) CONFIG_FILES = [CONFIG_FILE] + SHARED_CONFIG_FILES + USER_CONFIG_FILES # type: Final diff --git a/crates/ruff_python_formatter/src/snapshots/ruff_python_formatter__tests__black_test__comments3_py.snap b/crates/ruff_python_formatter/src/snapshots/ruff_python_formatter__tests__black_test__comments3_py.snap index 00e41d0c6a..aa92645b7a 100644 --- a/crates/ruff_python_formatter/src/snapshots/ruff_python_formatter__tests__black_test__comments3_py.snap +++ b/crates/ruff_python_formatter/src/snapshots/ruff_python_formatter__tests__black_test__comments3_py.snap @@ -80,7 +80,7 @@ def func(): + lcomp3 = [i for i in []] # Capture each of the exceptions in the MultiError along with each of their causes and contexts - if isinstance(exc_value, MultiError): -+ if NOT_IMPLEMENTED_call(): ++ if NOT_IMPLEMENTED_call(NOT_IMPLEMENTED_arg): embedded = [] for exc in exc_value.exceptions: - if exc not in _seen: @@ -98,7 +98,7 @@ def func(): - # This should be left alone (after) - ) + if NOT_IMPLEMENTED_left < NOT_IMPLEMENTED_right: -+ NOT_IMPLEMENTED_call() ++ NOT_IMPLEMENTED_call(NOT_IMPLEMENTED_arg) # everything is fine if the expression isn't nested - traceback.TracebackException.from_exception( @@ -110,7 +110,7 @@ def func(): - # shared between sub-exceptions are not omitted - _seen=set(_seen), - ) -+ NOT_IMPLEMENTED_call() ++ NOT_IMPLEMENTED_call(NOT_IMPLEMENTED_arg) # %% @@ -127,14 +127,14 @@ def func(): x = "NOT_YET_IMPLEMENTED_STRING" lcomp3 = [i for i in []] # Capture each of the exceptions in the MultiError along with each of their causes and contexts - if NOT_IMPLEMENTED_call(): + if NOT_IMPLEMENTED_call(NOT_IMPLEMENTED_arg): embedded = [] for exc in exc_value.exceptions: if NOT_IMPLEMENTED_left < NOT_IMPLEMENTED_right: - NOT_IMPLEMENTED_call() + NOT_IMPLEMENTED_call(NOT_IMPLEMENTED_arg) # everything is fine if the expression isn't nested - NOT_IMPLEMENTED_call() + NOT_IMPLEMENTED_call(NOT_IMPLEMENTED_arg) # %% diff --git a/crates/ruff_python_formatter/src/snapshots/ruff_python_formatter__tests__black_test__comments4_py.snap b/crates/ruff_python_formatter/src/snapshots/ruff_python_formatter__tests__black_test__comments4_py.snap index 9d741d8b92..9df63bd077 100644 --- a/crates/ruff_python_formatter/src/snapshots/ruff_python_formatter__tests__black_test__comments4_py.snap +++ b/crates/ruff_python_formatter/src/snapshots/ruff_python_formatter__tests__black_test__comments4_py.snap @@ -195,7 +195,7 @@ def foo3(list_a, list_b): - ) - .filter(User.xyz.is_(None)) - ) -+ return NOT_IMPLEMENTED_call() ++ return NOT_IMPLEMENTED_call(NOT_IMPLEMENTED_arg) def foo3(list_a, list_b): @@ -206,7 +206,7 @@ def foo3(list_a, list_b): - db.or_(User.field_a.astext.in_(list_a), User.field_b.astext.in_(list_b)) - ) - .filter(User.xyz.is_(None)) -+ NOT_IMPLEMENTED_call() ++ NOT_IMPLEMENTED_call(NOT_IMPLEMENTED_arg) ) ``` @@ -227,13 +227,13 @@ def foo(list_a, list_b): def foo2(list_a, list_b): # Standalone comment reasonably placed. - return NOT_IMPLEMENTED_call() + return NOT_IMPLEMENTED_call(NOT_IMPLEMENTED_arg) def foo3(list_a, list_b): return ( # Standalone comment but weirdly placed. - NOT_IMPLEMENTED_call() + NOT_IMPLEMENTED_call(NOT_IMPLEMENTED_arg) ) ``` diff --git a/crates/ruff_python_formatter/src/snapshots/ruff_python_formatter__tests__black_test__comments5_py.snap b/crates/ruff_python_formatter/src/snapshots/ruff_python_formatter__tests__black_test__comments5_py.snap index ef6cfc7bec..6273ad1e97 100644 --- a/crates/ruff_python_formatter/src/snapshots/ruff_python_formatter__tests__black_test__comments5_py.snap +++ b/crates/ruff_python_formatter/src/snapshots/ruff_python_formatter__tests__black_test__comments5_py.snap @@ -99,7 +99,7 @@ if __name__ == "__main__": # This one is properly standalone now. -for i in range(100): -+for i in NOT_IMPLEMENTED_call(): ++for i in NOT_IMPLEMENTED_call(NOT_IMPLEMENTED_arg): # first we do this - if i % 33 == 0: + if NOT_IMPLEMENTED_left < NOT_IMPLEMENTED_right: @@ -107,7 +107,7 @@ if __name__ == "__main__": # then we do this - print(i) -+ NOT_IMPLEMENTED_call() ++ NOT_IMPLEMENTED_call(NOT_IMPLEMENTED_arg) # and finally we loop around -with open(some_temp_file) as f: @@ -132,7 +132,7 @@ if __name__ == "__main__": @deco1 # leading 2 -@deco2(with_args=True) -+@NOT_IMPLEMENTED_call() ++@NOT_IMPLEMENTED_call(NOT_IMPLEMENTED_arg) # leading 3 @deco3 def decorated1(): @@ -141,7 +141,7 @@ if __name__ == "__main__": @deco1 # leading 2 -@deco2(with_args=True) -+@NOT_IMPLEMENTED_call() ++@NOT_IMPLEMENTED_call(NOT_IMPLEMENTED_arg) # leading function comment def decorated1(): ... @@ -168,13 +168,13 @@ while True: # This one is properly standalone now. -for i in NOT_IMPLEMENTED_call(): +for i in NOT_IMPLEMENTED_call(NOT_IMPLEMENTED_arg): # first we do this if NOT_IMPLEMENTED_left < NOT_IMPLEMENTED_right: break # then we do this - NOT_IMPLEMENTED_call() + NOT_IMPLEMENTED_call(NOT_IMPLEMENTED_arg) # and finally we loop around NOT_YET_IMPLEMENTED_StmtWith @@ -196,7 +196,7 @@ def wat(): # leading 1 @deco1 # leading 2 -@NOT_IMPLEMENTED_call() +@NOT_IMPLEMENTED_call(NOT_IMPLEMENTED_arg) # leading 3 @deco3 def decorated1(): @@ -206,7 +206,7 @@ def decorated1(): # leading 1 @deco1 # leading 2 -@NOT_IMPLEMENTED_call() +@NOT_IMPLEMENTED_call(NOT_IMPLEMENTED_arg) # leading function comment def decorated1(): ... diff --git a/crates/ruff_python_formatter/src/snapshots/ruff_python_formatter__tests__black_test__comments6_py.snap b/crates/ruff_python_formatter/src/snapshots/ruff_python_formatter__tests__black_test__comments6_py.snap index 10302ecac7..abc2ecaafd 100644 --- a/crates/ruff_python_formatter/src/snapshots/ruff_python_formatter__tests__black_test__comments6_py.snap +++ b/crates/ruff_python_formatter/src/snapshots/ruff_python_formatter__tests__black_test__comments6_py.snap @@ -169,12 +169,12 @@ aaaaaaaaaaaaa, bbbbbbbbb = map(list, map(itertools.chain.from_iterable, zip(*ite - 0.0789, - a[-1], # type: ignore - ) -+ c = NOT_IMPLEMENTED_call() ++ c = NOT_IMPLEMENTED_call(NOT_IMPLEMENTED_arg) - c = call( - "aaaaaaaa", "aaaaaaaa", "aaaaaaaa", "aaaaaaaa", "aaaaaaaa", "aaaaaaaa", "aaaaaaaa" # type: ignore - ) -+ c = NOT_IMPLEMENTED_call() ++ c = NOT_IMPLEMENTED_call(NOT_IMPLEMENTED_arg) -result = ( # aaa @@ -194,10 +194,10 @@ aaaaaaaaaaaaa, bbbbbbbbb = map(list, map(itertools.chain.from_iterable, zip(*ite - foo, - [AAAAAAAAAAAAAAAAAAAAAAA, AAAAAAAAAAAAAAAAAAAAAAA, AAAAAAAAAAAAAAAAAAAAAAA, BBBBBBBBBBBB], # type: ignore -) -+NOT_IMPLEMENTED_call() ++NOT_IMPLEMENTED_call(NOT_IMPLEMENTED_arg) -aaaaaaaaaaaaa, bbbbbbbbb = map(list, map(itertools.chain.from_iterable, zip(*items))) # type: ignore[arg-type] -+aaaaaaaaaaaaa, bbbbbbbbb = NOT_IMPLEMENTED_call() # type: ignore[arg-type] ++aaaaaaaaaaaaa, bbbbbbbbb = NOT_IMPLEMENTED_call(NOT_IMPLEMENTED_arg) # type: ignore[arg-type] ``` ## Ruff Output @@ -292,9 +292,9 @@ def f( def func( a=some_list[0], # type: int ): # type: () -> int - c = NOT_IMPLEMENTED_call() + c = NOT_IMPLEMENTED_call(NOT_IMPLEMENTED_arg) - c = NOT_IMPLEMENTED_call() + c = NOT_IMPLEMENTED_call(NOT_IMPLEMENTED_arg) result = "NOT_YET_IMPLEMENTED_STRING" # aaa @@ -306,9 +306,9 @@ AAAAAAAAAAAAA = ( + AAAAAAAAAAAAA ) # type: ignore -NOT_IMPLEMENTED_call() +NOT_IMPLEMENTED_call(NOT_IMPLEMENTED_arg) -aaaaaaaaaaaaa, bbbbbbbbb = NOT_IMPLEMENTED_call() # type: ignore[arg-type] +aaaaaaaaaaaaa, bbbbbbbbb = NOT_IMPLEMENTED_call(NOT_IMPLEMENTED_arg) # type: ignore[arg-type] ``` ## Black Output diff --git a/crates/ruff_python_formatter/src/snapshots/ruff_python_formatter__tests__black_test__comments9_py.snap b/crates/ruff_python_formatter/src/snapshots/ruff_python_formatter__tests__black_test__comments9_py.snap index cddd66b042..8168093768 100644 --- a/crates/ruff_python_formatter/src/snapshots/ruff_python_formatter__tests__black_test__comments9_py.snap +++ b/crates/ruff_python_formatter/src/snapshots/ruff_python_formatter__tests__black_test__comments9_py.snap @@ -188,7 +188,7 @@ def bar(): # leading 2 # leading 2 extra -@deco2(with_args=True) -+@NOT_IMPLEMENTED_call() ++@NOT_IMPLEMENTED_call(NOT_IMPLEMENTED_arg) # leading 3 @deco3 # leading 4 @@ -197,7 +197,7 @@ def bar(): @deco1 # leading 2 -@deco2(with_args=True) -+@NOT_IMPLEMENTED_call() ++@NOT_IMPLEMENTED_call(NOT_IMPLEMENTED_arg) # leading 3 that already has an empty line @deco3 @@ -206,7 +206,7 @@ def bar(): @deco1 # leading 2 -@deco2(with_args=True) -+@NOT_IMPLEMENTED_call() ++@NOT_IMPLEMENTED_call(NOT_IMPLEMENTED_arg) # leading 3 @deco3 @@ -300,7 +300,7 @@ some = statement @deco1 # leading 2 # leading 2 extra -@NOT_IMPLEMENTED_call() +@NOT_IMPLEMENTED_call(NOT_IMPLEMENTED_arg) # leading 3 @deco3 # leading 4 @@ -314,7 +314,7 @@ some = statement # leading 1 @deco1 # leading 2 -@NOT_IMPLEMENTED_call() +@NOT_IMPLEMENTED_call(NOT_IMPLEMENTED_arg) # leading 3 that already has an empty line @deco3 @@ -329,7 +329,7 @@ some = statement # leading 1 @deco1 # leading 2 -@NOT_IMPLEMENTED_call() +@NOT_IMPLEMENTED_call(NOT_IMPLEMENTED_arg) # leading 3 @deco3 diff --git a/crates/ruff_python_formatter/src/snapshots/ruff_python_formatter__tests__black_test__comments_non_breaking_space_py.snap b/crates/ruff_python_formatter/src/snapshots/ruff_python_formatter__tests__black_test__comments_non_breaking_space_py.snap index daf0c71385..976fcc5d8f 100644 --- a/crates/ruff_python_formatter/src/snapshots/ruff_python_formatter__tests__black_test__comments_non_breaking_space_py.snap +++ b/crates/ruff_python_formatter/src/snapshots/ruff_python_formatter__tests__black_test__comments_non_breaking_space_py.snap @@ -47,7 +47,7 @@ def function(a:int=42): result = 1 #  type: ignore result = 1 # This comment is talking about type: ignore -square = Square(4) #  type: Optional[Square] -+square = NOT_IMPLEMENTED_call() #  type: Optional[Square] ++square = NOT_IMPLEMENTED_call(NOT_IMPLEMENTED_arg) #  type: Optional[Square] def function(a: int = 42): @@ -71,7 +71,7 @@ result = (1,) # Another one result = 1 #  type: ignore result = 1 # This comment is talking about type: ignore -square = NOT_IMPLEMENTED_call() #  type: Optional[Square] +square = NOT_IMPLEMENTED_call(NOT_IMPLEMENTED_arg) #  type: Optional[Square] def function(a: int = 42): diff --git a/crates/ruff_python_formatter/src/snapshots/ruff_python_formatter__tests__black_test__comments_py.snap b/crates/ruff_python_formatter/src/snapshots/ruff_python_formatter__tests__black_test__comments_py.snap index e9ed496189..8935f71b8a 100644 --- a/crates/ruff_python_formatter/src/snapshots/ruff_python_formatter__tests__black_test__comments_py.snap +++ b/crates/ruff_python_formatter/src/snapshots/ruff_python_formatter__tests__black_test__comments_py.snap @@ -166,9 +166,9 @@ async def wat(): # Explains why we use global state. -GLOBAL_STATE = {"a": a(1), "b": a(2), "c": a(3)} +GLOBAL_STATE = { -+ "NOT_YET_IMPLEMENTED_STRING": NOT_IMPLEMENTED_call(), -+ "NOT_YET_IMPLEMENTED_STRING": NOT_IMPLEMENTED_call(), -+ "NOT_YET_IMPLEMENTED_STRING": NOT_IMPLEMENTED_call(), ++ "NOT_YET_IMPLEMENTED_STRING": NOT_IMPLEMENTED_call(NOT_IMPLEMENTED_arg), ++ "NOT_YET_IMPLEMENTED_STRING": NOT_IMPLEMENTED_call(NOT_IMPLEMENTED_arg), ++ "NOT_YET_IMPLEMENTED_STRING": NOT_IMPLEMENTED_call(NOT_IMPLEMENTED_arg), +} @@ -201,7 +201,7 @@ async def wat(): -@fast(really=True) -+@NOT_IMPLEMENTED_call() ++@NOT_IMPLEMENTED_call(NOT_IMPLEMENTED_arg) async def wat(): # This comment, for some reason \ # contains a trailing backslash. @@ -211,7 +211,7 @@ async def wat(): # Comment after ending a block. if result: - print("A OK", file=sys.stdout) -+ NOT_IMPLEMENTED_call() ++ NOT_IMPLEMENTED_call(NOT_IMPLEMENTED_arg) # Comment between things. - print() + NOT_IMPLEMENTED_call() @@ -269,9 +269,9 @@ def function(default=None): # Explains why we use global state. GLOBAL_STATE = { - "NOT_YET_IMPLEMENTED_STRING": NOT_IMPLEMENTED_call(), - "NOT_YET_IMPLEMENTED_STRING": NOT_IMPLEMENTED_call(), - "NOT_YET_IMPLEMENTED_STRING": NOT_IMPLEMENTED_call(), + "NOT_YET_IMPLEMENTED_STRING": NOT_IMPLEMENTED_call(NOT_IMPLEMENTED_arg), + "NOT_YET_IMPLEMENTED_STRING": NOT_IMPLEMENTED_call(NOT_IMPLEMENTED_arg), + "NOT_YET_IMPLEMENTED_STRING": NOT_IMPLEMENTED_call(NOT_IMPLEMENTED_arg), } @@ -285,14 +285,14 @@ NOT_YET_IMPLEMENTED_StmtClassDef #'

This is pweave!

-@NOT_IMPLEMENTED_call() +@NOT_IMPLEMENTED_call(NOT_IMPLEMENTED_arg) async def wat(): # This comment, for some reason \ # contains a trailing backslash. NOT_YET_IMPLEMENTED_StmtAsyncWith # Some more comments # Comment after ending a block. if result: - NOT_IMPLEMENTED_call() + NOT_IMPLEMENTED_call(NOT_IMPLEMENTED_arg) # Comment between things. NOT_IMPLEMENTED_call() diff --git a/crates/ruff_python_formatter/src/snapshots/ruff_python_formatter__tests__black_test__empty_lines_py.snap b/crates/ruff_python_formatter/src/snapshots/ruff_python_formatter__tests__black_test__empty_lines_py.snap index e23d22d0e3..a9b2674d3a 100644 --- a/crates/ruff_python_formatter/src/snapshots/ruff_python_formatter__tests__black_test__empty_lines_py.snap +++ b/crates/ruff_python_formatter/src/snapshots/ruff_python_formatter__tests__black_test__empty_lines_py.snap @@ -137,7 +137,7 @@ def g(): if not prev: - prevp = preceding_leaf(p) - if not prevp or prevp.type in OPENING_BRACKETS: -+ prevp = NOT_IMPLEMENTED_call() ++ prevp = NOT_IMPLEMENTED_call(NOT_IMPLEMENTED_arg) + if not prevp or NOT_IMPLEMENTED_left < NOT_IMPLEMENTED_right: return NO @@ -199,7 +199,7 @@ def g(): prev = leaf.prev_sibling if not prev: - prevp = preceding_leaf(p) -+ prevp = NOT_IMPLEMENTED_call() ++ prevp = NOT_IMPLEMENTED_call(NOT_IMPLEMENTED_arg) - if not prevp or prevp.type in OPENING_BRACKETS: + if not prevp or NOT_IMPLEMENTED_left < NOT_IMPLEMENTED_right: @@ -245,7 +245,7 @@ def f(): prev = leaf.prev_sibling if not prev: - prevp = NOT_IMPLEMENTED_call() + prevp = NOT_IMPLEMENTED_call(NOT_IMPLEMENTED_arg) if not prevp or NOT_IMPLEMENTED_left < NOT_IMPLEMENTED_right: return NO @@ -283,7 +283,7 @@ def g(): prev = leaf.prev_sibling if not prev: - prevp = NOT_IMPLEMENTED_call() + prevp = NOT_IMPLEMENTED_call(NOT_IMPLEMENTED_arg) if not prevp or NOT_IMPLEMENTED_left < NOT_IMPLEMENTED_right: # Start of the line or a bracketed expression. diff --git a/crates/ruff_python_formatter/src/snapshots/ruff_python_formatter__tests__black_test__expression_py.snap b/crates/ruff_python_formatter/src/snapshots/ruff_python_formatter__tests__black_test__expression_py.snap index b2ff9dc82e..b049cca61c 100644 --- a/crates/ruff_python_formatter/src/snapshots/ruff_python_formatter__tests__black_test__expression_py.snap +++ b/crates/ruff_python_formatter/src/snapshots/ruff_python_formatter__tests__black_test__expression_py.snap @@ -431,18 +431,18 @@ last_call() +NOT_IMPLEMENTED_left < NOT_IMPLEMENTED_right +NOT_IMPLEMENTED_left < NOT_IMPLEMENTED_right +NOT_IMPLEMENTED_call() -+NOT_IMPLEMENTED_call() -+NOT_IMPLEMENTED_call() -+NOT_IMPLEMENTED_call() -+NOT_IMPLEMENTED_call() -+NOT_IMPLEMENTED_call() # note: no trailing comma pre-3.6 -+NOT_IMPLEMENTED_call() -+NOT_IMPLEMENTED_call() -+NOT_IMPLEMENTED_call() -+NOT_IMPLEMENTED_call() ++NOT_IMPLEMENTED_call(NOT_IMPLEMENTED_arg) ++NOT_IMPLEMENTED_call(NOT_IMPLEMENTED_arg) ++NOT_IMPLEMENTED_call(NOT_IMPLEMENTED_arg) ++NOT_IMPLEMENTED_call(NOT_IMPLEMENTED_arg) ++NOT_IMPLEMENTED_call(NOT_IMPLEMENTED_arg) # note: no trailing comma pre-3.6 ++NOT_IMPLEMENTED_call(NOT_IMPLEMENTED_arg) ++NOT_IMPLEMENTED_call(NOT_IMPLEMENTED_arg) ++NOT_IMPLEMENTED_call(NOT_IMPLEMENTED_arg) ++NOT_IMPLEMENTED_call(NOT_IMPLEMENTED_arg) lukasz.langa.pl -call.me(maybe) -+NOT_IMPLEMENTED_call() ++NOT_IMPLEMENTED_call(NOT_IMPLEMENTED_arg) (1).real (1.0).real ....__class__ @@ -454,9 +454,6 @@ last_call() - int, - float, - dict[str, int], --] --very_long_variable_name_filters: t.List[ -- t.Tuple[str, t.Union[str, t.List[t.Optional[str]]]], + ( + str, + int, @@ -464,6 +461,9 @@ last_call() + dict[str, int], + ) ] +-very_long_variable_name_filters: t.List[ +- t.Tuple[str, t.Union[str, t.List[t.Optional[str]]]], +-] -xxxx_xxxxx_xxxx_xxx: Callable[..., List[SomeClass]] = classmethod( # type: ignore - sync(async_xxxx_xxx_xxxx_xxxxx_xxxx_xxx.__func__) -) @@ -494,7 +494,7 @@ last_call() numpy[0, :] numpy[:, i] numpy[0, :2] -@@ -171,62 +158,58 @@ +@@ -171,62 +158,59 @@ numpy[1 : c + 1, c] numpy[-(c + 1) :, d] numpy[:, l[-2]] @@ -541,7 +541,8 @@ last_call() + "NOT_YET_IMPLEMENTED_STRING": "NOT_YET_IMPLEMENTED_STRING", + "NOT_YET_IMPLEMENTED_STRING": "NOT_YET_IMPLEMENTED_STRING", + "NOT_YET_IMPLEMENTED_STRING": NOT_IMPLEMENTED_call(), -+ "NOT_YET_IMPLEMENTED_STRING": NOT_IMPLEMENTED_call() + NOT_IMPLEMENTED_call(), ++ "NOT_YET_IMPLEMENTED_STRING": NOT_IMPLEMENTED_call() ++ + NOT_IMPLEMENTED_call(NOT_IMPLEMENTED_arg), + "NOT_YET_IMPLEMENTED_STRING": 1, + "NOT_YET_IMPLEMENTED_STRING": 1, **kwargs, @@ -555,16 +556,19 @@ last_call() -g = 1, *"ten" -what_is_up_with_those_new_coord_names = (coord_names + set(vars_to_create)) + set( - vars_to_remove -+e = NOT_IMPLEMENTED_call() ++e = NOT_IMPLEMENTED_call(NOT_IMPLEMENTED_arg) +f = 1, NOT_YET_IMPLEMENTED_ExprStarred +g = 1, NOT_YET_IMPLEMENTED_ExprStarred +what_is_up_with_those_new_coord_names = ( -+ (coord_names + NOT_IMPLEMENTED_call()) -+ + NOT_IMPLEMENTED_call() ++ (coord_names + NOT_IMPLEMENTED_call(NOT_IMPLEMENTED_arg)) ++ + NOT_IMPLEMENTED_call(NOT_IMPLEMENTED_arg) ) -what_is_up_with_those_new_coord_names = (coord_names | set(vars_to_create)) - set( - vars_to_remove --) ++what_is_up_with_those_new_coord_names = ( ++ (coord_names | NOT_IMPLEMENTED_call(NOT_IMPLEMENTED_arg)) ++ - NOT_IMPLEMENTED_call(NOT_IMPLEMENTED_arg) + ) -result = ( - session.query(models.Customer.id) - .filter( @@ -582,10 +586,7 @@ last_call() - models.Customer.id.asc(), - ) - .all() -+what_is_up_with_those_new_coord_names = ( -+ (coord_names | NOT_IMPLEMENTED_call()) -+ - NOT_IMPLEMENTED_call() - ) +-) -Ø = set() -authors.łukasz.say_thanks() +result = NOT_IMPLEMENTED_call() @@ -595,7 +596,7 @@ last_call() mapping = { A: 0.25 * (10.0 / 12), B: 0.1 * (10.0 / 12), -@@ -236,31 +219,29 @@ +@@ -236,31 +220,29 @@ def gen(): @@ -611,7 +612,7 @@ last_call() async def f(): - await some.complicated[0].call(with_args=(True or (1 is not 1))) -+ await NOT_IMPLEMENTED_call() ++ await NOT_IMPLEMENTED_call(NOT_IMPLEMENTED_arg) -print(*[] or [1]) @@ -622,9 +623,9 @@ last_call() - force=False -), "Short message" -assert parens is TooMany -+NOT_IMPLEMENTED_call() -+NOT_IMPLEMENTED_call() -+NOT_IMPLEMENTED_call() ++NOT_IMPLEMENTED_call(NOT_IMPLEMENTED_arg) ++NOT_IMPLEMENTED_call(NOT_IMPLEMENTED_arg) ++NOT_IMPLEMENTED_call(NOT_IMPLEMENTED_arg) +NOT_YET_IMPLEMENTED_StmtAssert +NOT_YET_IMPLEMENTED_StmtAssert +NOT_YET_IMPLEMENTED_StmtAssert @@ -640,12 +641,12 @@ last_call() ... for j in 1 + (2 + 3): ... -@@ -272,28 +253,16 @@ +@@ -272,28 +254,16 @@ addr_proto, addr_canonname, addr_sockaddr, -) in socket.getaddrinfo("google.com", "http"): -+) in NOT_IMPLEMENTED_call(): ++) in NOT_IMPLEMENTED_call(NOT_IMPLEMENTED_arg): pass -a = ( - aaaa.bbbb.cccc.dddd.eeee.ffff.gggg.hhhh.iiii.jjjj.kkkk.llll.mmmm.nnnn.oooo.pppp @@ -677,7 +678,7 @@ last_call() ): return True if ( -@@ -327,13 +296,18 @@ +@@ -327,13 +297,18 @@ ): return True if ( @@ -699,7 +700,7 @@ last_call() ^ aaaaaaaa.i << aaaaaaaa.k >> aaaaaaaa.l**aaaaaaaa.m // aaaaaaaa.n ): return True -@@ -341,7 +315,8 @@ +@@ -341,7 +316,8 @@ ~aaaaaaaaaaaaaaaa.a + aaaaaaaaaaaaaaaa.b - aaaaaaaaaaaaaaaa.c * aaaaaaaaaaaaaaaa.d @ aaaaaaaaaaaaaaaa.e @@ -709,7 +710,7 @@ last_call() ^ aaaaaaaaaaaaaaaa.i << aaaaaaaaaaaaaaaa.k >> aaaaaaaaaaaaaaaa.l**aaaaaaaaaaaaaaaa.m // aaaaaaaaaaaaaaaa.n -@@ -366,5 +341,5 @@ +@@ -366,5 +342,5 @@ ^ bbbb.a & aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa ^ aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa ) @@ -827,17 +828,17 @@ NOT_YET_IMPLEMENTED_ExprSetComp NOT_IMPLEMENTED_left < NOT_IMPLEMENTED_right NOT_IMPLEMENTED_left < NOT_IMPLEMENTED_right NOT_IMPLEMENTED_call() -NOT_IMPLEMENTED_call() -NOT_IMPLEMENTED_call() -NOT_IMPLEMENTED_call() -NOT_IMPLEMENTED_call() -NOT_IMPLEMENTED_call() # note: no trailing comma pre-3.6 -NOT_IMPLEMENTED_call() -NOT_IMPLEMENTED_call() -NOT_IMPLEMENTED_call() -NOT_IMPLEMENTED_call() +NOT_IMPLEMENTED_call(NOT_IMPLEMENTED_arg) +NOT_IMPLEMENTED_call(NOT_IMPLEMENTED_arg) +NOT_IMPLEMENTED_call(NOT_IMPLEMENTED_arg) +NOT_IMPLEMENTED_call(NOT_IMPLEMENTED_arg) +NOT_IMPLEMENTED_call(NOT_IMPLEMENTED_arg) # note: no trailing comma pre-3.6 +NOT_IMPLEMENTED_call(NOT_IMPLEMENTED_arg) +NOT_IMPLEMENTED_call(NOT_IMPLEMENTED_arg) +NOT_IMPLEMENTED_call(NOT_IMPLEMENTED_arg) +NOT_IMPLEMENTED_call(NOT_IMPLEMENTED_arg) lukasz.langa.pl -NOT_IMPLEMENTED_call() +NOT_IMPLEMENTED_call(NOT_IMPLEMENTED_arg) (1).real (1.0).real ....__class__ @@ -909,7 +910,8 @@ SomeName "NOT_YET_IMPLEMENTED_STRING": "NOT_YET_IMPLEMENTED_STRING", "NOT_YET_IMPLEMENTED_STRING": "NOT_YET_IMPLEMENTED_STRING", "NOT_YET_IMPLEMENTED_STRING": NOT_IMPLEMENTED_call(), - "NOT_YET_IMPLEMENTED_STRING": NOT_IMPLEMENTED_call() + NOT_IMPLEMENTED_call(), + "NOT_YET_IMPLEMENTED_STRING": NOT_IMPLEMENTED_call() + + NOT_IMPLEMENTED_call(NOT_IMPLEMENTED_arg), "NOT_YET_IMPLEMENTED_STRING": 1, "NOT_YET_IMPLEMENTED_STRING": 1, **kwargs, @@ -918,16 +920,16 @@ a = (1,) b = (1,) c = 1 d = (1,) + a + (2,) -e = NOT_IMPLEMENTED_call() +e = NOT_IMPLEMENTED_call(NOT_IMPLEMENTED_arg) f = 1, NOT_YET_IMPLEMENTED_ExprStarred g = 1, NOT_YET_IMPLEMENTED_ExprStarred what_is_up_with_those_new_coord_names = ( - (coord_names + NOT_IMPLEMENTED_call()) - + NOT_IMPLEMENTED_call() + (coord_names + NOT_IMPLEMENTED_call(NOT_IMPLEMENTED_arg)) + + NOT_IMPLEMENTED_call(NOT_IMPLEMENTED_arg) ) what_is_up_with_those_new_coord_names = ( - (coord_names | NOT_IMPLEMENTED_call()) - - NOT_IMPLEMENTED_call() + (coord_names | NOT_IMPLEMENTED_call(NOT_IMPLEMENTED_arg)) + - NOT_IMPLEMENTED_call(NOT_IMPLEMENTED_arg) ) result = NOT_IMPLEMENTED_call() result = NOT_IMPLEMENTED_call() @@ -949,12 +951,12 @@ def gen(): async def f(): - await NOT_IMPLEMENTED_call() + await NOT_IMPLEMENTED_call(NOT_IMPLEMENTED_arg) -NOT_IMPLEMENTED_call() -NOT_IMPLEMENTED_call() -NOT_IMPLEMENTED_call() +NOT_IMPLEMENTED_call(NOT_IMPLEMENTED_arg) +NOT_IMPLEMENTED_call(NOT_IMPLEMENTED_arg) +NOT_IMPLEMENTED_call(NOT_IMPLEMENTED_arg) NOT_YET_IMPLEMENTED_StmtAssert NOT_YET_IMPLEMENTED_StmtAssert NOT_YET_IMPLEMENTED_StmtAssert @@ -976,7 +978,7 @@ for ( addr_proto, addr_canonname, addr_sockaddr, -) in NOT_IMPLEMENTED_call(): +) in NOT_IMPLEMENTED_call(NOT_IMPLEMENTED_arg): pass a = NOT_IMPLEMENTED_left < NOT_IMPLEMENTED_right a = NOT_IMPLEMENTED_left < NOT_IMPLEMENTED_right diff --git a/crates/ruff_python_formatter/src/snapshots/ruff_python_formatter__tests__black_test__fmtonoff2_py.snap b/crates/ruff_python_formatter/src/snapshots/ruff_python_formatter__tests__black_test__fmtonoff2_py.snap index 7dc0b255ac..8790bc64bf 100644 --- a/crates/ruff_python_formatter/src/snapshots/ruff_python_formatter__tests__black_test__fmtonoff2_py.snap +++ b/crates/ruff_python_formatter/src/snapshots/ruff_python_formatter__tests__black_test__fmtonoff2_py.snap @@ -73,7 +73,7 @@ def test_calculate_fades(): - ('stuff', 'in') - ], -]) -+@NOT_IMPLEMENTED_call() ++@NOT_IMPLEMENTED_call(NOT_IMPLEMENTED_arg) def test_fader(test): pass @@ -122,7 +122,7 @@ TmEx = 2 # Test data: # Position, Volume, State, TmSt/TmEx/None, [call, [arg1...]] -@NOT_IMPLEMENTED_call() +@NOT_IMPLEMENTED_call(NOT_IMPLEMENTED_arg) def test_fader(test): pass diff --git a/crates/ruff_python_formatter/src/snapshots/ruff_python_formatter__tests__black_test__fmtonoff4_py.snap b/crates/ruff_python_formatter/src/snapshots/ruff_python_formatter__tests__black_test__fmtonoff4_py.snap index 9fd0b0b4b4..9b5d673289 100644 --- a/crates/ruff_python_formatter/src/snapshots/ruff_python_formatter__tests__black_test__fmtonoff4_py.snap +++ b/crates/ruff_python_formatter/src/snapshots/ruff_python_formatter__tests__black_test__fmtonoff4_py.snap @@ -32,7 +32,7 @@ def f(): pass - 1, 2, - 3, 4, -]) -+@NOT_IMPLEMENTED_call() ++@NOT_IMPLEMENTED_call(NOT_IMPLEMENTED_arg) # fmt: on def f(): pass @@ -46,7 +46,7 @@ def f(): pass - 4, - ] -) -+@NOT_IMPLEMENTED_call() ++@NOT_IMPLEMENTED_call(NOT_IMPLEMENTED_arg) def f(): pass ``` @@ -55,13 +55,13 @@ def f(): pass ```py # fmt: off -@NOT_IMPLEMENTED_call() +@NOT_IMPLEMENTED_call(NOT_IMPLEMENTED_arg) # fmt: on def f(): pass -@NOT_IMPLEMENTED_call() +@NOT_IMPLEMENTED_call(NOT_IMPLEMENTED_arg) def f(): pass ``` diff --git a/crates/ruff_python_formatter/src/snapshots/ruff_python_formatter__tests__black_test__fmtonoff5_py.snap b/crates/ruff_python_formatter/src/snapshots/ruff_python_formatter__tests__black_test__fmtonoff5_py.snap index aada9db6c5..8c6e03ade9 100644 --- a/crates/ruff_python_formatter/src/snapshots/ruff_python_formatter__tests__black_test__fmtonoff5_py.snap +++ b/crates/ruff_python_formatter/src/snapshots/ruff_python_formatter__tests__black_test__fmtonoff5_py.snap @@ -109,7 +109,7 @@ elif unformatted: - ] # Includes an formatted indentation. - }, -) -+NOT_IMPLEMENTED_call() ++NOT_IMPLEMENTED_call(NOT_IMPLEMENTED_arg) # Regression test for https://github.com/psf/black/issues/2015. @@ -123,14 +123,14 @@ elif unformatted: - + path, - check=True, -) -+NOT_IMPLEMENTED_call() ++NOT_IMPLEMENTED_call(NOT_IMPLEMENTED_arg) # Regression test for https://github.com/psf/black/issues/3026. def test_func(): # yapf: disable - if unformatted( args ): -+ if NOT_IMPLEMENTED_call(): ++ if NOT_IMPLEMENTED_call(NOT_IMPLEMENTED_arg): return True # yapf: enable elif b: @@ -142,13 +142,13 @@ elif unformatted: - # fmt: on - print ( "This won't be formatted" ) - print ( "This won't be formatted either" ) -+ for _ in NOT_IMPLEMENTED_call(): ++ for _ in NOT_IMPLEMENTED_call(NOT_IMPLEMENTED_arg): + # fmt: on -+ NOT_IMPLEMENTED_call() -+ NOT_IMPLEMENTED_call() ++ NOT_IMPLEMENTED_call(NOT_IMPLEMENTED_arg) ++ NOT_IMPLEMENTED_call(NOT_IMPLEMENTED_arg) else: - print("This will be formatted") -+ NOT_IMPLEMENTED_call() ++ NOT_IMPLEMENTED_call(NOT_IMPLEMENTED_arg) # Regression test for https://github.com/psf/black/issues/3184. @@ -200,17 +200,17 @@ elif unformatted: ```py # Regression test for https://github.com/psf/black/issues/3129. -NOT_IMPLEMENTED_call() +NOT_IMPLEMENTED_call(NOT_IMPLEMENTED_arg) # Regression test for https://github.com/psf/black/issues/2015. -NOT_IMPLEMENTED_call() +NOT_IMPLEMENTED_call(NOT_IMPLEMENTED_arg) # Regression test for https://github.com/psf/black/issues/3026. def test_func(): # yapf: disable - if NOT_IMPLEMENTED_call(): + if NOT_IMPLEMENTED_call(NOT_IMPLEMENTED_arg): return True # yapf: enable elif b: @@ -222,12 +222,12 @@ def test_func(): # Regression test for https://github.com/psf/black/issues/2567. if True: # fmt: off - for _ in NOT_IMPLEMENTED_call(): + for _ in NOT_IMPLEMENTED_call(NOT_IMPLEMENTED_arg): # fmt: on - NOT_IMPLEMENTED_call() - NOT_IMPLEMENTED_call() + NOT_IMPLEMENTED_call(NOT_IMPLEMENTED_arg) + NOT_IMPLEMENTED_call(NOT_IMPLEMENTED_arg) else: - NOT_IMPLEMENTED_call() + NOT_IMPLEMENTED_call(NOT_IMPLEMENTED_arg) # Regression test for https://github.com/psf/black/issues/3184. diff --git a/crates/ruff_python_formatter/src/snapshots/ruff_python_formatter__tests__black_test__fmtonoff_py.snap b/crates/ruff_python_formatter/src/snapshots/ruff_python_formatter__tests__black_test__fmtonoff_py.snap index de6064324a..d5245d0799 100644 --- a/crates/ruff_python_formatter/src/snapshots/ruff_python_formatter__tests__black_test__fmtonoff_py.snap +++ b/crates/ruff_python_formatter/src/snapshots/ruff_python_formatter__tests__black_test__fmtonoff_py.snap @@ -241,10 +241,10 @@ d={'a':1, + NOT_YET_IMPLEMENTED_StmtRaise + if False: + ... -+ for i in NOT_IMPLEMENTED_call(): -+ NOT_IMPLEMENTED_call() ++ for i in NOT_IMPLEMENTED_call(NOT_IMPLEMENTED_arg): ++ NOT_IMPLEMENTED_call(NOT_IMPLEMENTED_arg) + continue -+ NOT_IMPLEMENTED_call() ++ NOT_IMPLEMENTED_call(NOT_IMPLEMENTED_arg) + return None + + @@ -255,7 +255,7 @@ d={'a':1, - await asyncio.sleep(1) + "NOT_YET_IMPLEMENTED_STRING" + NOT_YET_IMPLEMENTED_StmtAsyncWith -+ await NOT_IMPLEMENTED_call() ++ await NOT_IMPLEMENTED_call(NOT_IMPLEMENTED_arg) + + @asyncio.coroutine @@ -265,7 +265,7 @@ d={'a':1, -) -def function_signature_stress_test(number:int,no_annotation=None,text:str='default',* ,debug:bool=False,**kwargs) -> str: - return text[number:-1] -+@NOT_IMPLEMENTED_call() ++@NOT_IMPLEMENTED_call(NOT_IMPLEMENTED_arg) +def function_signature_stress_test( + number: int, + no_annotation=None, @@ -292,7 +292,7 @@ d={'a':1, + h="NOT_YET_IMPLEMENTED_STRING", + i="NOT_YET_IMPLEMENTED_STRING", +): -+ offset = NOT_IMPLEMENTED_call() ++ offset = NOT_IMPLEMENTED_call(NOT_IMPLEMENTED_arg) + NOT_YET_IMPLEMENTED_StmtAssert @@ -312,7 +312,7 @@ d={'a':1, -def spaces2(result=_core.Value(None)): -+def spaces2(result=NOT_IMPLEMENTED_call()): ++def spaces2(result=NOT_IMPLEMENTED_call(NOT_IMPLEMENTED_arg)): ... @@ -429,7 +429,7 @@ d={'a':1, - implicit_default=True, - ) - ) -+ NOT_IMPLEMENTED_call() ++ NOT_IMPLEMENTED_call(NOT_IMPLEMENTED_arg) # fmt: off - a = ( - unnecessary_bracket() @@ -460,7 +460,7 @@ d={'a':1, - re.MULTILINE|re.VERBOSE - # fmt: on - ) -+ _type_comment_re = NOT_IMPLEMENTED_call() ++ _type_comment_re = NOT_IMPLEMENTED_call(NOT_IMPLEMENTED_arg) def single_literal_yapf_disable(): @@ -496,7 +496,7 @@ d={'a':1, - # fmt: on - xxxxxxxxxx_xxxxxxxxxxx_xxxxxxx_xxxxxxxxx=5, -) -+NOT_IMPLEMENTED_call() ++NOT_IMPLEMENTED_call(NOT_IMPLEMENTED_arg) # fmt: off -yield 'hello' +NOT_YET_IMPLEMENTED_ExprYield @@ -536,21 +536,21 @@ def func_no_args(): NOT_YET_IMPLEMENTED_StmtRaise if False: ... - for i in NOT_IMPLEMENTED_call(): - NOT_IMPLEMENTED_call() + for i in NOT_IMPLEMENTED_call(NOT_IMPLEMENTED_arg): + NOT_IMPLEMENTED_call(NOT_IMPLEMENTED_arg) continue - NOT_IMPLEMENTED_call() + NOT_IMPLEMENTED_call(NOT_IMPLEMENTED_arg) return None async def coroutine(arg, exec=False): "NOT_YET_IMPLEMENTED_STRING" NOT_YET_IMPLEMENTED_StmtAsyncWith - await NOT_IMPLEMENTED_call() + await NOT_IMPLEMENTED_call(NOT_IMPLEMENTED_arg) @asyncio.coroutine -@NOT_IMPLEMENTED_call() +@NOT_IMPLEMENTED_call(NOT_IMPLEMENTED_arg) def function_signature_stress_test( number: int, no_annotation=None, @@ -574,7 +574,7 @@ def spaces( h="NOT_YET_IMPLEMENTED_STRING", i="NOT_YET_IMPLEMENTED_STRING", ): - offset = NOT_IMPLEMENTED_call() + offset = NOT_IMPLEMENTED_call(NOT_IMPLEMENTED_arg) NOT_YET_IMPLEMENTED_StmtAssert @@ -592,7 +592,7 @@ def spaces_types( ... -def spaces2(result=NOT_IMPLEMENTED_call()): +def spaces2(result=NOT_IMPLEMENTED_call(NOT_IMPLEMENTED_arg)): ... @@ -674,11 +674,11 @@ def on_and_off_broken(): def long_lines(): if True: - NOT_IMPLEMENTED_call() + NOT_IMPLEMENTED_call(NOT_IMPLEMENTED_arg) # fmt: off a = NOT_IMPLEMENTED_call() # fmt: on - _type_comment_re = NOT_IMPLEMENTED_call() + _type_comment_re = NOT_IMPLEMENTED_call(NOT_IMPLEMENTED_arg) def single_literal_yapf_disable(): @@ -686,7 +686,7 @@ def single_literal_yapf_disable(): BAZ = {(1, 2, 3, 4), (5, 6, 7, 8), (9, 10, 11, 12)} # yapf: disable -NOT_IMPLEMENTED_call() +NOT_IMPLEMENTED_call(NOT_IMPLEMENTED_arg) # fmt: off NOT_YET_IMPLEMENTED_ExprYield # No formatting to the end of the file diff --git a/crates/ruff_python_formatter/src/snapshots/ruff_python_formatter__tests__black_test__fmtskip5_py.snap b/crates/ruff_python_formatter/src/snapshots/ruff_python_formatter__tests__black_test__fmtskip5_py.snap index 7ad743ff86..2247055281 100644 --- a/crates/ruff_python_formatter/src/snapshots/ruff_python_formatter__tests__black_test__fmtskip5_py.snap +++ b/crates/ruff_python_formatter/src/snapshots/ruff_python_formatter__tests__black_test__fmtskip5_py.snap @@ -33,10 +33,10 @@ else: + and NOT_IMPLEMENTED_left < NOT_IMPLEMENTED_right ): - print("I'm good!") -+ NOT_IMPLEMENTED_call() ++ NOT_IMPLEMENTED_call(NOT_IMPLEMENTED_arg) else: - print("I'm bad") -+ NOT_IMPLEMENTED_call() ++ NOT_IMPLEMENTED_call(NOT_IMPLEMENTED_arg) ``` ## Ruff Output @@ -48,9 +48,9 @@ if ( and NOT_IMPLEMENTED_left < NOT_IMPLEMENTED_right # fmt: skip and NOT_IMPLEMENTED_left < NOT_IMPLEMENTED_right ): - NOT_IMPLEMENTED_call() + NOT_IMPLEMENTED_call(NOT_IMPLEMENTED_arg) else: - NOT_IMPLEMENTED_call() + NOT_IMPLEMENTED_call(NOT_IMPLEMENTED_arg) ``` ## Black Output diff --git a/crates/ruff_python_formatter/src/snapshots/ruff_python_formatter__tests__black_test__fmtskip8_py.snap b/crates/ruff_python_formatter/src/snapshots/ruff_python_formatter__tests__black_test__fmtskip8_py.snap index eb9f51311f..3c3e9d8cf2 100644 --- a/crates/ruff_python_formatter/src/snapshots/ruff_python_formatter__tests__black_test__fmtskip8_py.snap +++ b/crates/ruff_python_formatter/src/snapshots/ruff_python_formatter__tests__black_test__fmtskip8_py.snap @@ -80,7 +80,7 @@ async def test_async_with(): -def some_func( unformatted, args ): # fmt: skip - print("I am some_func") +def some_func(unformatted, args): # fmt: skip -+ NOT_IMPLEMENTED_call() ++ NOT_IMPLEMENTED_call(NOT_IMPLEMENTED_arg) return 0 # Make sure this comment is not removed. @@ -90,8 +90,8 @@ async def test_async_with(): - print("I am some_async_func") - await asyncio.sleep(1) +async def some_async_func(unformatted, args): # fmt: skip -+ NOT_IMPLEMENTED_call() -+ await NOT_IMPLEMENTED_call() ++ NOT_IMPLEMENTED_call(NOT_IMPLEMENTED_arg) ++ await NOT_IMPLEMENTED_call(NOT_IMPLEMENTED_arg) # Make sure a leading comment is not removed. @@ -109,29 +109,29 @@ async def test_async_with(): # Make sure a leading comment is not removed. -if unformatted_call( args ): # fmt: skip - print("First branch") -+if NOT_IMPLEMENTED_call(): # fmt: skip -+ NOT_IMPLEMENTED_call() ++if NOT_IMPLEMENTED_call(NOT_IMPLEMENTED_arg): # fmt: skip ++ NOT_IMPLEMENTED_call(NOT_IMPLEMENTED_arg) # Make sure this is not removed. -elif another_unformatted_call( args ): # fmt: skip - print("Second branch") -else : # fmt: skip - print("Last branch") -+elif NOT_IMPLEMENTED_call(): # fmt: skip -+ NOT_IMPLEMENTED_call() ++elif NOT_IMPLEMENTED_call(NOT_IMPLEMENTED_arg): # fmt: skip ++ NOT_IMPLEMENTED_call(NOT_IMPLEMENTED_arg) +else: # fmt: skip -+ NOT_IMPLEMENTED_call() ++ NOT_IMPLEMENTED_call(NOT_IMPLEMENTED_arg) -while some_condition( unformatted, args ): # fmt: skip - print("Do something") -+while NOT_IMPLEMENTED_call(): # fmt: skip -+ NOT_IMPLEMENTED_call() ++while NOT_IMPLEMENTED_call(NOT_IMPLEMENTED_arg): # fmt: skip ++ NOT_IMPLEMENTED_call(NOT_IMPLEMENTED_arg) -for i in some_iter( unformatted, args ): # fmt: skip - print("Do something") -+for i in NOT_IMPLEMENTED_call(): # fmt: skip -+ NOT_IMPLEMENTED_call() ++for i in NOT_IMPLEMENTED_call(NOT_IMPLEMENTED_arg): # fmt: skip ++ NOT_IMPLEMENTED_call(NOT_IMPLEMENTED_arg) async def test_async_for(): @@ -165,15 +165,15 @@ async def test_async_with(): ```py # Make sure a leading comment is not removed. def some_func(unformatted, args): # fmt: skip - NOT_IMPLEMENTED_call() + NOT_IMPLEMENTED_call(NOT_IMPLEMENTED_arg) return 0 # Make sure this comment is not removed. # Make sure a leading comment is not removed. async def some_async_func(unformatted, args): # fmt: skip - NOT_IMPLEMENTED_call() - await NOT_IMPLEMENTED_call() + NOT_IMPLEMENTED_call(NOT_IMPLEMENTED_arg) + await NOT_IMPLEMENTED_call(NOT_IMPLEMENTED_arg) # Make sure a leading comment is not removed. @@ -181,21 +181,21 @@ NOT_YET_IMPLEMENTED_StmtClassDef # Make sure a leading comment is not removed. -if NOT_IMPLEMENTED_call(): # fmt: skip - NOT_IMPLEMENTED_call() +if NOT_IMPLEMENTED_call(NOT_IMPLEMENTED_arg): # fmt: skip + NOT_IMPLEMENTED_call(NOT_IMPLEMENTED_arg) # Make sure this is not removed. -elif NOT_IMPLEMENTED_call(): # fmt: skip - NOT_IMPLEMENTED_call() +elif NOT_IMPLEMENTED_call(NOT_IMPLEMENTED_arg): # fmt: skip + NOT_IMPLEMENTED_call(NOT_IMPLEMENTED_arg) else: # fmt: skip - NOT_IMPLEMENTED_call() + NOT_IMPLEMENTED_call(NOT_IMPLEMENTED_arg) -while NOT_IMPLEMENTED_call(): # fmt: skip - NOT_IMPLEMENTED_call() +while NOT_IMPLEMENTED_call(NOT_IMPLEMENTED_arg): # fmt: skip + NOT_IMPLEMENTED_call(NOT_IMPLEMENTED_arg) -for i in NOT_IMPLEMENTED_call(): # fmt: skip - NOT_IMPLEMENTED_call() +for i in NOT_IMPLEMENTED_call(NOT_IMPLEMENTED_arg): # fmt: skip + NOT_IMPLEMENTED_call(NOT_IMPLEMENTED_arg) async def test_async_for(): diff --git a/crates/ruff_python_formatter/src/snapshots/ruff_python_formatter__tests__black_test__function2_py.snap b/crates/ruff_python_formatter/src/snapshots/ruff_python_formatter__tests__black_test__function2_py.snap index 44b9556da9..a3f8df4f44 100644 --- a/crates/ruff_python_formatter/src/snapshots/ruff_python_formatter__tests__black_test__function2_py.snap +++ b/crates/ruff_python_formatter/src/snapshots/ruff_python_formatter__tests__black_test__function2_py.snap @@ -82,8 +82,8 @@ with hmm_but_this_should_get_two_preceding_newlines(): - **kwargs, - ) + NOT_YET_IMPLEMENTED_StmtWith -+ NOT_IMPLEMENTED_call() # negate top -+ return NOT_IMPLEMENTED_call() ++ NOT_IMPLEMENTED_call(NOT_IMPLEMENTED_arg) # negate top ++ return NOT_IMPLEMENTED_call(NOT_IMPLEMENTED_arg) def g(): @@ -94,7 +94,7 @@ with hmm_but_this_should_get_two_preceding_newlines(): pass - print("Inner defs should breathe a little.") -+ NOT_IMPLEMENTED_call() ++ NOT_IMPLEMENTED_call(NOT_IMPLEMENTED_arg) def h(): @@ -102,7 +102,7 @@ with hmm_but_this_should_get_two_preceding_newlines(): pass - print("Inner defs should breathe a little.") -+ NOT_IMPLEMENTED_call() ++ NOT_IMPLEMENTED_call(NOT_IMPLEMENTED_arg) -if os.name == "posix": @@ -153,8 +153,8 @@ def f( **kwargs, ) -> A: NOT_YET_IMPLEMENTED_StmtWith - NOT_IMPLEMENTED_call() # negate top - return NOT_IMPLEMENTED_call() + NOT_IMPLEMENTED_call(NOT_IMPLEMENTED_arg) # negate top + return NOT_IMPLEMENTED_call(NOT_IMPLEMENTED_arg) def g(): @@ -163,14 +163,14 @@ def g(): def inner(): pass - NOT_IMPLEMENTED_call() + NOT_IMPLEMENTED_call(NOT_IMPLEMENTED_arg) def h(): def inner(): pass - NOT_IMPLEMENTED_call() + NOT_IMPLEMENTED_call(NOT_IMPLEMENTED_arg) if NOT_IMPLEMENTED_left < NOT_IMPLEMENTED_right: diff --git a/crates/ruff_python_formatter/src/snapshots/ruff_python_formatter__tests__black_test__function_py.snap b/crates/ruff_python_formatter/src/snapshots/ruff_python_formatter__tests__black_test__function_py.snap index 9379157af1..f51aeec357 100644 --- a/crates/ruff_python_formatter/src/snapshots/ruff_python_formatter__tests__black_test__function_py.snap +++ b/crates/ruff_python_formatter/src/snapshots/ruff_python_formatter__tests__black_test__function_py.snap @@ -136,11 +136,11 @@ def __await__(): return (yield) ... - for i in range(10): - print(i) -+ for i in NOT_IMPLEMENTED_call(): -+ NOT_IMPLEMENTED_call() ++ for i in NOT_IMPLEMENTED_call(NOT_IMPLEMENTED_arg): ++ NOT_IMPLEMENTED_call(NOT_IMPLEMENTED_arg) continue - exec("new-style exec", {}, {}) -+ NOT_IMPLEMENTED_call() ++ NOT_IMPLEMENTED_call(NOT_IMPLEMENTED_arg) return None @@ -151,12 +151,12 @@ def __await__(): return (yield) - await asyncio.sleep(1) + "NOT_YET_IMPLEMENTED_STRING" + NOT_YET_IMPLEMENTED_StmtAsyncWith -+ await NOT_IMPLEMENTED_call() ++ await NOT_IMPLEMENTED_call(NOT_IMPLEMENTED_arg) @asyncio.coroutine -@some_decorator(with_args=True, many_args=[1, 2, 3]) -+@NOT_IMPLEMENTED_call() ++@NOT_IMPLEMENTED_call(NOT_IMPLEMENTED_arg) def function_signature_stress_test( number: int, no_annotation=None, @@ -184,7 +184,7 @@ def __await__(): return (yield) + h="NOT_YET_IMPLEMENTED_STRING", + i="NOT_YET_IMPLEMENTED_STRING", +): -+ offset = NOT_IMPLEMENTED_call() ++ offset = NOT_IMPLEMENTED_call(NOT_IMPLEMENTED_arg) + NOT_YET_IMPLEMENTED_StmtAssert @@ -205,7 +205,7 @@ def __await__(): return (yield) -def spaces2(result=_core.Value(None)): - assert fut is self._read_fut, (fut, self._read_fut) -+def spaces2(result=NOT_IMPLEMENTED_call()): ++def spaces2(result=NOT_IMPLEMENTED_call(NOT_IMPLEMENTED_arg)): + NOT_YET_IMPLEMENTED_StmtAssert @@ -263,9 +263,9 @@ def __await__(): return (yield) - """, - re.MULTILINE | re.VERBOSE, - ) -+ NOT_IMPLEMENTED_call() -+ NOT_IMPLEMENTED_call() -+ _type_comment_re = NOT_IMPLEMENTED_call() ++ NOT_IMPLEMENTED_call(NOT_IMPLEMENTED_arg) ++ NOT_IMPLEMENTED_call(NOT_IMPLEMENTED_arg) ++ _type_comment_re = NOT_IMPLEMENTED_call(NOT_IMPLEMENTED_arg) def trailing_comma(): @@ -309,21 +309,21 @@ def func_no_args(): NOT_YET_IMPLEMENTED_StmtRaise if False: ... - for i in NOT_IMPLEMENTED_call(): - NOT_IMPLEMENTED_call() + for i in NOT_IMPLEMENTED_call(NOT_IMPLEMENTED_arg): + NOT_IMPLEMENTED_call(NOT_IMPLEMENTED_arg) continue - NOT_IMPLEMENTED_call() + NOT_IMPLEMENTED_call(NOT_IMPLEMENTED_arg) return None async def coroutine(arg, exec=False): "NOT_YET_IMPLEMENTED_STRING" NOT_YET_IMPLEMENTED_StmtAsyncWith - await NOT_IMPLEMENTED_call() + await NOT_IMPLEMENTED_call(NOT_IMPLEMENTED_arg) @asyncio.coroutine -@NOT_IMPLEMENTED_call() +@NOT_IMPLEMENTED_call(NOT_IMPLEMENTED_arg) def function_signature_stress_test( number: int, no_annotation=None, @@ -346,7 +346,7 @@ def spaces( h="NOT_YET_IMPLEMENTED_STRING", i="NOT_YET_IMPLEMENTED_STRING", ): - offset = NOT_IMPLEMENTED_call() + offset = NOT_IMPLEMENTED_call(NOT_IMPLEMENTED_arg) NOT_YET_IMPLEMENTED_StmtAssert @@ -364,7 +364,7 @@ def spaces_types( ... -def spaces2(result=NOT_IMPLEMENTED_call()): +def spaces2(result=NOT_IMPLEMENTED_call(NOT_IMPLEMENTED_arg)): NOT_YET_IMPLEMENTED_StmtAssert @@ -374,9 +374,9 @@ def example(session): def long_lines(): if True: - NOT_IMPLEMENTED_call() - NOT_IMPLEMENTED_call() - _type_comment_re = NOT_IMPLEMENTED_call() + NOT_IMPLEMENTED_call(NOT_IMPLEMENTED_arg) + NOT_IMPLEMENTED_call(NOT_IMPLEMENTED_arg) + _type_comment_re = NOT_IMPLEMENTED_call(NOT_IMPLEMENTED_arg) def trailing_comma(): diff --git a/crates/ruff_python_formatter/src/snapshots/ruff_python_formatter__tests__black_test__function_trailing_comma_py.snap b/crates/ruff_python_formatter/src/snapshots/ruff_python_formatter__tests__black_test__function_trailing_comma_py.snap index f0fb15c471..965322236b 100644 --- a/crates/ruff_python_formatter/src/snapshots/ruff_python_formatter__tests__black_test__function_trailing_comma_py.snap +++ b/crates/ruff_python_formatter/src/snapshots/ruff_python_formatter__tests__black_test__function_trailing_comma_py.snap @@ -106,8 +106,8 @@ some_module.some_function( - call2( - arg=[1, 2, 3], - ) -+ NOT_IMPLEMENTED_call() -+ NOT_IMPLEMENTED_call() ++ NOT_IMPLEMENTED_call(NOT_IMPLEMENTED_arg) ++ NOT_IMPLEMENTED_call(NOT_IMPLEMENTED_arg) x = { - "a": 1, - "b": 2, @@ -161,7 +161,7 @@ some_module.some_function( - this_shouldn_t_get_a_trailing_comma_too - ) -): -+def func() -> NOT_IMPLEMENTED_call(): ++def func() -> NOT_IMPLEMENTED_call(NOT_IMPLEMENTED_arg): pass @@ -170,7 +170,7 @@ some_module.some_function( - this_shouldn_t_get_a_trailing_comma_too - ) -): -+def func() -> NOT_IMPLEMENTED_call(): ++def func() -> NOT_IMPLEMENTED_call(NOT_IMPLEMENTED_arg): pass @@ -178,7 +178,7 @@ some_module.some_function( -some_module.some_function( - argument1, (one_element_tuple,), argument4, argument5, argument6 -) -+NOT_IMPLEMENTED_call() ++NOT_IMPLEMENTED_call(NOT_IMPLEMENTED_arg) # Inner trailing comma causes outer to explode -some_module.some_function( @@ -191,7 +191,7 @@ some_module.some_function( - argument5, - argument6, -) -+NOT_IMPLEMENTED_call() ++NOT_IMPLEMENTED_call(NOT_IMPLEMENTED_arg) ``` ## Ruff Output @@ -223,8 +223,8 @@ def f2( def f( a: int = 1, ): - NOT_IMPLEMENTED_call() - NOT_IMPLEMENTED_call() + NOT_IMPLEMENTED_call(NOT_IMPLEMENTED_arg) + NOT_IMPLEMENTED_call(NOT_IMPLEMENTED_arg) x = { "NOT_YET_IMPLEMENTED_STRING": 1, "NOT_YET_IMPLEMENTED_STRING": 2, @@ -257,19 +257,19 @@ def some_method_with_a_really_long_name( pass -def func() -> NOT_IMPLEMENTED_call(): +def func() -> NOT_IMPLEMENTED_call(NOT_IMPLEMENTED_arg): pass -def func() -> NOT_IMPLEMENTED_call(): +def func() -> NOT_IMPLEMENTED_call(NOT_IMPLEMENTED_arg): pass # Make sure inner one-element tuple won't explode -NOT_IMPLEMENTED_call() +NOT_IMPLEMENTED_call(NOT_IMPLEMENTED_arg) # Inner trailing comma causes outer to explode -NOT_IMPLEMENTED_call() +NOT_IMPLEMENTED_call(NOT_IMPLEMENTED_arg) ``` ## Black Output diff --git a/crates/ruff_python_formatter/src/snapshots/ruff_python_formatter__tests__black_test__power_op_spacing_py.snap b/crates/ruff_python_formatter/src/snapshots/ruff_python_formatter__tests__black_test__power_op_spacing_py.snap index bf18bb0df8..70995c951c 100644 --- a/crates/ruff_python_formatter/src/snapshots/ruff_python_formatter__tests__black_test__power_op_spacing_py.snap +++ b/crates/ruff_python_formatter/src/snapshots/ruff_python_formatter__tests__black_test__power_op_spacing_py.snap @@ -87,7 +87,7 @@ return np.divide( -e = lazy(lambda **kwargs: 5) -f = f() ** 5 +d = 5 ** f["NOT_YET_IMPLEMENTED_STRING"] -+e = NOT_IMPLEMENTED_call() ++e = NOT_IMPLEMENTED_call(NOT_IMPLEMENTED_arg) +f = NOT_IMPLEMENTED_call() ** 5 g = a.b**c.d -h = 5 ** funcs.f() @@ -106,7 +106,7 @@ return np.divide( -p = {(k, k**2): v**2 for k, v in pairs} -q = [10**i for i in range(6)] +n = NOT_IMPLEMENTED_left < NOT_IMPLEMENTED_right -+o = NOT_IMPLEMENTED_call() ++o = NOT_IMPLEMENTED_call(NOT_IMPLEMENTED_arg) +p = {NOT_IMPLEMENTED_dict_key: NOT_IMPLEMENTED_dict_value for key, value in NOT_IMPLEMENTED_dict} +q = [i for i in []] r = x**y @@ -119,7 +119,7 @@ return np.divide( -e = lazy(lambda **kwargs: 5) -f = f() ** 5.0 +d = 5.0 ** f["NOT_YET_IMPLEMENTED_STRING"] -+e = NOT_IMPLEMENTED_call() ++e = NOT_IMPLEMENTED_call(NOT_IMPLEMENTED_arg) +f = NOT_IMPLEMENTED_call() ** 5.0 g = a.b**c.d -h = 5.0 ** funcs.f() @@ -138,7 +138,7 @@ return np.divide( -p = {(k, k**2): v**2.0 for k, v in pairs} -q = [10.5**i for i in range(6)] +n = NOT_IMPLEMENTED_left < NOT_IMPLEMENTED_right -+o = NOT_IMPLEMENTED_call() ++o = NOT_IMPLEMENTED_call(NOT_IMPLEMENTED_arg) +p = {NOT_IMPLEMENTED_dict_key: NOT_IMPLEMENTED_dict_value for key, value in NOT_IMPLEMENTED_dict} +q = [i for i in []] @@ -151,13 +151,13 @@ return np.divide( - out=np.full(view.sum_of_weights.shape, np.nan), # type: ignore[union-attr] - where=view.sum_of_weights**2 > view.sum_of_weights_squared, # type: ignore[union-attr] - ) -+if NOT_IMPLEMENTED_call(): -+ return NOT_IMPLEMENTED_call() ++if NOT_IMPLEMENTED_call(NOT_IMPLEMENTED_arg): ++ return NOT_IMPLEMENTED_call(NOT_IMPLEMENTED_arg) -return np.divide( - where=view.sum_of_weights_of_weight_long**2 > view.sum_of_weights_squared, # type: ignore -) -+return NOT_IMPLEMENTED_call() ++return NOT_IMPLEMENTED_call(NOT_IMPLEMENTED_arg) ``` ## Ruff Output @@ -180,7 +180,7 @@ a = 5**~4 b = 5 ** NOT_IMPLEMENTED_call() c = -(5**2) d = 5 ** f["NOT_YET_IMPLEMENTED_STRING"] -e = NOT_IMPLEMENTED_call() +e = NOT_IMPLEMENTED_call(NOT_IMPLEMENTED_arg) f = NOT_IMPLEMENTED_call() ** 5 g = a.b**c.d h = 5 ** NOT_IMPLEMENTED_call() @@ -190,7 +190,7 @@ k = [i for i in []] l = NOT_IMPLEMENTED_left < NOT_IMPLEMENTED_right m = [([2**63], [1, 2**63])] n = NOT_IMPLEMENTED_left < NOT_IMPLEMENTED_right -o = NOT_IMPLEMENTED_call() +o = NOT_IMPLEMENTED_call(NOT_IMPLEMENTED_arg) p = {NOT_IMPLEMENTED_dict_key: NOT_IMPLEMENTED_dict_value for key, value in NOT_IMPLEMENTED_dict} q = [i for i in []] r = x**y @@ -199,7 +199,7 @@ a = 5.0**~4.0 b = 5.0 ** NOT_IMPLEMENTED_call() c = -(5.0**2.0) d = 5.0 ** f["NOT_YET_IMPLEMENTED_STRING"] -e = NOT_IMPLEMENTED_call() +e = NOT_IMPLEMENTED_call(NOT_IMPLEMENTED_arg) f = NOT_IMPLEMENTED_call() ** 5.0 g = a.b**c.d h = 5.0 ** NOT_IMPLEMENTED_call() @@ -209,16 +209,16 @@ k = [i for i in []] l = NOT_IMPLEMENTED_left < NOT_IMPLEMENTED_right m = [([2.0**63.0], [1.0, 2**63.0])] n = NOT_IMPLEMENTED_left < NOT_IMPLEMENTED_right -o = NOT_IMPLEMENTED_call() +o = NOT_IMPLEMENTED_call(NOT_IMPLEMENTED_arg) p = {NOT_IMPLEMENTED_dict_key: NOT_IMPLEMENTED_dict_value for key, value in NOT_IMPLEMENTED_dict} q = [i for i in []] # WE SHOULD DEFINITELY NOT EAT THESE COMMENTS (https://github.com/psf/black/issues/2873) -if NOT_IMPLEMENTED_call(): - return NOT_IMPLEMENTED_call() +if NOT_IMPLEMENTED_call(NOT_IMPLEMENTED_arg): + return NOT_IMPLEMENTED_call(NOT_IMPLEMENTED_arg) -return NOT_IMPLEMENTED_call() +return NOT_IMPLEMENTED_call(NOT_IMPLEMENTED_arg) ``` ## Black Output diff --git a/crates/ruff_python_formatter/src/snapshots/ruff_python_formatter__tests__black_test__prefer_rhs_split_reformatted_py.snap b/crates/ruff_python_formatter/src/snapshots/ruff_python_formatter__tests__black_test__prefer_rhs_split_reformatted_py.snap index 89478d9b1f..db5e55f09b 100644 --- a/crates/ruff_python_formatter/src/snapshots/ruff_python_formatter__tests__black_test__prefer_rhs_split_reformatted_py.snap +++ b/crates/ruff_python_formatter/src/snapshots/ruff_python_formatter__tests__black_test__prefer_rhs_split_reformatted_py.snap @@ -25,7 +25,7 @@ xxxxxxxxx_yyy_zzzzzzzz[xx.xxxxxx(x_yyy_zzzzzz.xxxxx[0]), x_yyy_zzzzzz.xxxxxx(xxx ```diff --- Black +++ Ruff -@@ -9,13 +9,8 @@ +@@ -9,13 +9,10 @@ m2, ), third_value, @@ -33,14 +33,14 @@ xxxxxxxxx_yyy_zzzzzzzz[xx.xxxxxx(x_yyy_zzzzzz.xxxxx[0]), x_yyy_zzzzzz.xxxxxx(xxx - arg1, - arg2, -) -+) = NOT_IMPLEMENTED_call() ++) = NOT_IMPLEMENTED_call(NOT_IMPLEMENTED_arg) # Make when when the left side of assignment plus the opening paren "... = (" is # exactly line length limit + 1, it won't be split like that. --xxxxxxxxx_yyy_zzzzzzzz[ + xxxxxxxxx_yyy_zzzzzzzz[ - xx.xxxxxx(x_yyy_zzzzzz.xxxxx[0]), x_yyy_zzzzzz.xxxxxx(xxxx=1) --] = 1 -+xxxxxxxxx_yyy_zzzzzzzz[NOT_IMPLEMENTED_call(), NOT_IMPLEMENTED_call()] = 1 ++ NOT_IMPLEMENTED_call(NOT_IMPLEMENTED_arg), NOT_IMPLEMENTED_call(NOT_IMPLEMENTED_arg) + ] = 1 ``` ## Ruff Output @@ -57,11 +57,13 @@ xxxxxxxxx_yyy_zzzzzzzz[xx.xxxxxx(x_yyy_zzzzzz.xxxxx[0]), x_yyy_zzzzzz.xxxxxx(xxx m2, ), third_value, -) = NOT_IMPLEMENTED_call() +) = NOT_IMPLEMENTED_call(NOT_IMPLEMENTED_arg) # Make when when the left side of assignment plus the opening paren "... = (" is # exactly line length limit + 1, it won't be split like that. -xxxxxxxxx_yyy_zzzzzzzz[NOT_IMPLEMENTED_call(), NOT_IMPLEMENTED_call()] = 1 +xxxxxxxxx_yyy_zzzzzzzz[ + NOT_IMPLEMENTED_call(NOT_IMPLEMENTED_arg), NOT_IMPLEMENTED_call(NOT_IMPLEMENTED_arg) +] = 1 ``` ## Black Output diff --git a/crates/ruff_python_formatter/src/snapshots/ruff_python_formatter__tests__black_test__remove_await_parens_py.snap b/crates/ruff_python_formatter/src/snapshots/ruff_python_formatter__tests__black_test__remove_await_parens_py.snap index 7923c03bb5..b13ce8545b 100644 --- a/crates/ruff_python_formatter/src/snapshots/ruff_python_formatter__tests__black_test__remove_await_parens_py.snap +++ b/crates/ruff_python_formatter/src/snapshots/ruff_python_formatter__tests__black_test__remove_await_parens_py.snap @@ -102,23 +102,23 @@ async def main(): # Control example async def main(): - await asyncio.sleep(1) -+ await NOT_IMPLEMENTED_call() ++ await NOT_IMPLEMENTED_call(NOT_IMPLEMENTED_arg) # Remove brackets for short coroutine/task async def main(): - await asyncio.sleep(1) -+ await (NOT_IMPLEMENTED_call()) ++ await (NOT_IMPLEMENTED_call(NOT_IMPLEMENTED_arg)) async def main(): - await asyncio.sleep(1) -+ await (NOT_IMPLEMENTED_call()) ++ await (NOT_IMPLEMENTED_call(NOT_IMPLEMENTED_arg)) async def main(): - await asyncio.sleep(1) -+ await (NOT_IMPLEMENTED_call()) ++ await (NOT_IMPLEMENTED_call(NOT_IMPLEMENTED_arg)) # Check comments @@ -126,7 +126,7 @@ async def main(): - await asyncio.sleep(1) # Hello + ( + await # Hello -+ NOT_IMPLEMENTED_call() ++ NOT_IMPLEMENTED_call(NOT_IMPLEMENTED_arg) + ) @@ -134,14 +134,14 @@ async def main(): - await asyncio.sleep(1) # Hello + ( + await ( -+ NOT_IMPLEMENTED_call() # Hello ++ NOT_IMPLEMENTED_call(NOT_IMPLEMENTED_arg) # Hello + ) + ) async def main(): - await asyncio.sleep(1) # Hello -+ await (NOT_IMPLEMENTED_call()) # Hello ++ await (NOT_IMPLEMENTED_call(NOT_IMPLEMENTED_arg)) # Hello # Long lines @@ -155,7 +155,7 @@ async def main(): - asyncio.sleep(1), - asyncio.sleep(1), - ) -+ await NOT_IMPLEMENTED_call() ++ await NOT_IMPLEMENTED_call(NOT_IMPLEMENTED_arg) # Same as above but with magic trailing comma in function @@ -169,13 +169,13 @@ async def main(): - asyncio.sleep(1), - asyncio.sleep(1), - ) -+ await NOT_IMPLEMENTED_call() ++ await NOT_IMPLEMENTED_call(NOT_IMPLEMENTED_arg) # Cr@zY Br@ck3Tz async def main(): - await black(1) -+ await (NOT_IMPLEMENTED_call()) ++ await (NOT_IMPLEMENTED_call(NOT_IMPLEMENTED_arg)) # Keep brackets around non power operations and nested awaits @@ -184,7 +184,7 @@ async def main(): async def main(): - await (await asyncio.sleep(1)) -+ await (await NOT_IMPLEMENTED_call()) ++ await (await NOT_IMPLEMENTED_call(NOT_IMPLEMENTED_arg)) # It's awaits all the way down... @@ -198,12 +198,12 @@ async def main(): async def main(): - await (await asyncio.sleep(1)) -+ await (await (NOT_IMPLEMENTED_call())) ++ await (await (NOT_IMPLEMENTED_call(NOT_IMPLEMENTED_arg))) async def main(): - await (await (await (await (await asyncio.sleep(1))))) -+ await (await (await (await (await (NOT_IMPLEMENTED_call()))))) ++ await (await (await (await (await (NOT_IMPLEMENTED_call(NOT_IMPLEMENTED_arg)))))) async def main(): @@ -219,55 +219,55 @@ NOT_YET_IMPLEMENTED_StmtImport # Control example async def main(): - await NOT_IMPLEMENTED_call() + await NOT_IMPLEMENTED_call(NOT_IMPLEMENTED_arg) # Remove brackets for short coroutine/task async def main(): - await (NOT_IMPLEMENTED_call()) + await (NOT_IMPLEMENTED_call(NOT_IMPLEMENTED_arg)) async def main(): - await (NOT_IMPLEMENTED_call()) + await (NOT_IMPLEMENTED_call(NOT_IMPLEMENTED_arg)) async def main(): - await (NOT_IMPLEMENTED_call()) + await (NOT_IMPLEMENTED_call(NOT_IMPLEMENTED_arg)) # Check comments async def main(): ( await # Hello - NOT_IMPLEMENTED_call() + NOT_IMPLEMENTED_call(NOT_IMPLEMENTED_arg) ) async def main(): ( await ( - NOT_IMPLEMENTED_call() # Hello + NOT_IMPLEMENTED_call(NOT_IMPLEMENTED_arg) # Hello ) ) async def main(): - await (NOT_IMPLEMENTED_call()) # Hello + await (NOT_IMPLEMENTED_call(NOT_IMPLEMENTED_arg)) # Hello # Long lines async def main(): - await NOT_IMPLEMENTED_call() + await NOT_IMPLEMENTED_call(NOT_IMPLEMENTED_arg) # Same as above but with magic trailing comma in function async def main(): - await NOT_IMPLEMENTED_call() + await NOT_IMPLEMENTED_call(NOT_IMPLEMENTED_arg) # Cr@zY Br@ck3Tz async def main(): - await (NOT_IMPLEMENTED_call()) + await (NOT_IMPLEMENTED_call(NOT_IMPLEMENTED_arg)) # Keep brackets around non power operations and nested awaits @@ -276,7 +276,7 @@ async def main(): async def main(): - await (await NOT_IMPLEMENTED_call()) + await (await NOT_IMPLEMENTED_call(NOT_IMPLEMENTED_arg)) # It's awaits all the way down... @@ -289,11 +289,11 @@ async def main(): async def main(): - await (await (NOT_IMPLEMENTED_call())) + await (await (NOT_IMPLEMENTED_call(NOT_IMPLEMENTED_arg))) async def main(): - await (await (await (await (await (NOT_IMPLEMENTED_call()))))) + await (await (await (await (await (NOT_IMPLEMENTED_call(NOT_IMPLEMENTED_arg)))))) async def main(): diff --git a/crates/ruff_python_formatter/src/snapshots/ruff_python_formatter__tests__black_test__remove_for_brackets_py.snap b/crates/ruff_python_formatter/src/snapshots/ruff_python_formatter__tests__black_test__remove_for_brackets_py.snap index b745fd054e..ab7e8ada6d 100644 --- a/crates/ruff_python_formatter/src/snapshots/ruff_python_formatter__tests__black_test__remove_for_brackets_py.snap +++ b/crates/ruff_python_formatter/src/snapshots/ruff_python_formatter__tests__black_test__remove_for_brackets_py.snap @@ -37,13 +37,13 @@ for (((((k, v))))) in d.items(): -for k, v in d.items(): - print(k, v) +for k, v in NOT_IMPLEMENTED_call(): -+ NOT_IMPLEMENTED_call() ++ NOT_IMPLEMENTED_call(NOT_IMPLEMENTED_arg) # Don't touch tuple brackets after `in` for module in (core, _unicodefun): - if hasattr(module, "_verify_python3_env"): - module._verify_python3_env = lambda: None -+ if NOT_IMPLEMENTED_call(): ++ if NOT_IMPLEMENTED_call(NOT_IMPLEMENTED_arg): + module._verify_python3_env = lambda x: True # Brackets remain for long for loop lines @@ -53,7 +53,7 @@ for (((((k, v))))) in d.items(): -) in d.items(): - print(k, v) +) in NOT_IMPLEMENTED_call(): -+ NOT_IMPLEMENTED_call() ++ NOT_IMPLEMENTED_call(NOT_IMPLEMENTED_arg) -for ( - k, @@ -63,13 +63,13 @@ for (((((k, v))))) in d.items(): -): - print(k, v) +for k, v in NOT_IMPLEMENTED_call(): -+ NOT_IMPLEMENTED_call() ++ NOT_IMPLEMENTED_call(NOT_IMPLEMENTED_arg) # Test deeply nested brackets -for k, v in d.items(): - print(k, v) +for k, v in NOT_IMPLEMENTED_call(): -+ NOT_IMPLEMENTED_call() ++ NOT_IMPLEMENTED_call(NOT_IMPLEMENTED_arg) ``` ## Ruff Output @@ -77,11 +77,11 @@ for (((((k, v))))) in d.items(): ```py # Only remove tuple brackets after `for` for k, v in NOT_IMPLEMENTED_call(): - NOT_IMPLEMENTED_call() + NOT_IMPLEMENTED_call(NOT_IMPLEMENTED_arg) # Don't touch tuple brackets after `in` for module in (core, _unicodefun): - if NOT_IMPLEMENTED_call(): + if NOT_IMPLEMENTED_call(NOT_IMPLEMENTED_arg): module._verify_python3_env = lambda x: True # Brackets remain for long for loop lines @@ -89,14 +89,14 @@ for ( why_would_anyone_choose_to_name_a_loop_variable_with_a_name_this_long, i_dont_know_but_we_should_still_check_the_behaviour_if_they_do, ) in NOT_IMPLEMENTED_call(): - NOT_IMPLEMENTED_call() + NOT_IMPLEMENTED_call(NOT_IMPLEMENTED_arg) for k, v in NOT_IMPLEMENTED_call(): - NOT_IMPLEMENTED_call() + NOT_IMPLEMENTED_call(NOT_IMPLEMENTED_arg) # Test deeply nested brackets for k, v in NOT_IMPLEMENTED_call(): - NOT_IMPLEMENTED_call() + NOT_IMPLEMENTED_call(NOT_IMPLEMENTED_arg) ``` ## Black Output diff --git a/crates/ruff_python_formatter/src/snapshots/ruff_python_formatter__tests__black_test__remove_newline_after_code_block_open_py.snap b/crates/ruff_python_formatter/src/snapshots/ruff_python_formatter__tests__black_test__remove_newline_after_code_block_open_py.snap index 642e62ce92..a3a57b200a 100644 --- a/crates/ruff_python_formatter/src/snapshots/ruff_python_formatter__tests__black_test__remove_newline_after_code_block_open_py.snap +++ b/crates/ruff_python_formatter/src/snapshots/ruff_python_formatter__tests__black_test__remove_newline_after_code_block_open_py.snap @@ -128,27 +128,27 @@ with open("/path/to/file.txt", mode="r") as read_file: def foo1(): - print("The newline above me should be deleted!") -+ NOT_IMPLEMENTED_call() ++ NOT_IMPLEMENTED_call(NOT_IMPLEMENTED_arg) def foo2(): - print("All the newlines above me should be deleted!") -+ NOT_IMPLEMENTED_call() ++ NOT_IMPLEMENTED_call(NOT_IMPLEMENTED_arg) def foo3(): - print("No newline above me!") -+ NOT_IMPLEMENTED_call() ++ NOT_IMPLEMENTED_call(NOT_IMPLEMENTED_arg) - print("There is a newline above me, and that's OK!") -+ NOT_IMPLEMENTED_call() ++ NOT_IMPLEMENTED_call(NOT_IMPLEMENTED_arg) def foo4(): # There is a comment here - print("The newline above me should not be deleted!") -+ NOT_IMPLEMENTED_call() ++ NOT_IMPLEMENTED_call(NOT_IMPLEMENTED_arg) -class Foo: @@ -159,34 +159,34 @@ with open("/path/to/file.txt", mode="r") as read_file: -for i in range(5): - print(f"{i}) The line above me should be removed!") -+for i in NOT_IMPLEMENTED_call(): -+ NOT_IMPLEMENTED_call() ++for i in NOT_IMPLEMENTED_call(NOT_IMPLEMENTED_arg): ++ NOT_IMPLEMENTED_call(NOT_IMPLEMENTED_arg) -for i in range(5): - print(f"{i}) The lines above me should be removed!") -+for i in NOT_IMPLEMENTED_call(): -+ NOT_IMPLEMENTED_call() ++for i in NOT_IMPLEMENTED_call(NOT_IMPLEMENTED_arg): ++ NOT_IMPLEMENTED_call(NOT_IMPLEMENTED_arg) -for i in range(5): - for j in range(7): - print(f"{i}) The lines above me should be removed!") -+for i in NOT_IMPLEMENTED_call(): -+ for j in NOT_IMPLEMENTED_call(): -+ NOT_IMPLEMENTED_call() ++for i in NOT_IMPLEMENTED_call(NOT_IMPLEMENTED_arg): ++ for j in NOT_IMPLEMENTED_call(NOT_IMPLEMENTED_arg): ++ NOT_IMPLEMENTED_call(NOT_IMPLEMENTED_arg) -if random.randint(0, 3) == 0: - print("The new line above me is about to be removed!") +if NOT_IMPLEMENTED_left < NOT_IMPLEMENTED_right: -+ NOT_IMPLEMENTED_call() ++ NOT_IMPLEMENTED_call(NOT_IMPLEMENTED_arg) -if random.randint(0, 3) == 0: - print("The new lines above me is about to be removed!") +if NOT_IMPLEMENTED_left < NOT_IMPLEMENTED_right: -+ NOT_IMPLEMENTED_call() ++ NOT_IMPLEMENTED_call(NOT_IMPLEMENTED_arg) -if random.randint(0, 3) == 0: @@ -194,23 +194,23 @@ with open("/path/to/file.txt", mode="r") as read_file: - print("Two lines above me are about to be removed!") +if NOT_IMPLEMENTED_left < NOT_IMPLEMENTED_right: + if NOT_IMPLEMENTED_left < NOT_IMPLEMENTED_right: -+ NOT_IMPLEMENTED_call() ++ NOT_IMPLEMENTED_call(NOT_IMPLEMENTED_arg) while True: - print("The newline above me should be deleted!") -+ NOT_IMPLEMENTED_call() ++ NOT_IMPLEMENTED_call(NOT_IMPLEMENTED_arg) while True: - print("The newlines above me should be deleted!") -+ NOT_IMPLEMENTED_call() ++ NOT_IMPLEMENTED_call(NOT_IMPLEMENTED_arg) while True: while False: - print("The newlines above me should be deleted!") -+ NOT_IMPLEMENTED_call() ++ NOT_IMPLEMENTED_call(NOT_IMPLEMENTED_arg) -with open("/path/to/file.txt", mode="w") as file: @@ -236,65 +236,65 @@ NOT_YET_IMPLEMENTED_StmtImport def foo1(): - NOT_IMPLEMENTED_call() + NOT_IMPLEMENTED_call(NOT_IMPLEMENTED_arg) def foo2(): - NOT_IMPLEMENTED_call() + NOT_IMPLEMENTED_call(NOT_IMPLEMENTED_arg) def foo3(): - NOT_IMPLEMENTED_call() + NOT_IMPLEMENTED_call(NOT_IMPLEMENTED_arg) - NOT_IMPLEMENTED_call() + NOT_IMPLEMENTED_call(NOT_IMPLEMENTED_arg) def foo4(): # There is a comment here - NOT_IMPLEMENTED_call() + NOT_IMPLEMENTED_call(NOT_IMPLEMENTED_arg) NOT_YET_IMPLEMENTED_StmtClassDef -for i in NOT_IMPLEMENTED_call(): - NOT_IMPLEMENTED_call() +for i in NOT_IMPLEMENTED_call(NOT_IMPLEMENTED_arg): + NOT_IMPLEMENTED_call(NOT_IMPLEMENTED_arg) -for i in NOT_IMPLEMENTED_call(): - NOT_IMPLEMENTED_call() +for i in NOT_IMPLEMENTED_call(NOT_IMPLEMENTED_arg): + NOT_IMPLEMENTED_call(NOT_IMPLEMENTED_arg) -for i in NOT_IMPLEMENTED_call(): - for j in NOT_IMPLEMENTED_call(): - NOT_IMPLEMENTED_call() +for i in NOT_IMPLEMENTED_call(NOT_IMPLEMENTED_arg): + for j in NOT_IMPLEMENTED_call(NOT_IMPLEMENTED_arg): + NOT_IMPLEMENTED_call(NOT_IMPLEMENTED_arg) if NOT_IMPLEMENTED_left < NOT_IMPLEMENTED_right: - NOT_IMPLEMENTED_call() + NOT_IMPLEMENTED_call(NOT_IMPLEMENTED_arg) if NOT_IMPLEMENTED_left < NOT_IMPLEMENTED_right: - NOT_IMPLEMENTED_call() + NOT_IMPLEMENTED_call(NOT_IMPLEMENTED_arg) if NOT_IMPLEMENTED_left < NOT_IMPLEMENTED_right: if NOT_IMPLEMENTED_left < NOT_IMPLEMENTED_right: - NOT_IMPLEMENTED_call() + NOT_IMPLEMENTED_call(NOT_IMPLEMENTED_arg) while True: - NOT_IMPLEMENTED_call() + NOT_IMPLEMENTED_call(NOT_IMPLEMENTED_arg) while True: - NOT_IMPLEMENTED_call() + NOT_IMPLEMENTED_call(NOT_IMPLEMENTED_arg) while True: while False: - NOT_IMPLEMENTED_call() + NOT_IMPLEMENTED_call(NOT_IMPLEMENTED_arg) NOT_YET_IMPLEMENTED_StmtWith diff --git a/crates/ruff_python_formatter/src/snapshots/ruff_python_formatter__tests__black_test__skip_magic_trailing_comma_py.snap b/crates/ruff_python_formatter/src/snapshots/ruff_python_formatter__tests__black_test__skip_magic_trailing_comma_py.snap index 5a86ffbc95..227fddc38c 100644 --- a/crates/ruff_python_formatter/src/snapshots/ruff_python_formatter__tests__black_test__skip_magic_trailing_comma_py.snap +++ b/crates/ruff_python_formatter/src/snapshots/ruff_python_formatter__tests__black_test__skip_magic_trailing_comma_py.snap @@ -91,10 +91,10 @@ func( # Trailing commas in multiple chained non-nested parens. -zero(one).two(three).four(five) -+NOT_IMPLEMENTED_call() ++NOT_IMPLEMENTED_call(NOT_IMPLEMENTED_arg) -func1(arg1).func2(arg2).func3(arg3).func4(arg4).func5(arg5) -+NOT_IMPLEMENTED_call() ++NOT_IMPLEMENTED_call(NOT_IMPLEMENTED_arg) -(a, b, c, d) = func1(arg1) and func2(arg2) +( @@ -102,10 +102,10 @@ func( + b, + c, + d, -+) = NOT_IMPLEMENTED_call() and NOT_IMPLEMENTED_call() ++) = NOT_IMPLEMENTED_call(NOT_IMPLEMENTED_arg) and NOT_IMPLEMENTED_call(NOT_IMPLEMENTED_arg) -func(argument1, (one, two), argument4, argument5, argument6) -+NOT_IMPLEMENTED_call() ++NOT_IMPLEMENTED_call(NOT_IMPLEMENTED_arg) ``` ## Ruff Output @@ -134,18 +134,18 @@ set_of_types = {tuple[(int,)]} small_tuple = (1,) # Trailing commas in multiple chained non-nested parens. -NOT_IMPLEMENTED_call() +NOT_IMPLEMENTED_call(NOT_IMPLEMENTED_arg) -NOT_IMPLEMENTED_call() +NOT_IMPLEMENTED_call(NOT_IMPLEMENTED_arg) ( a, b, c, d, -) = NOT_IMPLEMENTED_call() and NOT_IMPLEMENTED_call() +) = NOT_IMPLEMENTED_call(NOT_IMPLEMENTED_arg) and NOT_IMPLEMENTED_call(NOT_IMPLEMENTED_arg) -NOT_IMPLEMENTED_call() +NOT_IMPLEMENTED_call(NOT_IMPLEMENTED_arg) ``` ## Black Output diff --git a/crates/ruff_python_formatter/src/snapshots/ruff_python_formatter__tests__black_test__slices_py.snap b/crates/ruff_python_formatter/src/snapshots/ruff_python_formatter__tests__black_test__slices_py.snap index f13a98ef72..ae15220407 100644 --- a/crates/ruff_python_formatter/src/snapshots/ruff_python_formatter__tests__black_test__slices_py.snap +++ b/crates/ruff_python_formatter/src/snapshots/ruff_python_formatter__tests__black_test__slices_py.snap @@ -76,7 +76,7 @@ x[ ```diff --- Black +++ Ruff -@@ -4,30 +4,30 @@ +@@ -4,30 +4,35 @@ slice[d::d] slice[0] slice[-1] @@ -113,11 +113,16 @@ x[ ham[lower:upper], ham[lower:upper:], ham[lower::step] # ham[lower+offset : upper+offset] -ham[: upper_fn(x) : step_fn(x)], ham[:: step_fn(x)] -+ham[ : NOT_IMPLEMENTED_call() : NOT_IMPLEMENTED_call()], ham[ :: NOT_IMPLEMENTED_call()] ++( ++ ham[ ++ : NOT_IMPLEMENTED_call(NOT_IMPLEMENTED_arg) : NOT_IMPLEMENTED_call(NOT_IMPLEMENTED_arg) ++ ], ++ ham[ :: NOT_IMPLEMENTED_call(NOT_IMPLEMENTED_arg)], ++) ham[lower + offset : upper + offset] slice[::, ::] -@@ -50,10 +50,14 @@ +@@ -50,10 +55,14 @@ slice[ # A 1 @@ -169,7 +174,12 @@ async def f(): ham[1:9], ham[1:9:3], ham[:9:3], ham[1::3], ham[1:9:] ham[lower:upper], ham[lower:upper:], ham[lower::step] # ham[lower+offset : upper+offset] -ham[ : NOT_IMPLEMENTED_call() : NOT_IMPLEMENTED_call()], ham[ :: NOT_IMPLEMENTED_call()] +( + ham[ + : NOT_IMPLEMENTED_call(NOT_IMPLEMENTED_arg) : NOT_IMPLEMENTED_call(NOT_IMPLEMENTED_arg) + ], + ham[ :: NOT_IMPLEMENTED_call(NOT_IMPLEMENTED_arg)], +) ham[lower + offset : upper + offset] slice[::, ::] diff --git a/crates/ruff_python_formatter/src/snapshots/ruff_python_formatter__tests__black_test__trailing_comma_optional_parens1_py.snap b/crates/ruff_python_formatter/src/snapshots/ruff_python_formatter__tests__black_test__trailing_comma_optional_parens1_py.snap index 9b6fe74f54..6fb26dec18 100644 --- a/crates/ruff_python_formatter/src/snapshots/ruff_python_formatter__tests__black_test__trailing_comma_optional_parens1_py.snap +++ b/crates/ruff_python_formatter/src/snapshots/ruff_python_formatter__tests__black_test__trailing_comma_optional_parens1_py.snap @@ -38,12 +38,15 @@ class A: ```diff --- Black +++ Ruff -@@ -1,34 +1,12 @@ +@@ -1,34 +1,15 @@ -if e1234123412341234.winerror not in ( - _winapi.ERROR_SEM_TIMEOUT, - _winapi.ERROR_PIPE_BUSY, -) or _check_timeout(t): -+if NOT_IMPLEMENTED_left < NOT_IMPLEMENTED_right or NOT_IMPLEMENTED_call(): ++if ( ++ NOT_IMPLEMENTED_left < NOT_IMPLEMENTED_right ++ or NOT_IMPLEMENTED_call(NOT_IMPLEMENTED_arg) ++): pass if x: @@ -55,7 +58,7 @@ class A: - ) - + 1 - ) -+ new_id = NOT_IMPLEMENTED_call() + 1 ++ new_id = NOT_IMPLEMENTED_call(NOT_IMPLEMENTED_arg) + 1 -class X: @@ -82,12 +85,15 @@ class A: ## Ruff Output ```py -if NOT_IMPLEMENTED_left < NOT_IMPLEMENTED_right or NOT_IMPLEMENTED_call(): +if ( + NOT_IMPLEMENTED_left < NOT_IMPLEMENTED_right + or NOT_IMPLEMENTED_call(NOT_IMPLEMENTED_arg) +): pass if x: if y: - new_id = NOT_IMPLEMENTED_call() + 1 + new_id = NOT_IMPLEMENTED_call(NOT_IMPLEMENTED_arg) + 1 NOT_YET_IMPLEMENTED_StmtClassDef diff --git a/crates/ruff_python_formatter/src/snapshots/ruff_python_formatter__tests__black_test__trailing_comma_optional_parens3_py.snap b/crates/ruff_python_formatter/src/snapshots/ruff_python_formatter__tests__black_test__trailing_comma_optional_parens3_py.snap index ea49d311ae..4108c2434f 100644 --- a/crates/ruff_python_formatter/src/snapshots/ruff_python_formatter__tests__black_test__trailing_comma_optional_parens3_py.snap +++ b/crates/ruff_python_formatter/src/snapshots/ruff_python_formatter__tests__black_test__trailing_comma_optional_parens3_py.snap @@ -30,7 +30,7 @@ if True: - + "qweasdzxcqweasdzxcqweasdzxcqweasdzxcqweasdzxcqweasdzxcqweasdzxcqweasdzxcqwegqweasdzxcqweasdzxc.", - "qweasdzxcqweasdzxcqweasdzxcqweasdzxcqweasdzxcqweasdzxcqweasdzxcqweasdzxcqweasdzxcqwe", - ) % {"reported_username": reported_username, "report_reason": report_reason} -+ return NOT_IMPLEMENTED_call() % { ++ return NOT_IMPLEMENTED_call(NOT_IMPLEMENTED_arg) % { + "NOT_YET_IMPLEMENTED_STRING": reported_username, + "NOT_YET_IMPLEMENTED_STRING": report_reason, + } @@ -42,7 +42,7 @@ if True: if True: if True: if True: - return NOT_IMPLEMENTED_call() % { + return NOT_IMPLEMENTED_call(NOT_IMPLEMENTED_arg) % { "NOT_YET_IMPLEMENTED_STRING": reported_username, "NOT_YET_IMPLEMENTED_STRING": report_reason, } diff --git a/crates/ruff_python_formatter/src/snapshots/ruff_python_formatter__tests__black_test__trailing_commas_in_leading_parts_py.snap b/crates/ruff_python_formatter/src/snapshots/ruff_python_formatter__tests__black_test__trailing_commas_in_leading_parts_py.snap index e2b670003f..3ef4708db1 100644 --- a/crates/ruff_python_formatter/src/snapshots/ruff_python_formatter__tests__black_test__trailing_commas_in_leading_parts_py.snap +++ b/crates/ruff_python_formatter/src/snapshots/ruff_python_formatter__tests__black_test__trailing_commas_in_leading_parts_py.snap @@ -54,18 +54,18 @@ assert xxxxxxxxx.xxxxxxxxx.xxxxxxxxx( -).four( - five, -) -+NOT_IMPLEMENTED_call() ++NOT_IMPLEMENTED_call(NOT_IMPLEMENTED_arg) -func1(arg1).func2( - arg2, -).func3(arg3).func4( - arg4, -).func5(arg5) -+NOT_IMPLEMENTED_call() ++NOT_IMPLEMENTED_call(NOT_IMPLEMENTED_arg) # Inner one-element tuple shouldn't explode -func1(arg1).func2(arg1, (one_tuple,)).func3(arg3) -+NOT_IMPLEMENTED_call() ++NOT_IMPLEMENTED_call(NOT_IMPLEMENTED_arg) ( a, @@ -75,7 +75,7 @@ assert xxxxxxxxx.xxxxxxxxx.xxxxxxxxx( -) = func1( - arg1 -) and func2(arg2) -+) = NOT_IMPLEMENTED_call() and NOT_IMPLEMENTED_call() ++) = NOT_IMPLEMENTED_call(NOT_IMPLEMENTED_arg) and NOT_IMPLEMENTED_call(NOT_IMPLEMENTED_arg) # Example from https://github.com/psf/black/issues/3229 @@ -86,7 +86,7 @@ assert xxxxxxxxx.xxxxxxxxx.xxxxxxxxx( - }, - api_key=api_key, - )["extensions"]["sdk"]["token"] -+ return NOT_IMPLEMENTED_call()["NOT_YET_IMPLEMENTED_STRING"][ ++ return NOT_IMPLEMENTED_call(NOT_IMPLEMENTED_arg)["NOT_YET_IMPLEMENTED_STRING"][ + "NOT_YET_IMPLEMENTED_STRING" + ][ + "NOT_YET_IMPLEMENTED_STRING" @@ -113,24 +113,24 @@ assert xxxxxxxxx.xxxxxxxxx.xxxxxxxxx( ## Ruff Output ```py -NOT_IMPLEMENTED_call() +NOT_IMPLEMENTED_call(NOT_IMPLEMENTED_arg) -NOT_IMPLEMENTED_call() +NOT_IMPLEMENTED_call(NOT_IMPLEMENTED_arg) # Inner one-element tuple shouldn't explode -NOT_IMPLEMENTED_call() +NOT_IMPLEMENTED_call(NOT_IMPLEMENTED_arg) ( a, b, c, d, -) = NOT_IMPLEMENTED_call() and NOT_IMPLEMENTED_call() +) = NOT_IMPLEMENTED_call(NOT_IMPLEMENTED_arg) and NOT_IMPLEMENTED_call(NOT_IMPLEMENTED_arg) # Example from https://github.com/psf/black/issues/3229 def refresh_token(self, device_family, refresh_token, api_key): - return NOT_IMPLEMENTED_call()["NOT_YET_IMPLEMENTED_STRING"][ + return NOT_IMPLEMENTED_call(NOT_IMPLEMENTED_arg)["NOT_YET_IMPLEMENTED_STRING"][ "NOT_YET_IMPLEMENTED_STRING" ][ "NOT_YET_IMPLEMENTED_STRING" diff --git a/crates/ruff_python_formatter/src/snapshots/ruff_python_formatter__tests__black_test__tupleassign_py.snap b/crates/ruff_python_formatter/src/snapshots/ruff_python_formatter__tests__black_test__tupleassign_py.snap index e335debb8b..d67608accf 100644 --- a/crates/ruff_python_formatter/src/snapshots/ruff_python_formatter__tests__black_test__tupleassign_py.snap +++ b/crates/ruff_python_formatter/src/snapshots/ruff_python_formatter__tests__black_test__tupleassign_py.snap @@ -29,7 +29,7 @@ this_will_be_wrapped_in_parens, = struct.unpack(b"12345678901234567890") # This is as well. -(this_will_be_wrapped_in_parens,) = struct.unpack(b"12345678901234567890") -+(this_will_be_wrapped_in_parens,) = NOT_IMPLEMENTED_call() ++(this_will_be_wrapped_in_parens,) = NOT_IMPLEMENTED_call(NOT_IMPLEMENTED_arg) -(a,) = call() +(a,) = NOT_IMPLEMENTED_call() @@ -47,7 +47,7 @@ this_will_be_wrapped_in_parens, = struct.unpack(b"12345678901234567890") ) = 1, 2, 3 # This is as well. -(this_will_be_wrapped_in_parens,) = NOT_IMPLEMENTED_call() +(this_will_be_wrapped_in_parens,) = NOT_IMPLEMENTED_call(NOT_IMPLEMENTED_arg) (a,) = NOT_IMPLEMENTED_call() ``` diff --git a/crates/ruff_python_formatter/src/snapshots/ruff_python_formatter__tests__ruff_test__expression__binary_py.snap b/crates/ruff_python_formatter/src/snapshots/ruff_python_formatter__tests__ruff_test__expression__binary_py.snap index a610419d8b..82106ab6d3 100644 --- a/crates/ruff_python_formatter/src/snapshots/ruff_python_formatter__tests__ruff_test__expression__binary_py.snap +++ b/crates/ruff_python_formatter/src/snapshots/ruff_python_formatter__tests__ruff_test__expression__binary_py.snap @@ -214,7 +214,7 @@ if ( # Black breaks the right side first for the following expressions: -aaaaaaaaaaaaaa + NOT_IMPLEMENTED_call() +aaaaaaaaaaaaaa + NOT_IMPLEMENTED_call(NOT_IMPLEMENTED_arg) aaaaaaaaaaaaaa + [ bbbbbbbbbbbbbbbbbbbbbb, ccccccccccccccccccccc, diff --git a/crates/ruff_python_formatter/src/snapshots/ruff_python_formatter__tests__ruff_test__statement__while_py.snap b/crates/ruff_python_formatter/src/snapshots/ruff_python_formatter__tests__ruff_test__statement__while_py.snap index 32b93d696d..785c69cb8e 100644 --- a/crates/ruff_python_formatter/src/snapshots/ruff_python_formatter__tests__ruff_test__statement__while_py.snap +++ b/crates/ruff_python_formatter/src/snapshots/ruff_python_formatter__tests__ruff_test__statement__while_py.snap @@ -61,16 +61,16 @@ while ( else: ... -while NOT_IMPLEMENTED_call() and anotherCondition or aThirdCondition: # comment - NOT_IMPLEMENTED_call() +while NOT_IMPLEMENTED_call(NOT_IMPLEMENTED_arg) and anotherCondition or aThirdCondition: # comment + NOT_IMPLEMENTED_call(NOT_IMPLEMENTED_arg) while ( - NOT_IMPLEMENTED_call() # trailing some condition + NOT_IMPLEMENTED_call(NOT_IMPLEMENTED_arg) # trailing some condition and anotherCondition or aThirdCondition # trailing third condition ): # comment - NOT_IMPLEMENTED_call() + NOT_IMPLEMENTED_call(NOT_IMPLEMENTED_arg) ```