Add support for attributes

Fixes: IndianBoy42#19
tgross35 · Jan 3, 2024 · 3718a51 · 3718a51
1 parent 3bb2032
commit 3718a51
Show file tree

Hide file tree

Showing 9 changed files with 1,971 additions and 1,740 deletions.
diff --git a/GRAMMAR.md b/GRAMMAR.md
@@ -89,7 +89,9 @@ string        : STRING
 sequence      : expression ',' sequence
               | expression ','?
 
-recipe        : '@'? NAME parameter* variadic? ':' dependency* body?
+recipe        : attribute? '@'? NAME parameter* variadic? ':' dependency* body?
+
+attribute     : '[' NAME ']' eol
 
 parameter     : '$'? NAME
               | '$'? NAME '=' value

diff --git a/grammar.js b/grammar.js
@@ -136,10 +136,13 @@ module.exports = grammar({
         seq($.expression, optional(",")),
       ),
 
-    // recipe        : '@'? NAME parameter* variadic_parameters? ':' dependency* body?
-    recipe: ($) => seq($.recipeheader, $.NEWLINE, optional($.body)),
+    attribute: ($) => seq("[", $.NAME, "]", $.eol),
 
-    recipeheader: ($) =>
+    // recipe        : attribute? '@'? NAME parameter* variadic_parameters? ':' dependency* body?
+    recipe: ($) =>
+      seq(optional($.attribute), $.recipe_header, $.NEWLINE, optional($.body)),
+
+    recipe_header: ($) =>
       seq(
         optional("@"),
         $.NAME,

diff --git a/queries/highlights.scm b/queries/highlights.scm
@@ -8,7 +8,7 @@
 (call (NAME) @function)
 (dependency (NAME) @function)
 (depcall (NAME) @function)
-(recipeheader (NAME) @function)
+(recipe_header (NAME) @function)
 
 (depcall (expression) @parameter)
 (parameter) @parameter

diff --git a/queries/locals.scm b/queries/locals.scm
@@ -7,5 +7,5 @@
 (call (NAME) @reference.function)
 (dependency (NAME) @reference.function)
 (depcall (NAME) @reference.function)
-(recipeheader (NAME) @definition.function)
+(recipe_header (NAME) @definition.function)
 
diff --git a/queries/textobjects.scm b/queries/textobjects.scm
@@ -42,7 +42,7 @@
 )
 
 (item [(alias) (assignment) (export) (setting)]) @statement.outer
-(recipeheader) @statement.outer
+(recipe_header) @statement.outer
 (line) @statement.outer
 
 (comment) @comment.outer
diff --git a/src/grammar.json b/src/grammar.json
@@ -602,12 +602,45 @@
         }
       ]
     },
+    "attribute": {
+      "type": "SEQ",
+      "members": [
+        {
+          "type": "STRING",
+          "value": "["
+        },
+        {
+          "type": "SYMBOL",
+          "name": "NAME"
+        },
+        {
+          "type": "STRING",
+          "value": "]"
+        },
+        {
+          "type": "SYMBOL",
+          "name": "eol"
+        }
+      ]
+    },
     "recipe": {
       "type": "SEQ",
       "members": [
+        {
+          "type": "CHOICE",
+          "members": [
+            {
+              "type": "SYMBOL",
+              "name": "attribute"
+            },
+            {
+              "type": "BLANK"
+            }
+          ]
+        },
         {
           "type": "SYMBOL",
-          "name": "recipeheader"
+          "name": "recipe_header"
         },
         {
           "type": "SYMBOL",
@@ -627,7 +660,7 @@
         }
       ]
     },
-    "recipeheader": {
+    "recipe_header": {
       "type": "SEQ",
       "members": [
         {

diff --git a/src/node-types.json b/src/node-types.json
@@ -48,6 +48,25 @@
       ]
     }
   },
+  {
+    "type": "attribute",
+    "named": true,
+    "fields": {},
+    "children": {
+      "multiple": true,
+      "required": true,
+      "types": [
+        {
+          "type": "NAME",
+          "named": true
+        },
+        {
+          "type": "eol",
+          "named": true
+        }
+      ]
+    }
+  },
   {
     "type": "body",
     "named": true,
@@ -398,12 +417,16 @@
           "type": "NEWLINE",
           "named": true
         },
+        {
+          "type": "attribute",
+          "named": true
+        },
         {
           "type": "body",
           "named": true
         },
         {
-          "type": "recipeheader",
+          "type": "recipe_header",
           "named": true
         }
       ]
@@ -425,7 +448,7 @@
     }
   },
   {
-    "type": "recipeheader",
+    "type": "recipe_header",
     "named": true,
     "fields": {},
     "children": {