Allow standalone comments to close code blocks

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

diff --git a/tests/function.py b/tests/function.py
index 29de4086a7b8cf973a35afab2e7528cb3fdbe118..08f9414a7b5041452573b7c6bc6e4c2f21e3cce3 100644 (file)
--- a/tests/function.py
+++ b/tests/function.py
@@ -14,8 +14,9 @@ def func_no_args():
   for i in range(10):
     print(i)
     continue
   for i in range(10):
     print(i)
     continue

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

   return None
   return None

-async def coroutine(arg):
+async def coroutine(arg, exec=False):

  "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)
  "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)


@@ -30,20 +31,28 @@ def function_signature_stress_test(number:int,no_annotation=None,text:str="defau
 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)))
  assert task._cancel_stack[:len(old_stack)] == old_stack
 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)))
  assert task._cancel_stack[:len(old_stack)] == old_stack

+def spaces_types(a: int = 1, b: tuple = (), c: list = [], d: dict = {}, e: bool = True, f: int = -1, g: int = 1 if False else 2, h: str = "", i: str = r''): ...

 def spaces2(result= _core.Value(None)):
 def spaces2(result= _core.Value(None)):

- ...
+ assert fut is self._read_fut, (fut, self._read_fut)
+    # EMPTY LINE WITH WHITESPACE (this comment will be removed)

 def example(session):
     result = session.query(models.Customer.id).filter(
         models.Customer.account_id == account_id,
         models.Customer.email == email_address,
     ).order_by(
 def example(session):
     result = session.query(models.Customer.id).filter(
         models.Customer.account_id == account_id,
         models.Customer.email == email_address,
     ).order_by(

-        models.Customer.id.asc(),
+        models.Customer.id.asc()

     ).all()
 def long_lines():
     if True:
         typedargslist.extend(
             gen_annotated_params(ast_args.kwonlyargs, ast_args.kw_defaults, parameters, implicit_default=True)
         )
     ).all()
 def long_lines():
     if True:
         typedargslist.extend(
             gen_annotated_params(ast_args.kwonlyargs, ast_args.kw_defaults, parameters, implicit_default=True)
         )

+        typedargslist.extend(
+            gen_annotated_params(
+                ast_args.kwonlyargs, ast_args.kw_defaults, parameters, implicit_default=True,
+                # trailing standalone comment
+            )
+        )

     _type_comment_re = re.compile(
         r"""
         ^
     _type_comment_re = re.compile(
         r"""
         ^


@@ -65,6 +74,13 @@ def long_lines():
         $
         """, re.MULTILINE | re.VERBOSE
     )
         $
         """, re.MULTILINE | re.VERBOSE
     )

+def trailing_comma():
+    mapping = {
+    A: 0.25 * (10.0 / 12),
+    B: 0.1 * (10.0 / 12),
+    C: 0.1 * (10.0 / 12),
+    D: 0.1 * (10.0 / 12),
+}

 
 # output
 
 
 # output
 


@@ -77,7 +93,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"

 
 
 def func_no_args():
 
 
 def func_no_args():


@@ -93,13 +109,14 @@ def func_no_args():
         print(i)
         continue
 
         print(i)
         continue
 

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

     return None
 
 
     return None
 
 

-async def coroutine(arg):
+async def coroutine(arg, exec=False):

     "Single-line docstring. Multiline is harder to reformat."
     async with some_connection() as conn:
     "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 conn.do_what_i_mean("SELECT bobby, tables FROM xkcd", timeout=2)

     await asyncio.sleep(1)
 
 
     await asyncio.sleep(1)
 
 


@@ -116,20 +133,34 @@ def function_signature_stress_test(
     return text[number:-1]
 
 
     return text[number:-1]
 
 

-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)))
     assert task._cancel_stack[:len(old_stack)] == old_stack
 
 
     offset = attr.ib(default=attr.Factory(lambda: _r.uniform(10000, 200000)))
     assert task._cancel_stack[:len(old_stack)] == old_stack
 
 

-def spaces2(result=_core.Value(None)):
+def spaces_types(
+    a: int = 1,
+    b: tuple = (),
+    c: list = [],
+    d: dict = {},
+    e: bool = True,
+    f: int = -1,
+    g: int = 1 if False else 2,
+    h: str = "",
+    i: str = r"",
+):

     ...
 
 
     ...
 
 

+def spaces2(result=_core.Value(None)):
+    assert fut is self._read_fut, (fut, self._read_fut)
+
+

 def example(session):
     result = session.query(models.Customer.id).filter(
         models.Customer.account_id == account_id, models.Customer.email == email_address
     ).order_by(
 def example(session):
     result = session.query(models.Customer.id).filter(
         models.Customer.account_id == account_id, models.Customer.email == email_address
     ).order_by(

-        models.Customer.id.asc(),
+        models.Customer.id.asc()

     ).all()
 
 
     ).all()
 
 


@@ -143,6 +174,15 @@ def long_lines():
                 implicit_default=True,
             )
         )
                 implicit_default=True,
             )
         )

+        typedargslist.extend(
+            gen_annotated_params(
+                ast_args.kwonlyargs,
+                ast_args.kw_defaults,
+                parameters,
+                implicit_default=True,
+                # trailing standalone comment
+            )
+        )

     _type_comment_re = re.compile(
         r"""
         ^
     _type_comment_re = re.compile(
         r"""
         ^


@@ -165,3 +205,12 @@ def long_lines():
         """,
         re.MULTILINE | re.VERBOSE,
     )
         """,
         re.MULTILINE | re.VERBOSE,
     )

+
+
+def trailing_comma():
+    mapping = {
+        A: 0.25 * (10.0 / 12),
+        B: 0.1 * (10.0 / 12),
+        C: 0.1 * (10.0 / 12),
+        D: 0.1 * (10.0 / 12),
+    }