fix: add alias to (expr) for block end name

Author: emiasims

corpus/basic.tst

@@ -349,9 +349,10 @@ Block.1  - Empty
 --------------------------------------------------------------------------------
 
 (document
-  (body
+  body: (body
     (block
-      (expr))))
+      name: (expr)
+      end_name: (expr))))
 
 ================================================================================
 Block.2  - Contents
@@ -362,12 +363,13 @@ a
 --------------------------------------------------------------------------------
 
 (document
-  (body
+  body: (body
     (block
-      (expr)
-      (expr)
-      (contents
-        (expr)))))
+      name: (expr)
+      parameter: (expr)
+      contents: (contents
+        (expr))
+      end_name: (expr))))
 
 ================================================================================
 Block.3  - In section
@@ -380,17 +382,18 @@ a
 --------------------------------------------------------------------------------
 
 (document
-  (section
-    (headline
-      (stars)
-      (item
+  subsection: (section
+    headline: (headline
+      stars: (stars)
+      item: (item
         (expr)))
-    (body
+    body: (body
       (block
-        (expr)
-        (expr)
-        (contents
-          (expr))))))
+        name: (expr)
+        parameter: (expr)
+        contents: (contents
+          (expr))
+        end_name: (expr)))))
 
 ================================================================================
 Block.4  - lowercase
@@ -400,9 +403,10 @@ Block.4  - lowercase
 --------------------------------------------------------------------------------
 
 (document
-  (body
+  body: (body
     (block
-      (expr))))
+      name: (expr)
+      end_name: (expr))))
 
 ================================================================================
 DynamicBlock.1  - Empty

grammar.js

@@ -222,7 +222,7 @@ org_grammar = {
       $._nl,
       optional(field('contents', $.contents)),
       caseInsensitive('#+end_'),
-      $._immediate_expr,
+      field('end_name',alias($._immediate_expr, $.expr)),
       $._eol,
     ),
 

src/grammar.json

@@ -1250,8 +1250,17 @@
           "value": "#+end_"
         },
         {
-          "type": "SYMBOL",
-          "name": "_immediate_expr"
+          "type": "FIELD",
+          "name": "end_name",
+          "content": {
+            "type": "ALIAS",
+            "content": {
+              "type": "SYMBOL",
+              "name": "_immediate_expr"
+            },
+            "named": true,
+            "value": "expr"
+          }
         },
         {
           "type": "SYMBOL",

src/node-types.json

@@ -23,6 +23,16 @@
           }
         ]
       },
+      "end_name": {
+        "multiple": false,
+        "required": true,
+        "types": [
+          {
+            "type": "expr",
+            "named": true
+          }
+        ]
+      },
       "name": {
         "multiple": false,
         "required": true,