Move return syntax node to option for statements

tree-sitter-dust/corpus/blocks.txt

@@ -40,11 +40,9 @@ Block with Return
           (value
             (integer))))
       (statement
-        (return
+        (expression
-          (statement
+          (value
-            (expression
+            (integer))))
-              (value
-                (integer))))))
       (statement
         (expression
           (value

tree-sitter-dust/grammar.js

@@ -14,6 +14,7 @@ module.exports = grammar({
     statement: $ =>
       prec.left(
         seq(
+          optional('return'),
           choice(
             $.assignment,
             $.block,
@@ -22,7 +23,6 @@ module.exports = grammar({
             $.if_else,
             $.index_assignment,
             $.match,
-            $.return,
             $.pipe,
             $.while,
             $.type_definition,
@@ -336,11 +336,6 @@ module.exports = grammar({
         $.block,
       ),
 
-    return: $ =>
-      prec.right(
-        seq('return', $.statement),
-      ),
-
     type_specification: $ =>
       seq('<', $.type, '>'),
 

tree-sitter-dust/src/grammar.json

@@ -23,6 +23,18 @@
       "content": {
         "type": "SEQ",
         "members": [
+          {
+            "type": "CHOICE",
+            "members": [
+              {
+                "type": "STRING",
+                "value": "return"
+              },
+              {
+                "type": "BLANK"
+              }
+            ]
+          },
           {
             "type": "CHOICE",
             "members": [
@@ -54,10 +66,6 @@
                 "type": "SYMBOL",
                 "name": "match"
               },
-              {
-                "type": "SYMBOL",
-                "name": "return"
-              },
               {
                 "type": "SYMBOL",
                 "name": "pipe"
@@ -1004,23 +1012,6 @@
         }
       ]
     },
-    "return": {
-      "type": "PREC_RIGHT",
-      "value": 0,
-      "content": {
-        "type": "SEQ",
-        "members": [
-          {
-            "type": "STRING",
-            "value": "return"
-          },
-          {
-            "type": "SYMBOL",
-            "name": "statement"
-          }
-        ]
-      }
-    },
     "type_specification": {
       "type": "SEQ",
       "members": [
@@ -1199,27 +1190,6 @@
                 ]
               }
             ]
-          },
-          {
-            "type": "SEQ",
-            "members": [
-              {
-                "type": "STRING",
-                "value": "option"
-              },
-              {
-                "type": "STRING",
-                "value": "("
-              },
-              {
-                "type": "SYMBOL",
-                "name": "type"
-              },
-              {
-                "type": "STRING",
-                "value": ")"
-              }
-            ]
           }
         ]
       }

tree-sitter-dust/src/node-types.json

@@ -587,21 +587,6 @@
       ]
     }
   },
-  {
-    "type": "return",
-    "named": true,
-    "fields": {},
-    "children": {
-      "multiple": false,
-      "required": true,
-      "types": [
-        {
-          "type": "statement",
-          "named": true
-        }
-      ]
-    }
-  },
   {
     "type": "root",
     "named": true,
@@ -657,10 +642,6 @@
           "type": "pipe",
           "named": true
         },
-        {
-          "type": "return",
-          "named": true
-        },
         {
           "type": "type_definition",
           "named": true
@@ -1054,10 +1035,6 @@
     "type": "num",
     "named": false
   },
-  {
-    "type": "option",
-    "named": false
-  },
   {
     "type": "range",
     "named": true