Change the scope name for a generic ':'.

vpetrovykh · vpetrovykh · commit eb64fe358e5a · 2016-12-16T16:21:58.000-05:00
punctuation.separator.block.begin.python
 -&gt; punctuation.separator.colon.python

This makes it possible to not complicate the grammar to treat
annotations differently.
diff --git a/grammars/MagicPython.cson b/grammars/MagicPython.cson
@@ -560,7 +560,7 @@ repository:
   punctuation:
     patterns: [
       {
-        name: "punctuation.separator.block.begin.python"
+        name: "punctuation.separator.colon.python"
         match: ":"
       }
       {
diff --git a/grammars/MagicPython.tmLanguage b/grammars/MagicPython.tmLanguage
@@ -874,7 +874,7 @@
         <array>
           <dict>
             <key>name</key>
-            <string>punctuation.separator.block.begin.python</string>
+            <string>punctuation.separator.colon.python</string>
             <key>match</key>
             <string>:</string>
           </dict>
diff --git a/grammars/src/MagicPython.syntax.yaml b/grammars/src/MagicPython.syntax.yaml
@@ -536,7 +536,7 @@ repository:
 
   punctuation:
     patterns:
-      - name: punctuation.separator.block.begin.python
+      - name: punctuation.separator.colon.python
         match: ":"
       - name: punctuation.separator.element.python
         match: ","
diff --git a/misc/scopes b/misc/scopes
@@ -114,7 +114,7 @@ punctuation.section.function.lambda.begin.python
 punctuation.separator.annotation.python
 punctuation.separator.annotation.result.python
 punctuation.separator.arguments.python
-punctuation.separator.block.begin.python
+punctuation.separator.colon.python
 punctuation.separator.continuation.line.python
 punctuation.separator.dict.python
 punctuation.separator.element.python
diff --git a/test/classes/class1.py b/test/classes/class1.py
@@ -9,6 +9,6 @@ class         : source.python, storage.type.class.python
 ->            : invalid.illegal.annotation.python, source.python
               : source.python
 None          : constant.language.python, source.python
-:             : punctuation.separator.block.begin.python, source.python
+:             : punctuation.separator.colon.python, source.python
               : source.python
 pass          : keyword.control.flow.python, source.python
diff --git a/test/classes/super1.py b/test/classes/super1.py
@@ -87,7 +87,7 @@ def           : meta.function.python, source.python, storage.type.function.pytho
 )             : meta.function-call.python, punctuation.definition.arguments.end.python, source.python
               : source.python
 if            : keyword.control.flow.python, source.python
-:             : punctuation.separator.block.begin.python, source.python
+:             : punctuation.separator.colon.python, source.python
               : source.python
 __init__      : meta.function-call.python, source.python, support.function.magic.python
 (             : meta.function-call.python, punctuation.definition.arguments.begin.python, source.python
diff --git a/test/comments/typing5.py b/test/comments/typing5.py
@@ -12,7 +12,7 @@
               : meta.function-call.arguments.python, meta.function-call.python, source.python
 TypeVar       : meta.function-call.arguments.python, meta.function-call.python, source.python
 )             : meta.function-call.python, punctuation.definition.arguments.end.python, source.python
-:             : punctuation.separator.block.begin.python, source.python
+:             : punctuation.separator.colon.python, source.python
               : source.python
 #             : comment.line.number-sign.python, meta.typehint.comment.python, source.python
 type:         : comment.line.number-sign.python, comment.typehint.directive.notation.python, meta.typehint.comment.python, source.python
diff --git a/test/docstrings/mix1.py b/test/docstrings/mix1.py
@@ -67,7 +67,7 @@ def           : meta.function.python, source.python, storage.type.function.pytho
 with          : keyword.control.flow.python, source.python
               : source.python
 bar           : source.python
-:             : punctuation.separator.block.begin.python, source.python
+:             : punctuation.separator.colon.python, source.python
               : source.python
 pass          : keyword.control.flow.python, source.python
               : source.python
@@ -105,6 +105,6 @@ def           : meta.function.python, source.python, storage.type.function.pytho
 with          : keyword.control.flow.python, source.python
               : source.python
 bar           : source.python
-:             : punctuation.separator.block.begin.python, source.python
+:             : punctuation.separator.colon.python, source.python
               : source.python
 pass          : keyword.control.flow.python, source.python
diff --git a/test/docstrings/mix2.py b/test/docstrings/mix2.py
@@ -66,7 +66,7 @@ def           : meta.function.python, source.python, storage.type.function.pytho
 with          : keyword.control.flow.python, source.python
               : source.python
 bar           : source.python
-:             : punctuation.separator.block.begin.python, source.python
+:             : punctuation.separator.colon.python, source.python
               : source.python
 pass          : keyword.control.flow.python, source.python
               : source.python
@@ -104,6 +104,6 @@ def           : meta.function.python, source.python, storage.type.function.pytho
 with          : keyword.control.flow.python, source.python
               : source.python
 bar           : source.python
-:             : punctuation.separator.block.begin.python, source.python
+:             : punctuation.separator.colon.python, source.python
               : source.python
 pass          : keyword.control.flow.python, source.python
diff --git a/test/fstrings/nested1.py b/test/fstrings/nested1.py
@@ -52,7 +52,7 @@ def           : keyword.control.flow.python, meta.fstring.python, meta.function-
 aaa           : meta.fstring.python, meta.function-call.arguments.python, meta.function-call.generic.python, meta.function-call.python, source.python
 (             : meta.fstring.python, meta.function-call.arguments.python, meta.function-call.python, punctuation.definition.arguments.begin.python, source.python
 )             : meta.fstring.python, meta.function-call.arguments.python, meta.function-call.python, punctuation.definition.arguments.end.python, source.python
-:             : meta.fstring.python, meta.function-call.arguments.python, meta.function-call.python, punctuation.separator.block.begin.python, source.python
+:             : meta.fstring.python, meta.function-call.arguments.python, meta.function-call.python, punctuation.separator.colon.python, source.python
               : meta.fstring.python, meta.function-call.arguments.python, meta.function-call.python, source.python
 pass          : keyword.control.flow.python, meta.fstring.python, meta.function-call.arguments.python, meta.function-call.python, source.python
 }             : constant.character.format.placeholder.other.python, meta.fstring.python, meta.function-call.arguments.python, meta.function-call.python, source.python
