Stop highlighting single letter constants.

Author: vpetrovykh

grammars/MagicPython.cson

@@ -29,7 +29,7 @@ patterns: [
 ]
 repository:
   impossible:
-    comment: "This is a special rule that should be used where no match is desired. It is not a good idea to match something like '1{0}' because in some cases that can result in infinite loops in token generation. So the rule instead matches and impossible expression to allow a mathc to fail and move to the next token."
+    comment: "This is a special rule that should be used where no match is desired. It is not a good idea to match something like '1{0}' because in some cases that can result in infinite loops in token generation. So the rule instead matches and impossible expression to allow a match to fail and move to the next token."
     match: "$.^"
   statement:
     patterns: [
@@ -435,7 +435,7 @@ repository:
       (?x)
         \\b
           (
-            _* [[:upper:]]
+            _* [[:upper:]]{2}
           )
           [[:upper:]\\d]* (_\\w*)?
         \\b

grammars/MagicPython.tmLanguage

@@ -45,7 +45,7 @@
       <key>impossible</key>
       <dict>
         <key>comment</key>
-        <string>This is a special rule that should be used where no match is desired. It is not a good idea to match something like '1{0}' because in some cases that can result in infinite loops in token generation. So the rule instead matches and impossible expression to allow a mathc to fail and move to the next token.</string>
+        <string>This is a special rule that should be used where no match is desired. It is not a good idea to match something like '1{0}' because in some cases that can result in infinite loops in token generation. So the rule instead matches and impossible expression to allow a match to fail and move to the next token.</string>
         <key>match</key>
         <string>$.^</string>
       </dict>
@@ -660,7 +660,7 @@
         <string>(?x)
   \b
     (
-      _* [[:upper:]]
+      _* [[:upper:]]{2}
     )
     [[:upper:]\d]* (_\w*)?
   \b

grammars/src/MagicPython.syntax.yaml

@@ -212,7 +212,7 @@ repository:
              is desired. It is not a good idea to match something like
              '1{0}' because in some cases that can result in infinite
              loops in token generation. So the rule instead matches
-             and impossible expression to allow a mathc to fail and
+             and impossible expression to allow a match to fail and
              move to the next token.
     match: '$.^'
 
@@ -449,7 +449,7 @@ repository:
       (?x)
         \b
           (
-            _* [[:upper:]]
+            _* [[:upper:]]{2}
           )
           [[:upper:]\d]* (_\w*)?
         \b

test/calls/call1.py

@@ -4,7 +4,7 @@
 
 some_call     : meta.function-call.generic.python, meta.function-call.python, source.python
 (             : meta.function-call.python, punctuation.definition.arguments.begin.python, source.python
-A             : constant.other.caps.python, meta.function-call.arguments.python, meta.function-call.python, source.python
+A             : meta.function-call.arguments.python, meta.function-call.python, source.python
 ,             : meta.function-call.arguments.python, meta.function-call.python, punctuation.separator.arguments.python, source.python
               : meta.function-call.arguments.python, meta.function-call.python, source.python
 b             : meta.function-call.arguments.python, meta.function-call.python, source.python

test/expressions/const1.py

@@ -1,4 +1,4 @@
-QQQQ QQQQ_123 QQQQ123 PROTOCOL_v2 QQQ.bar baz.AA_a _AAA foo._AAA _A __A ___A
+QQQQ QQQQ_123 QQQQ123 PROTOCOL_v2 QQQ.bar baz.AA_a _AAA foo._AAA
 QQQq QQQq123 self.FOOO() _ _1 __1 _1A  __1A _a __a __ ___ ___a ___1 __aA ___Aa
 
 
@@ -24,12 +24,6 @@
 foo           : source.python
 .             : source.python
 _AAA          : constant.other.caps.python, source.python
-              : source.python
-_A            : constant.other.caps.python, source.python
-              : source.python
-__A           : constant.other.caps.python, source.python
-              : source.python
-___A          : constant.other.caps.python, source.python
 QQQq          : source.python
               : source.python
 QQQq123       : source.python

test/expressions/const2.py

@@ -0,0 +1,23 @@
+_AA __AB ___AA
+_A __A ___A A1 A_1 _A_1 A_foo
+
+
+
+_AA           : constant.other.caps.python, source.python
+              : source.python
+__AB          : constant.other.caps.python, source.python
+              : source.python
+___AA         : constant.other.caps.python, source.python
+_A            : source.python
+              : source.python
+__A           : source.python
+              : source.python
+___A          : source.python
+              : source.python
+A1            : source.python
+              : source.python
+A_1           : source.python
+              : source.python
+_A_1          : source.python
+              : source.python
+A_foo         : source.python

test/unicode/unicode1.py

@@ -4,6 +4,7 @@ class Üa(Êa):
     def ŌÏŒĘ(self, Ú=1):
         print('превед 你好')
         return Ù
+    ÜBER = 1
     你好 = lambda: 你好
     def 你好(): pass
 
@@ -48,7 +49,13 @@ def           : meta.function.python, source.python, storage.type.function.pytho
               : source.python
 return        : keyword.control.flow.python, source.python
               : source.python
-Ù             : constant.other.caps.python, source.python
+Ù             : source.python
+              : source.python
+ÜBER          : constant.other.caps.python, source.python
+              : source.python
+=             : keyword.operator.assignment.python, source.python
+              : source.python
+1             : constant.numeric.dec.python, source.python
               : source.python
 你好            : source.python
               : source.python