update form statement to accept variables

Shopify · Mar 20, 2024 · a1e0d5a · a1e0d5a
1 parent a155332
commit a1e0d5a
Show file tree

Hide file tree

Showing 5 changed files with 9,028 additions and 8,837 deletions.
diff --git a/grammar.js b/grammar.js
@@ -338,7 +338,7 @@ module.exports = grammar({
     // (inside vs. outside a liquid tag), we abstract their rules to constructors
     // which allow for a flexible internal representations of sub-rules and tagging.
 
-    //tagged
+    // tagged
     if_statement: ($) => paired($).tagged._if,
 
     elsif_clause: ($) => paired($).tagged._elsif,
@@ -639,7 +639,7 @@ function statements($, rules) {
     _form: seq(
       rules.wrapper(
         "form",
-        field("type", $.string),
+        field("type", choice($.string, $.identifier, $.access)),
         optional(
           field(
             "parameters", 

diff --git a/queries/highlights.scm b/queries/highlights.scm
@@ -25,13 +25,6 @@
   ] @punctuation.delimiter 
  (#set! priority 101))
 
-([
-  "|"
-  ":"
-  "="
-  (predicate)
-  ] @operator 
- (#set! priority 101))
 
 ([
   "as"
@@ -61,7 +54,6 @@
   "for"
   "form"
   "if"
-  "in"
   "include"
   "increment"
   "javascript"
@@ -81,6 +73,22 @@
   ] @keyword 
  (#set! priority 101))
 
+([
+  "and"
+  "contains"
+  "in"
+  "or"
+  ] @keyword.operator
+ (#set! priority 101))
+
+([
+  "|"
+  ":"
+  "="
+  (predicate)
+  ] @operator 
+ (#set! priority 101))
+
 ((identifier) @variable (#set! priority 101))
 ((string) @string (#set! priority 101))
 ((boolean) @boolean (#set! priority 101))
@@ -94,3 +102,4 @@
 
 ((comment) @comment (#set! priority 102))
 
+
diff --git a/src/grammar.json b/src/grammar.json
@@ -2457,8 +2457,21 @@
               "type": "FIELD",
               "name": "type",
               "content": {
-                "type": "SYMBOL",
-                "name": "string"
+                "type": "CHOICE",
+                "members": [
+                  {
+                    "type": "SYMBOL",
+                    "name": "string"
+                  },
+                  {
+                    "type": "SYMBOL",
+                    "name": "identifier"
+                  },
+                  {
+                    "type": "SYMBOL",
+                    "name": "access"
+                  }
+                ]
               }
             },
             {
@@ -3267,8 +3280,21 @@
               "type": "FIELD",
               "name": "type",
               "content": {
-                "type": "SYMBOL",
-                "name": "string"
+                "type": "CHOICE",
+                "members": [
+                  {
+                    "type": "SYMBOL",
+                    "name": "string"
+                  },
+                  {
+                    "type": "SYMBOL",
+                    "name": "identifier"
+                  },
+                  {
+                    "type": "SYMBOL",
+                    "name": "access"
+                  }
+                ]
               }
             },
             {

diff --git a/src/node-types.json b/src/node-types.json
@@ -716,6 +716,14 @@
         "multiple": false,
         "required": true,
         "types": [
+          {
+            "type": "access",
+            "named": true
+          },
+          {
+            "type": "identifier",
+            "named": true
+          },
           {
             "type": "string",
             "named": true