diff --git a/test/fstrings/simple1.py b/test/fstrings/simple1.py
@@ -45,7 +45,7 @@
 [             : meta.fstring.python, punctuation.definition.list.begin.python, source.python
               : meta.fstring.python, source.python
 ]             : meta.fstring.python, punctuation.definition.list.end.python, source.python
-:             : meta.fstring.python, punctuation.separator.block.begin.python, source.python
+:             : meta.fstring.python, punctuation.separator.colon.python, source.python
 Xd            : meta.fstring.python, source.python
 >             : keyword.operator.comparison.python, meta.fstring.python, source.python
 +             : keyword.operator.arithmetic.python, meta.fstring.python, source.python
diff --git a/test/fstrings/simple6.py b/test/fstrings/simple6.py
@@ -21,7 +21,7 @@ def           : keyword.control.flow.python, meta.fstring.python, source.python
 aaa           : meta.fstring.python, meta.function-call.generic.python, meta.function-call.python, source.python
 (             : meta.fstring.python, meta.function-call.python, punctuation.definition.arguments.begin.python, source.python
 )             : meta.fstring.python, meta.function-call.python, punctuation.definition.arguments.end.python, source.python
-:             : meta.fstring.python, punctuation.separator.block.begin.python, source.python
+:             : meta.fstring.python, punctuation.separator.colon.python, source.python
               : meta.fstring.python, source.python
 pass          : keyword.control.flow.python, meta.fstring.python, source.python
 }             : constant.character.format.placeholder.other.python, meta.fstring.python, source.python
