Add support for && dependencies

FIxes IndianBoy42#6
tgross35 · Jan 4, 2024 · 4c561df · 4c561df
1 parent ecd1704
commit 4c561df
Show file tree

Hide file tree

Showing 7 changed files with 3,704 additions and 3,438 deletions.
diff --git a/grammar.js b/grammar.js
@@ -221,7 +221,7 @@ module.exports = grammar({
         field("recipe_name", $.identifier),
         optional($.parameters),
         ":",
-        repeat($.dependency),
+        optional($.dependencies),
       ),
 
     parameters: ($) =>
@@ -242,7 +242,8 @@ module.exports = grammar({
     variadic_parameter: ($) =>
       seq(field("kleene", choice("*", "+")), $.parameter),
 
-    dependencies: ($) => repeat1($.dependency),
+    dependencies: ($) =>
+      prec.left(seq($.dependency, repeat(seq(optional("&&"), $.dependencies)))),
 
     // dependency    : NAME
     //               | '(' NAME expression* ')'

diff --git a/queries/highlights.scm b/queries/highlights.scm
@@ -68,6 +68,7 @@
   param: (identifier) @variable.parameter
   "="? @operator)
 
+(dependencies "&&" @operator)
 (dependency
   recipe: (identifier) @function)
 (dependency_expression
@@ -92,7 +93,8 @@
   "set"
 ] @keyword
 
-; exclude `=` since it is only an operator in parameters (matching covered there)
+; exclude `=` and `&&` since they are valid in more normal scopes
+; (matching is covered in their parent nodes)
 ["@" "==" "!=" "+" ":=" "*" ":" "/" "?"] @operator
 
 ["(" ")" "[" "]" "{{" "}}" "{" "}"] @punctuation.bracket

diff --git a/src/grammar.json b/src/grammar.json
@@ -958,11 +958,16 @@
           "value": ":"
         },
         {
-          "type": "REPEAT",
-          "content": {
-            "type": "SYMBOL",
-            "name": "dependency"
-          }
+          "type": "CHOICE",
+          "members": [
+            {
+              "type": "SYMBOL",
+              "name": "dependencies"
+            },
+            {
+              "type": "BLANK"
+            }
+          ]
         }
       ]
     },
@@ -1068,10 +1073,40 @@
       ]
     },
     "dependencies": {
-      "type": "REPEAT1",
+      "type": "PREC_LEFT",
+      "value": 0,
       "content": {
-        "type": "SYMBOL",
-        "name": "dependency"
+        "type": "SEQ",
+        "members": [
+          {
+            "type": "SYMBOL",
+            "name": "dependency"
+          },
+          {
+            "type": "REPEAT",
+            "content": {
+              "type": "SEQ",
+              "members": [
+                {
+                  "type": "CHOICE",
+                  "members": [
+                    {
+                      "type": "STRING",
+                      "value": "&&"
+                    },
+                    {
+                      "type": "BLANK"
+                    }
+                  ]
+                },
+                {
+                  "type": "SYMBOL",
+                  "name": "dependencies"
+                }
+              ]
+            }
+          }
+        ]
       }
     },
     "dependency": {

diff --git a/src/node-types.json b/src/node-types.json
@@ -180,6 +180,25 @@
       ]
     }
   },
+  {
+    "type": "dependencies",
+    "named": true,
+    "fields": {},
+    "children": {
+      "multiple": true,
+      "required": true,
+      "types": [
+        {
+          "type": "dependencies",
+          "named": true
+        },
+        {
+          "type": "dependency",
+          "named": true
+        }
+      ]
+    }
+  },
   {
     "type": "dependency",
     "named": true,
@@ -550,7 +569,7 @@
       "required": false,
       "types": [
         {
-          "type": "dependency",
+          "type": "dependencies",
           "named": true
         },
         {
@@ -821,6 +840,10 @@
     "type": "$",
     "named": false
   },
+  {
+    "type": "&&",
+    "named": false
+  },
   {
     "type": "'''",
     "named": false