separate ^-strings from normal ones

grammar.js

@@ -5,6 +5,7 @@ module.exports = grammar({
     source_file: $ => seq(repeat($._statement)),
     _unspaced_statement: $ => seq(
       choice(
+        $.ministring,
         $.string,
         $.number,
         $.function_definition,
@@ -53,10 +54,8 @@ module.exports = grammar({
       $.identifier,
     ),
     number: $ => token(prec(10, /\d+(\.\d+)?/)),
-    string: $ => choice(
+    ministring: $ => token(prec(10, seq('^', /[^ \n\r\t<>:;&{}"'\[\],]+/))),
-      token(prec(10, seq('^', /[^ \n\r\t<>:;&{}"'\[\],]+/))),
+    string: $ => seq('"', repeat(choice(/\\./, /./)), '"'),
-      seq('"', repeat(choice(/\\./, /./)), '"'), 
-    ),
     call_expr: $ => seq('<', optional($._spacing), repeat($._statement), $._unspaced_statement, '>'),
     with_expr: $ => seq(
       'with', $._spacing,

queries/highlights.scm

@@ -16,3 +16,4 @@
 (call (call) @function (identifier) @property)
 (def (identifier) @local.definition)
 (with_expr (identifier) @local.definition)
+(ministring) @string.special.symbol

src/grammar.json

@@ -20,6 +20,10 @@
         {
           "type": "CHOICE",
           "members": [
+            {
+              "type": "SYMBOL",
+              "name": "ministring"
+            },
             {
               "type": "SYMBOL",
               "name": "string"
@@ -338,58 +342,53 @@
         }
       }
     },
-    "string": {
+    "ministring": {
-      "type": "CHOICE",
+      "type": "TOKEN",
-      "members": [
+      "content": {
-        {
+        "type": "PREC",
-          "type": "TOKEN",
+        "value": 10,
-          "content": {
+        "content": {
-            "type": "PREC",
-            "value": 10,
-            "content": {
-              "type": "SEQ",
-              "members": [
-                {
-                  "type": "STRING",
-                  "value": "^"
-                },
-                {
-                  "type": "PATTERN",
-                  "value": "[^ \\n\\r\\t<>:;&{}\"'\\[\\],]+"
-                }
-              ]
-            }
-          }
-        },
-        {
           "type": "SEQ",
           "members": [
             {
               "type": "STRING",
-              "value": "\""
+              "value": "^"
             },
             {
-              "type": "REPEAT",
+              "type": "PATTERN",
-              "content": {
+              "value": "[^ \\n\\r\\t<>:;&{}\"'\\[\\],]+"
-                "type": "CHOICE",
-                "members": [
-                  {
-                    "type": "PATTERN",
-                    "value": "\\\\."
-                  },
-                  {
-                    "type": "PATTERN",
-                    "value": "."
-                  }
-                ]
-              }
-            },
-            {
-              "type": "STRING",
-              "value": "\""
             }
           ]
         }
+      }
+    },
+    "string": {
+      "type": "SEQ",
+      "members": [
+        {
+          "type": "STRING",
+          "value": "\""
+        },
+        {
+          "type": "REPEAT",
+          "content": {
+            "type": "CHOICE",
+            "members": [
+              {
+                "type": "PATTERN",
+                "value": "\\\\."
+              },
+              {
+                "type": "PATTERN",
+                "value": "."
+              }
+            ]
+          }
+        },
+        {
+          "type": "STRING",
+          "value": "\""
+        }
       ]
     },
     "call_expr": {

src/node-types.json

@@ -39,6 +39,10 @@
           "type": "include",
           "named": true
         },
+        {
+          "type": "ministring",
+          "named": true
+        },
         {
           "type": "number",
           "named": true
@@ -106,6 +110,10 @@
           "type": "include",
           "named": true
         },
+        {
+          "type": "ministring",
+          "named": true
+        },
         {
           "type": "number",
           "named": true
@@ -211,6 +219,10 @@
           "type": "include",
           "named": true
         },
+        {
+          "type": "ministring",
+          "named": true
+        },
         {
           "type": "number",
           "named": true
@@ -282,6 +294,10 @@
           "type": "include",
           "named": true
         },
+        {
+          "type": "ministring",
+          "named": true
+        },
         {
           "type": "number",
           "named": true
@@ -406,6 +422,10 @@
           "type": "include",
           "named": true
         },
+        {
+          "type": "ministring",
+          "named": true
+        },
         {
           "type": "number",
           "named": true
@@ -494,6 +514,10 @@
           "type": "include",
           "named": true
         },
+        {
+          "type": "ministring",
+          "named": true
+        },
         {
           "type": "number",
           "named": true
@@ -604,6 +628,10 @@
           "type": "include",
           "named": true
         },
+        {
+          "type": "ministring",
+          "named": true
+        },
         {
           "type": "number",
           "named": true
@@ -738,6 +766,10 @@
     "type": "include",
     "named": false
   },
+  {
+    "type": "ministring",
+    "named": true
+  },
   {
     "type": "namespace",
     "named": false