[#154] Handle comments between decorators properly (#166)

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

diff --git a/tests/comments2.py b/tests/comments2.py
index da4f7a16a06db100275cd6c15608db613464c049..73fff32a3b933d6629aee64650099177c35062ac 100644 (file)
--- a/tests/comments2.py
+++ b/tests/comments2.py
@@ -1,4 +1,5 @@
 # Please keep __all__ alphabetized within each category.
 # Please keep __all__ alphabetized within each category.

+

 __all__ = [
     # Super-special typing primitives.
     'Any',
 __all__ = [
     # Super-special typing primitives.
     'Any',


@@ -22,6 +23,15 @@ __all__ = [
     'Generator',
 ]
 
     'Generator',
 ]
 

+if 'PYTHON' in os.environ:
+    add_compiler(compiler_from_env())
+else:
+    # for compiler in compilers.values():
+         # add_compiler(compiler)
+    add_compiler(compilers[(7.0, 32)])
+    # add_compiler(compilers[(7.1, 64)])
+
+# Comment before function.

 def inline_comments_in_brackets_ruin_everything():
     if typedargslist:
         parameters.children = [
 def inline_comments_in_brackets_ruin_everything():
     if typedargslist:
         parameters.children = [


@@ -42,11 +52,14 @@ def inline_comments_in_brackets_ruin_everything():
             # transport hasn't been notified yet?
             and self._proc.poll() is None):
         pass
             # transport hasn't been notified yet?
             and self._proc.poll() is None):
         pass

+    # no newline before or after

     short = [
      # one
      1,
      # two
      2]
     short = [
      # one
      1,
      # two
      2]

+
+    # no newline after

     call(arg1, arg2, """
 short
 """, arg3=True)
     call(arg1, arg2, """
 short
 """, arg3=True)


@@ -85,6 +98,14 @@ short
         # right
         if element is not None
     ]
         # right
         if element is not None
     ]

+    while True:
+        if False:
+            continue
+
+            # and round and round we go
+        # and round and round we go
+
+   # let's return

     return Node(
         syms.simple_stmt,
         [
     return Node(
         syms.simple_stmt,
         [


@@ -93,6 +114,12 @@ short
         ],
     )
 
         ],
     )
 

+
+#######################
+### SECTION COMMENT ###
+#######################
+
+

 instruction()
 
 # END COMMENTS
 instruction()
 
 # END COMMENTS


@@ -103,27 +130,38 @@ instruction()
 
 
 # Please keep __all__ alphabetized within each category.
 
 
 # Please keep __all__ alphabetized within each category.

+

 __all__ = [
     # Super-special typing primitives.
 __all__ = [
     # Super-special typing primitives.

-    'Any',
-    'Callable',
-    'ClassVar',
+    "Any",
+    "Callable",
+    "ClassVar",

     # ABCs (from collections.abc).
     # ABCs (from collections.abc).

-    'AbstractSet',  # collections.abc.Set.
-    'ByteString',
-    'Container',
+    "AbstractSet",  # collections.abc.Set.
+    "ByteString",
+    "Container",

     # Concrete collection types.
     # Concrete collection types.

-    'Counter',
-    'Deque',
-    'Dict',
-    'DefaultDict',
-    'List',
-    'Set',
-    'FrozenSet',
-    'NamedTuple',  # Not really a type.
-    'Generator',
+    "Counter",
+    "Deque",
+    "Dict",
+    "DefaultDict",
+    "List",
+    "Set",
+    "FrozenSet",
+    "NamedTuple",  # Not really a type.
+    "Generator",

 ]
 
 ]
 

+if "PYTHON" in os.environ:
+    add_compiler(compiler_from_env())
+else:
+    # for compiler in compilers.values():
+    # add_compiler(compiler)
+    add_compiler(compilers[(7.0, 32)])
+    # add_compiler(compilers[(7.1, 64)])
+
+# Comment before function.
+

 
 def inline_comments_in_brackets_ruin_everything():
     if typedargslist:
 
 def inline_comments_in_brackets_ruin_everything():
     if typedargslist:


@@ -145,12 +183,15 @@ def inline_comments_in_brackets_ruin_everything():
         and self._proc.poll() is None
     ):
         pass
         and self._proc.poll() is None
     ):
         pass

+    # no newline before or after

     short = [
         # one
         1,
         # two
         2,
     ]
     short = [
         # one
         1,
         # two
         2,
     ]

+
+    # no newline after

     call(
         arg1,
         arg2,
     call(
         arg1,
         arg2,


@@ -161,6 +202,7 @@ short
     )
 
     ############################################################################
     )
 
     ############################################################################

+

     call2(
         # short
         arg1,
     call2(
         # short
         arg1,


@@ -186,18 +228,32 @@ short
     ]
     lcomp3 = [
         # This one is actually too long to fit in a single line.
     ]
     lcomp3 = [
         # This one is actually too long to fit in a single line.

-        element.split('\n', 1)[0]
+        element.split("\n", 1)[0]

         # yup
         for element in collection.select_elements()
         # right
         if element is not None
     ]
         # yup
         for element in collection.select_elements()
         # right
         if element is not None
     ]

+    while True:
+        if False:
+            continue
+
+            # and round and round we go
+        # and round and round we go
+
+    # let's return

     return Node(
         syms.simple_stmt,
     return Node(
         syms.simple_stmt,

-        [Node(statement, result), Leaf(token.NEWLINE, '\n')],  # FIXME: \r\n?
+        [Node(statement, result), Leaf(token.NEWLINE, "\n")],  # FIXME: \r\n?

     )
 
 
     )
 
 

+#######################
+### SECTION COMMENT ###
+#######################
+
+

 instruction()
 instruction()

+

 # END COMMENTS
 # MORE END COMMENTS
 # END COMMENTS
 # MORE END COMMENTS