add field name to block to highlight its name

grammar.js

@@ -33,7 +33,7 @@ module.exports = grammar({
     ),
 
     block: $ => seq(
-      $.identifier,
+      field('type', $.identifier),
       repeat(choice($.string_lit, $.identifier)),
       '{',
       optional($.body),
@@ -55,14 +55,12 @@ module.exports = grammar({
     expr_term: $ => choice(
       $.literal_value,
       $.collection_value,
-      // $.template_expr,
       $.variable_expr,
       // $.function_call,
       // $.for_expr,
       // seq($.expr_term, $.index),
       // seq($.expr_term, $.get_attr),
       // seq($.expr_term, $.splat),
-      // seq($.expr_term, $.splat),
       seq('(', $.expression, ')'),
     ),
 
@@ -75,7 +73,7 @@ module.exports = grammar({
 
     numeric_lit: $ => /[0-9]+(\.[0-9]+([eE][-+]?[0-9]+)?)?/,
 
-    string_lit: $ => seq('"', repeat(/./), '"'),
+    string_lit: $ => seq('"', repeat(choice(/[^\\"\n]/, /\\(.|\n)/)), '"'),
 
     bool_lit: $ => choice('true', 'false'),
 

queries/highlights.scm

@@ -1,5 +1,6 @@
 ; highlights.scm
 
+(block type: (identifier) @keyword)
 (identifier) @string.special
 (string_lit) @string
 (numeric_lit) @number

src/grammar.json

@@ -47,8 +47,12 @@
       "type": "SEQ",
       "members": [
         {
-          "type": "SYMBOL",
-          "name": "identifier"
+          "type": "FIELD",
+          "name": "type",
+          "content": {
+            "type": "SYMBOL",
+            "name": "identifier"
+          }
         },
         {
           "type": "REPEAT",
@@ -198,8 +202,17 @@
         {
           "type": "REPEAT",
           "content": {
-            "type": "PATTERN",
-            "value": "."
+            "type": "CHOICE",
+            "members": [
+              {
+                "type": "PATTERN",
+                "value": "[^\\\\\"\\n]"
+              },
+              {
+                "type": "PATTERN",
+                "value": "\\\\(.|\\n)"
+              }
+            ]
           }
         },
         {

src/node-types.json

@@ -21,10 +21,21 @@
   {
     "type": "block",
     "named": true,
-    "fields": {},
+    "fields": {
+      "type": {
+        "multiple": false,
+        "required": true,
+        "types": [
+          {
+            "type": "identifier",
+            "named": true
+          }
+        ]
+      }
+    },
     "children": {
       "multiple": true,
-      "required": true,
+      "required": false,
       "types": [
         {
           "type": "body",