Seperate $, CACHE, and ENV for query purpose

grammar.js

@@ -29,9 +29,9 @@ module.exports = grammar({
 
     variable: ($) => prec.left(repeat1(choice(/[a-zA-Z0-9/_.+-]/, $.escape_sequence, $.variable_ref))),
     variable_ref: ($) => choice($.normal_var, $.env_var, $.cache_var),
-    normal_var: ($) => seq("${", $.variable, "}"),
+    normal_var: ($) => seq("$", "{", $.variable, "}"),
-    env_var: ($) => seq("$ENV", "{", $.variable, "}"),
+    env_var: ($) => seq("$", "ENV", "{", $.variable, "}"),
-    cache_var: ($) => seq("$CACHE", "{", $.variable, "}"),
+    cache_var: ($) => seq("$", "CACHE", "{", $.variable, "}"),
 
     argument: ($) => choice($.bracket_argument, $.quoted_argument, $.unquoted_argument),
     _untrimmed_argument: ($) => choice(/\s/, $.argument),

src/grammar.json

@@ -96,7 +96,11 @@
       "members": [
         {
           "type": "STRING",
-          "value": "${"
+          "value": "$"
+        },
+        {
+          "type": "STRING",
+          "value": "{"
         },
         {
           "type": "SYMBOL",
@@ -113,7 +117,11 @@
       "members": [
         {
           "type": "STRING",
-          "value": "$ENV"
+          "value": "$"
+        },
+        {
+          "type": "STRING",
+          "value": "ENV"
         },
         {
           "type": "STRING",
@@ -134,7 +142,11 @@
       "members": [
         {
           "type": "STRING",
-          "value": "$CACHE"
+          "value": "$"
+        },
+        {
+          "type": "STRING",
+          "value": "CACHE"
         },
         {
           "type": "STRING",

src/node-types.json

@@ -677,15 +677,7 @@
     "named": false
   },
   {
-    "type": "$CACHE",
+    "type": "$",
-    "named": false
-  },
-  {
-    "type": "$ENV",
-    "named": false
-  },
-  {
-    "type": "${",
     "named": false
   },
   {
@@ -696,6 +688,14 @@
     "type": ")",
     "named": false
   },
+  {
+    "type": "CACHE",
+    "named": false
+  },
+  {
+    "type": "ENV",
+    "named": false
+  },
   {
     "type": "\\n",
     "named": false