diff --git a/test/functions/async1.py b/test/functions/async1.py
@@ -39,7 +39,7 @@ def           : meta.function.python, source.python, storage.type.function.pytho
 in            : keyword.operator.logical.python, source.python
               : source.python
 b             : source.python
-:             : punctuation.separator.block.begin.python, source.python
+:             : punctuation.separator.colon.python, source.python
               : source.python
 async         : keyword.control.flow.python, source.python
               : source.python
@@ -53,7 +53,7 @@ def           : meta.function.python, source.python, storage.type.function.pytho
 ,             : punctuation.separator.element.python, source.python
               : source.python
 c             : source.python
-:             : punctuation.separator.block.begin.python, source.python
+:             : punctuation.separator.colon.python, source.python
               : source.python
 await         : keyword.control.flow.python, source.python
               : source.python
diff --git a/test/functions/decl13.py b/test/functions/decl13.py
@@ -13,6 +13,6 @@ def           : meta.function.python, source.python, storage.type.function.pytho
 ->            : invalid.illegal.annotation.python, source.python
               : source.python
 notOK         : source.python
-:             : punctuation.separator.block.begin.python, source.python
+:             : punctuation.separator.colon.python, source.python
               : source.python
 pass          : keyword.control.flow.python, source.python
diff --git a/test/functions/decl9.py b/test/functions/decl9.py
@@ -7,6 +7,6 @@
 foo           : meta.function-call.generic.python, meta.function-call.python, source.python
 (             : meta.function-call.python, punctuation.definition.arguments.begin.python, source.python
 )             : meta.function-call.python, punctuation.definition.arguments.end.python, source.python
-:             : punctuation.separator.block.begin.python, source.python
+:             : punctuation.separator.colon.python, source.python
               : source.python
 pass          : keyword.control.flow.python, source.python
diff --git a/test/functions/lambda8.py b/test/functions/lambda8.py
@@ -17,7 +17,7 @@ def foo(): pass
 d             : source.python
 =             : keyword.operator.assignment.python, source.python
 1             : constant.numeric.dec.python, source.python
-:             : punctuation.separator.block.begin.python, source.python
+:             : punctuation.separator.colon.python, source.python
               : source.python
 None          : constant.language.python, source.python
 def           : meta.function.python, source.python, storage.type.function.python
diff --git a/test/statements/annotation1.py b/test/statements/annotation1.py
@@ -0,0 +1,27 @@
+some_number: int           # variable without initial value
+some_list: List[int] = []  # variable with initial value
+
+
+
+some_number   : source.python
+:             : punctuation.separator.colon.python, source.python
+              : source.python
+int           : source.python, support.type.python
+              : source.python
+#             : comment.line.number-sign.python, punctuation.definition.comment.python, source.python
+ variable without initial value : comment.line.number-sign.python, source.python
+some_list     : source.python
+:             : punctuation.separator.colon.python, source.python
+              : source.python
+List          : meta.item-access.python, source.python
+[             : meta.item-access.python, punctuation.definition.arguments.begin.python, source.python
+int           : meta.item-access.arguments.python, meta.item-access.python, source.python, support.type.python
+]             : meta.item-access.python, punctuation.definition.arguments.end.python, source.python
+              : source.python
+=             : keyword.operator.assignment.python, source.python
+              : source.python
+[             : punctuation.definition.list.begin.python, source.python
+]             : punctuation.definition.list.end.python, source.python
+              : source.python
+#             : comment.line.number-sign.python, punctuation.definition.comment.python, source.python
+ variable with initial value : comment.line.number-sign.python, source.python
diff --git a/test/statements/for1.py b/test/statements/for1.py
@@ -18,11 +18,11 @@
 in            : keyword.operator.logical.python, source.python
               : source.python
 b             : source.python
-:             : punctuation.separator.block.begin.python, source.python
+:             : punctuation.separator.colon.python, source.python
               : source.python
 pass          : keyword.control.flow.python, source.python
 else          : keyword.control.flow.python, source.python
-:             : punctuation.separator.block.begin.python, source.python
+:             : punctuation.separator.colon.python, source.python
               : source.python
 1             : constant.numeric.dec.python, source.python
 /             : keyword.operator.arithmetic.python, source.python
