Merge pull request #110 from Keating950/master

Add highlighting for yield keyword from #[feature(generators)]

Author: aryx

corpus/expressions.txt

@@ -752,6 +752,29 @@ a.map(|b: usize| b.push(c));
       (closure_parameters (parameter (identifier) (primitive_type)))
       (call_expression (field_expression (identifier) (field_identifier)) (arguments (identifier)))))))
 
+===========================================
+Generators
+===========================================
+
+move || {
+    while i <= n {
+        yield i;
+        i += 1;
+    }
+    return;
+};
+
+---
+
+(source_file
+  (closure_expression
+    (closure_parameters)
+    (block
+      (while_expression (binary_expression (identifier) (identifier))
+        (block (yield_expression (identifier))
+          (compound_assignment_expr (identifier) (integer_literal))))
+      (return_expression))))
+
 ===========================================
 Unsafe blocks
 ===========================================

grammar.js

@@ -842,6 +842,7 @@ module.exports = grammar({
       $.range_expression,
       $.call_expression,
       $.return_expression,
+      $.yield_expression,
       $._literal,
       prec.left($.identifier),
       alias(choice(...primitive_types), $.identifier),
@@ -988,6 +989,11 @@ module.exports = grammar({
       prec(-1, 'return'),
     ),
 
+    yield_expression: $ => choice(
+      prec.left(seq('yield', $._expression)),
+      prec(-1, 'yield'),
+    ),
+
     call_expression: $ => prec(PREC.call, seq(
       field('function', $._expression),
       field('arguments', $.arguments)

src/grammar.json

@@ -4665,6 +4665,10 @@
           "type": "SYMBOL",
           "name": "return_expression"
         },
+        {
+          "type": "SYMBOL",
+          "name": "yield_expression"
+        },
         {
           "type": "SYMBOL",
           "name": "_literal"
@@ -5742,6 +5746,36 @@
         }
       ]
     },
+    "yield_expression": {
+      "type": "CHOICE",
+      "members": [
+        {
+          "type": "PREC_LEFT",
+          "value": 0,
+          "content": {
+            "type": "SEQ",
+            "members": [
+              {
+                "type": "STRING",
+                "value": "yield"
+              },
+              {
+                "type": "SYMBOL",
+                "name": "_expression"
+              }
+            ]
+          }
+        },
+        {
+          "type": "PREC",
+          "value": -1,
+          "content": {
+            "type": "STRING",
+            "value": "yield"
+          }
+        }
+      ]
+    },
     "call_expression": {
       "type": "PREC",
       "value": 14,

src/node-types.json

@@ -248,6 +248,10 @@
       {
         "type": "while_let_expression",
         "named": true
+      },
+      {
+        "type": "yield_expression",
+        "named": true
       }
     ]
   },
@@ -4532,6 +4536,21 @@
       ]
     }
   },
+  {
+    "type": "yield_expression",
+    "named": true,
+    "fields": {},
+    "children": {
+      "multiple": false,
+      "required": false,
+      "types": [
+        {
+          "type": "_expression",
+          "named": true
+        }
+      ]
+    }
+  },
   {
     "type": "!",
     "named": false
@@ -4988,6 +5007,10 @@
     "type": "while",
     "named": false
   },
+  {
+    "type": "yield",
+    "named": false
+  },
   {
     "type": "{",
     "named": false