Treat 'yield from' as one token

Author: Yury Selivanov

grammars/MagicPython.cson

@@ -407,7 +407,8 @@ repository:
     match: '''
       (?x)
           \\b(?<!\\.)(
-              and | or | not | in | is | for | if | else | yield | await
+              and | or | not | in | is | for | if | else | await
+              | (yield(\\s+from)?)
           )(?!\\s*:)\\b
       
           | != | == | >= | <= | << | >>

grammars/MagicPython.syntax.yaml

@@ -294,7 +294,8 @@ repository:
     match: |
       (?x)
           \b(?<!\.)(
-              and | or | not | in | is | for | if | else | yield | await
+              and | or | not | in | is | for | if | else | await
+              | (yield(\s+from)?)
           )(?!\s*:)\b
 
           | != | == | >= | <= | << | >>

grammars/MagicPython.tmLanguage

@@ -655,7 +655,8 @@
         <key>match</key>
         <string>(?x)
     \b(?&lt;!\.)(
-        and | or | not | in | is | for | if | else | yield | await
+        and | or | not | in | is | for | if | else | await
+        | (yield(\s+from)?)
     )(?!\s*:)\b
 
     | != | == | &gt;= | &lt;= | &lt;&lt; | &gt;&gt;

test/expressions/expr9.py

@@ -0,0 +1,9 @@
+yield  from a
+yield a
+
+
+
+yield  from   : keyword.operator.python, source.python
+ a            : source.python
+yield         : keyword.operator.python, source.python
+ a            : source.python