diff --git a/test/statements/if1.py b/test/statements/if1.py
@@ -20,7 +20,7 @@
               : source.python
 c             : source.python
 )             : punctuation.parenthesis.end.python, source.python
-:             : punctuation.separator.block.begin.python, source.python
+:             : punctuation.separator.colon.python, source.python
               : source.python
 1             : constant.numeric.dec.python, source.python
 elif          : keyword.control.flow.python, source.python
@@ -34,10 +34,10 @@
 and           : keyword.operator.logical.python, source.python
               : source.python
 d             : source.python
-:             : punctuation.separator.block.begin.python, source.python
+:             : punctuation.separator.colon.python, source.python
               : source.python
 2             : constant.numeric.dec.python, source.python
 else          : keyword.control.flow.python, source.python
-:             : punctuation.separator.block.begin.python, source.python
+:             : punctuation.separator.colon.python, source.python
               : source.python
 3             : constant.numeric.dec.python, source.python
diff --git a/test/statements/try1.py b/test/statements/try1.py
@@ -12,7 +12,7 @@
 
 
 try           : keyword.control.flow.python, source.python
-:             : punctuation.separator.block.begin.python, source.python
+:             : punctuation.separator.colon.python, source.python
               : source.python
 1             : constant.numeric.dec.python, source.python
 /             : keyword.operator.arithmetic.python, source.python
@@ -24,7 +24,7 @@
 as            : keyword.control.flow.python, source.python
               : source.python
 ex            : source.python
-:             : punctuation.separator.block.begin.python, source.python
+:             : punctuation.separator.colon.python, source.python
               : source.python
 pass          : keyword.control.flow.python, source.python
 except        : keyword.control.flow.python, source.python
@@ -39,17 +39,17 @@
 as            : keyword.control.flow.python, source.python
               : source.python
 ex            : source.python
-:             : punctuation.separator.block.begin.python, source.python
+:             : punctuation.separator.colon.python, source.python
               : source.python
 print         : meta.function-call.python, source.python, support.function.builtin.python
 (             : meta.function-call.python, punctuation.definition.arguments.begin.python, source.python
 ex            : meta.function-call.arguments.python, meta.function-call.python, source.python
 )             : meta.function-call.python, punctuation.definition.arguments.end.python, source.python
 else          : keyword.control.flow.python, source.python
-:             : punctuation.separator.block.begin.python, source.python
+:             : punctuation.separator.colon.python, source.python
               : source.python
 1             : constant.numeric.dec.python, source.python
 finally       : keyword.control.flow.python, source.python
-:             : punctuation.separator.block.begin.python, source.python
+:             : punctuation.separator.colon.python, source.python
               : source.python
 2             : constant.numeric.dec.python, source.python
diff --git a/test/statements/while1.py b/test/statements/while1.py
@@ -6,6 +6,6 @@
 while         : keyword.control.flow.python, source.python
               : source.python
 1             : constant.numeric.dec.python, source.python
-:             : punctuation.separator.block.begin.python, source.python
+:             : punctuation.separator.colon.python, source.python
               : source.python
 pass          : keyword.control.flow.python, source.python
diff --git a/test/statements/with1.py b/test/statements/with1.py
@@ -17,6 +17,6 @@
 as            : keyword.control.flow.python, source.python
               : source.python
 d             : source.python
-:             : punctuation.separator.block.begin.python, source.python
+:             : punctuation.separator.colon.python, source.python
               : source.python
 pass          : keyword.control.flow.python, source.python

Original file line number	Diff line number	Diff line change
`@@ -560,7 +560,7 @@ repository:`
`560`	`560`	`punctuation:`
`561`	`561`	`patterns: [`
`562`	`562`	`{`
`563`		`- name: "punctuation.separator.block.begin.python"`
	`563`	`+ name: "punctuation.separator.colon.python"`
`564`	`564`	`match: ":"`
`565`	`565`	`}`
`566`	`566`	`{`