Highlight '#type:' with 'comment.typehint.directive.notation.python'

Yury Selivanov · Yury Selivanov · commit bb40a06f4ef6 · 2015-10-20T21:03:17.000-04:00
diff --git a/grammars/MagicPython.cson b/grammars/MagicPython.cson
@@ -67,7 +67,7 @@ repository:
         end: "(?:$|(?=\\#))"
         beginCaptures:
           "1":
-            name: "keyword.comment.typehint.notation.python"
+            name: "comment.typehint.directive.notation.python"
         patterns: [
           {
             name: "comment.typehint.ignore.notation.python"
@@ -83,7 +83,8 @@ repository:
               (?x)
                 (?<!\\.)\\b(
                   bool | bytes | float | int | object | str
-                  | List | Dict | Iterable | Sequence
+                  | List | Dict | Iterable | Sequence | Set
+                  | FrozenSet | Callable | Union | Tuple
                   | Any | None
                 )\\b
               
diff --git a/grammars/MagicPython.syntax.yaml b/grammars/MagicPython.syntax.yaml
@@ -96,7 +96,7 @@ repository:
 
         end: (?:$|(?=\#))
         beginCaptures:
-          '1': {name: keyword.comment.typehint.notation.python}
+          '1': {name: comment.typehint.directive.notation.python}
 
         patterns:
           - name: comment.typehint.ignore.notation.python
@@ -109,7 +109,8 @@ repository:
               (?x)
                 (?<!\.)\b(
                   bool | bytes | float | int | object | str
-                  | List | Dict | Iterable | Sequence
+                  | List | Dict | Iterable | Sequence | Set
+                  | FrozenSet | Callable | Union | Tuple
                   | Any | None
                 )\b
 
diff --git a/grammars/MagicPython.tmLanguage b/grammars/MagicPython.tmLanguage
@@ -96,7 +96,7 @@
               <key>1</key>
               <dict>
                 <key>name</key>
-                <string>keyword.comment.typehint.notation.python</string>
+                <string>comment.typehint.directive.notation.python</string>
               </dict>
             </dict>
             <key>patterns</key>
@@ -116,7 +116,8 @@
                 <string>(?x)
   (?&lt;!\.)\b(
     bool | bytes | float | int | object | str
-    | List | Dict | Iterable | Sequence
+    | List | Dict | Iterable | Sequence | Set
+    | FrozenSet | Callable | Union | Tuple
     | Any | None
   )\b
 </string>
diff --git a/misc/scopes b/misc/scopes
@@ -1,5 +1,6 @@
 comment.line.number-sign.python
 comment.regexp
+comment.typehint.directive.notation.python
 comment.typehint.ignore.notation.python
 comment.typehint.puctuation.notation.python
 comment.typehint.type.notation.python
@@ -37,7 +38,6 @@ invalid.illegal.name.python
 invalid.illegal.newline.python
 invalid.illegal.prefix.python
 keyword.codetag.notation.python
-keyword.comment.typehint.notation.python
 keyword.control.flow.python
 keyword.invalid.illegal.name.python
 keyword.operator.assignment.python
diff --git a/test/comments/typing1.py b/test/comments/typing1.py
@@ -10,25 +10,25 @@
 
 
 #             : comment.line.number-sign.python, meta.typehint.comment.python, source.python
-type:         : comment.line.number-sign.python, keyword.comment.typehint.notation.python, meta.typehint.comment.python, source.python
+type:         : comment.line.number-sign.python, comment.typehint.directive.notation.python, meta.typehint.comment.python, source.python
               : comment.line.number-sign.python, meta.typehint.comment.python, source.python
 ignore        : comment.line.number-sign.python, comment.typehint.ignore.notation.python, meta.typehint.comment.python, source.python
 #             : comment.line.number-sign.python, punctuation.definition.comment.python, source.python
  test         : comment.line.number-sign.python, source.python
 #             : comment.line.number-sign.python, meta.typehint.comment.python, source.python
-type:         : comment.line.number-sign.python, keyword.comment.typehint.notation.python, meta.typehint.comment.python, source.python
+type:         : comment.line.number-sign.python, comment.typehint.directive.notation.python, meta.typehint.comment.python, source.python
               : comment.line.number-sign.python, meta.typehint.comment.python, source.python
 ignore        : comment.line.number-sign.python, comment.typehint.ignore.notation.python, meta.typehint.comment.python, source.python
 #             : comment.line.number-sign.python, meta.typehint.comment.python, source.python
-type:         : comment.line.number-sign.python, keyword.comment.typehint.notation.python, meta.typehint.comment.python, source.python
+type:         : comment.line.number-sign.python, comment.typehint.directive.notation.python, meta.typehint.comment.python, source.python
 ignore        : comment.line.number-sign.python, comment.typehint.ignore.notation.python, meta.typehint.comment.python, source.python
 #             : comment.line.number-sign.python, meta.typehint.comment.python, source.python
-type:         : comment.line.number-sign.python, keyword.comment.typehint.notation.python, meta.typehint.comment.python, source.python
+type:         : comment.line.number-sign.python, comment.typehint.directive.notation.python, meta.typehint.comment.python, source.python
               : comment.line.number-sign.python, meta.typehint.comment.python, source.python
 ignore        : comment.line.number-sign.python, comment.typehint.variable.notation.python, meta.typehint.comment.python, source.python
  1            : comment.line.number-sign.python, meta.typehint.comment.python, source.python
 #             : comment.line.number-sign.python, meta.typehint.comment.python, source.python
-type:         : comment.line.number-sign.python, keyword.comment.typehint.notation.python, meta.typehint.comment.python, source.python
+type:         : comment.line.number-sign.python, comment.typehint.directive.notation.python, meta.typehint.comment.python, source.python
               : comment.line.number-sign.python, meta.typehint.comment.python, source.python
 1             : comment.line.number-sign.python, meta.typehint.comment.python, source.python
 ignore        : comment.line.number-sign.python, comment.typehint.variable.notation.python, meta.typehint.comment.python, source.python
diff --git a/test/comments/typing4.py b/test/comments/typing4.py
@@ -9,7 +9,7 @@
 None          : constant.language.python, source.python
               : source.python
 #             : comment.line.number-sign.python, meta.typehint.comment.python, source.python
-type:         : comment.line.number-sign.python, keyword.comment.typehint.notation.python, meta.typehint.comment.python, source.python
+type:         : comment.line.number-sign.python, comment.typehint.directive.notation.python, meta.typehint.comment.python, source.python
               : comment.line.number-sign.python, meta.typehint.comment.python, source.python
 List          : comment.line.number-sign.python, comment.typehint.type.notation.python, meta.typehint.comment.python, source.python
 [             : comment.line.number-sign.python, comment.typehint.puctuation.notation.python, meta.typehint.comment.python, source.python
@@ -24,7 +24,7 @@
 None          : constant.language.python, source.python
               : source.python
 #             : comment.line.number-sign.python, meta.typehint.comment.python, source.python
-type:         : comment.line.number-sign.python, keyword.comment.typehint.notation.python, meta.typehint.comment.python, source.python
+type:         : comment.line.number-sign.python, comment.typehint.directive.notation.python, meta.typehint.comment.python, source.python
               : comment.line.number-sign.python, meta.typehint.comment.python, source.python
 Dict          : comment.line.number-sign.python, comment.typehint.type.notation.python, meta.typehint.comment.python, source.python
 [             : comment.line.number-sign.python, comment.typehint.puctuation.notation.python, meta.typehint.comment.python, source.python
