[Python] Ensure type comments are exited at newline

sublimehq · Jul 22, 2020 · 97ae638 · 97ae638
1 parent e3b57a9
commit 97ae638
Show file tree

Hide file tree

Showing 2 changed files with 26 additions and 0 deletions.
diff --git a/Python/Python.sublime-syntax b/Python/Python.sublime-syntax
@@ -452,6 +452,8 @@ contexts:
       scope: punctuation.section.brackets.begin.python
       set:
         - meta_content_scope: comment.line.type-hint.python
+        - match: \n
+          pop: true
         - match: \[
           scope: invalid.illegal.python
         - match: '[a-zA-Z_-][a-zA-Z_0-9-]+'
@@ -465,6 +467,8 @@ contexts:
           set:
             # Don't allow a second block.
             - meta_content_scope: comment.line.type-hint.python
+            - match: \n
+              pop: true
             - match: '(?=#)'
               set: comments-basic
             - match: \S
@@ -474,6 +478,8 @@ contexts:
 
   type-comment:
     - meta_content_scope: comment.line.type-hint.python
+    - match: \n
+      pop: true
     - match: '(?=#)'
       set: comments-basic
     # Don't use expressions here, only a few types are reasonable
@@ -489,6 +495,8 @@ contexts:
         1: meta.item-access.python punctuation.section.brackets.begin.python
       push:
         - meta_content_scope: meta.item-access.arguments.python
+        - match: (?=\n)
+          pop: true
         - match: \]
           scope: meta.item-access.python punctuation.section.brackets.end.python
           pop: true
@@ -500,6 +508,8 @@ contexts:
       scope: punctuation.section.parens.begin.python
       push:
         - meta_content_scope: meta.function.parameters.python
+        - match: (?=\n)
+          pop: true
         - match: \)
           scope: punctuation.section.parens.end.python
           pop: true

diff --git a/Python/syntax_test_python.py b/Python/syntax_test_python.py
@@ -1560,6 +1560,22 @@ def function(a, b, *c, **d):
 #                                                         ^^^^^^^^^^^^^^^^^^ comment.line.number-sign - comment.line.type-hint
 #                                                         ^ punctuation.definition.comment
 
+class TypeCommentTest:
+    member = []  # type: List[dict]
+
+    def __del__(self) -> None:
+#                        ^^^^ constant.language
+#                            ^ punctuation.section
+        pass
+#       ^^^^ keyword.control
+
+class TypeCommentTest2:
+    member = []  # type: List[dict]
+
+    def __del__(self) -> None:
+        pass
+#       ^^^^ keyword.control
+
 
 ##################
 # Assignment Expressions