Don't explode trailers that fit in a single line

[etc/vim.git] / tests / fmtonoff.py

diff --git a/tests/fmtonoff.py b/tests/fmtonoff.py
index 3e3db11b5fa3fb25ab1b794f07c33b07ec7a4734..0ff6672c86bb6aacf1b591fb607b81a9f664b8a1 100644 (file)
--- a/tests/fmtonoff.py
+++ b/tests/fmtonoff.py
@@ -15,10 +15,10 @@ def func_no_args():
   for i in range(10):
     print(i)
     continue
   for i in range(10):
     print(i)
     continue

-  exec("new-style exec", {}, {})
+  exec('new-style exec', {}, {})

   return None
 async def coroutine(arg, exec=False):
   return None
 async def coroutine(arg, exec=False):

- "Single-line docstring. Multiline is harder to reformat."
+ 'Single-line docstring. Multiline is harder to reformat.'

  async with some_connection() as conn:
      await conn.do_what_i_mean('SELECT bobby, tables FROM xkcd', timeout=2)
  await asyncio.sleep(1)
  async with some_connection() as conn:
      await conn.do_what_i_mean('SELECT bobby, tables FROM xkcd', timeout=2)
  await asyncio.sleep(1)


@@ -27,7 +27,7 @@ async def coroutine(arg, exec=False):
 with_args=True,
 many_args=[1,2,3]
 )
 with_args=True,
 many_args=[1,2,3]
 )

-def function_signature_stress_test(number:int,no_annotation=None,text:str="default",* ,debug:bool=False,**kwargs) -> str:
+def function_signature_stress_test(number:int,no_annotation=None,text:str='default',* ,debug:bool=False,**kwargs) -> str:

  return text[number:-1]
 # fmt: on
 def spaces(a=1, b=(), c=[], d={}, e=True, f=-1, g=1 if False else 2, h="", i=r''):
  return text[number:-1]
 # fmt: on
 def spaces(a=1, b=(), c=[], d={}, e=True, f=-1, g=1 if False else 2, h="", i=r''):


@@ -71,6 +71,18 @@ def long_lines():
         $
         """, re.MULTILINE | re.VERBOSE
     )
         $
         """, re.MULTILINE | re.VERBOSE
     )

+def single_literal_yapf_disable():
+    """Black does not support this."""
+    BAZ = {
+        (1, 2, 3, 4),
+        (5, 6, 7, 8),
+        (9, 10, 11, 12),
+    }  # yapf: disable
+# fmt: off
+# No formatting to the end of the file
+l=[1,2,3]
+d={'a':1,
+   'b':2}

 
 # output
 
 
 # output
 


@@ -83,7 +95,7 @@ from third_party import X, Y, Z
 
 from library import some_connection, some_decorator
 
 
 from library import some_connection, some_decorator
 

-f'trigger 3.6 mode'
+f"trigger 3.6 mode"

 # fmt: off
 def func_no_args():
   a; b; c
 # fmt: off
 def func_no_args():
   a; b; c


@@ -92,10 +104,10 @@ def func_no_args():
   for i in range(10):
     print(i)
     continue
   for i in range(10):
     print(i)
     continue

-  exec("new-style exec", {}, {})
+  exec('new-style exec', {}, {})

   return None
 async def coroutine(arg, exec=False):
   return None
 async def coroutine(arg, exec=False):

- "Single-line docstring. Multiline is harder to reformat."
+ 'Single-line docstring. Multiline is harder to reformat.'

  async with some_connection() as conn:
      await conn.do_what_i_mean('SELECT bobby, tables FROM xkcd', timeout=2)
  await asyncio.sleep(1)
  async with some_connection() as conn:
      await conn.do_what_i_mean('SELECT bobby, tables FROM xkcd', timeout=2)
  await asyncio.sleep(1)


@@ -104,14 +116,12 @@ async def coroutine(arg, exec=False):
 with_args=True,
 many_args=[1,2,3]
 )
 with_args=True,
 many_args=[1,2,3]
 )

-def function_signature_stress_test(number:int,no_annotation=None,text:str="default",* ,debug:bool=False,**kwargs) -> str:
+def function_signature_stress_test(number:int,no_annotation=None,text:str='default',* ,debug:bool=False,**kwargs) -> str:

  return text[number:-1]
 # fmt: on
  return text[number:-1]
 # fmt: on

-
-
-def spaces(a=1, b=(), c=[], d={}, e=True, f=-1, g=1 if False else 2, h="", i=r''):
+def spaces(a=1, b=(), c=[], d={}, e=True, f=-1, g=1 if False else 2, h="", i=r""):

     offset = attr.ib(default=attr.Factory(lambda: _r.uniform(10000, 200000)))
     offset = attr.ib(default=attr.Factory(lambda: _r.uniform(10000, 200000)))

-    assert task._cancel_stack[:len(old_stack)] == old_stack
+    assert task._cancel_stack[: len(old_stack)] == old_stack

 
 
 def spaces_types(
 
 
 def spaces_types(


@@ -123,7 +133,7 @@ def spaces_types(
     f: int = -1,
     g: int = 1 if False else 2,
     h: str = "",
     f: int = -1,
     g: int = 1 if False else 2,
     h: str = "",

-    i: str = r'',
+    i: str = r"",

 ):
     ...
 
 ):
     ...
 


@@ -175,3 +185,15 @@ def long_lines():
         """,
         re.MULTILINE | re.VERBOSE,
     )
         """,
         re.MULTILINE | re.VERBOSE,
     )

+
+
+def single_literal_yapf_disable():
+    """Black does not support this."""
+    BAZ = {(1, 2, 3, 4), (5, 6, 7, 8), (9, 10, 11, 12)}  # yapf: disable
+
+
+# fmt: off
+# No formatting to the end of the file
+l=[1,2,3]
+d={'a':1,
+   'b':2}