fix(grammar): make brace and keyword separately queryable

src/grammar.json

@@ -48,9 +48,17 @@
     "block_open": {
       "type": "SEQ",
       "members": [
+        {
+          "type": "STRING",
+          "value": "{"
+        },
         {
           "type": "SYMBOL",
-          "name": "_block_open_start"
+          "name": "block_keyword"
+        },
+        {
+          "type": "STRING",
+          "value": ":"
         },
         {
           "type": "SYMBOL",
@@ -77,9 +85,21 @@
     "block_close": {
       "type": "SEQ",
       "members": [
+        {
+          "type": "STRING",
+          "value": "{"
+        },
+        {
+          "type": "STRING",
+          "value": "/"
+        },
         {
           "type": "SYMBOL",
-          "name": "_block_close_start"
+          "name": "block_keyword"
+        },
+        {
+          "type": "STRING",
+          "value": ":"
         },
         {
           "type": "SYMBOL",
@@ -94,9 +114,17 @@
     "lang_tag": {
       "type": "SEQ",
       "members": [
+        {
+          "type": "STRING",
+          "value": "{"
+        },
         {
           "type": "SYMBOL",
-          "name": "_lang_start"
+          "name": "lang_keyword"
+        },
+        {
+          "type": "STRING",
+          "value": ":"
         },
         {
           "type": "SYMBOL",
@@ -250,17 +278,27 @@
       "type": "PATTERN",
       "value": "[^}]+"
     },
-    "_block_open_start": {
-      "type": "PATTERN",
-      "value": "\\{[Bb][Ll][Oo][Cc][Kk]:"
+    "block_keyword": {
+      "type": "TOKEN",
+      "content": {
+        "type": "PREC",
+        "value": 1,
+        "content": {
+          "type": "PATTERN",
+          "value": "[Bb][Ll][Oo][Cc][Kk]"
+        }
+      }
     },
-    "_block_close_start": {
-      "type": "PATTERN",
-      "value": "\\{\\/[Bb][Ll][Oo][Cc][Kk]:"
-    },
-    "_lang_start": {
-      "type": "PATTERN",
-      "value": "\\{[Ll][Aa][Nn][Gg]:"
+    "lang_keyword": {
+      "type": "TOKEN",
+      "content": {
+        "type": "PREC",
+        "value": 1,
+        "content": {
+          "type": "PATTERN",
+          "value": "[Ll][Aa][Nn][Gg]"
+        }
+      }
     },
     "_space": {
       "type": "PATTERN",

src/node-types.json

@@ -38,9 +38,13 @@
     "named": true,
     "fields": {},
     "children": {
-      "multiple": false,
+      "multiple": true,
       "required": true,
       "types": [
+        {
+          "type": "block_keyword",
+          "named": true
+        },
         {
           "type": "block_name",
           "named": true
@@ -60,6 +64,10 @@
           "type": "attributes",
           "named": true
         },
+        {
+          "type": "block_keyword",
+          "named": true
+        },
         {
           "type": "block_name",
           "named": true
@@ -72,9 +80,13 @@
     "named": true,
     "fields": {},
     "children": {
-      "multiple": false,
+      "multiple": true,
       "required": true,
       "types": [
+        {
+          "type": "lang_keyword",
+          "named": true
+        },
         {
           "type": "lang_text",
           "named": true
@@ -150,6 +162,10 @@
     "type": "-",
     "named": false
   },
+  {
+    "type": "/",
+    "named": false
+  },
   {
     "type": ":",
     "named": false
@@ -166,6 +182,10 @@
     "type": "attribute_value",
     "named": true
   },
+  {
+    "type": "block_keyword",
+    "named": true
+  },
   {
     "type": "block_name",
     "named": true
@@ -186,6 +206,10 @@
     "type": "image",
     "named": false
   },
+  {
+    "type": "lang_keyword",
+    "named": true
+  },
   {
     "type": "lang_text",
     "named": true