feat!: attributes and folds.scm

blindFS · Feb 12, 2025 · f720f62 · f720f62
1 parent d0b26e4
commit f720f62
Show file tree

Hide file tree

Showing 7 changed files with 303,994 additions and 300,074 deletions.
diff --git a/grammar.js b/grammar.js
@@ -131,10 +131,21 @@ module.exports = grammar({
     _pipe_separator: ($) =>
       repeat1(seq(repeat($._newline), choice(PUNC().pipe, ...REDIR_PIPE()))),
 
-    /// Top Level Items
+    /// Attributes
+    attribute_list: ($) =>
+      repeat1(seq($.attribute, choice(PUNC().semicolon, $._newline))),
+    attribute_identifier: (_$) =>
+      token.immediate(/[0-9\p{XID_Start}][0-9\p{XID_Continue}_-]*/),
+    attribute: ($) =>
+      seq(
+        field("type", seq(PUNC().at, $.attribute_identifier)),
+        repeat(seq($._space, optional($._cmd_arg))),
+      ),
 
+    /// Top Level Items
     decl_def: ($) =>
       seq(
+        optional($.attribute_list),
         optional(MODIFIER().visibility),
         KEYWORD().def,
         repeat($.long_flag),

diff --git a/queries/nu/folds.scm b/queries/nu/folds.scm
@@ -0,0 +1,10 @@
+[
+  (attribute_list)
+  (block)
+  (command_list)
+  (parameter_bracks)
+  (record_body)
+  (val_list)
+  (val_table)
+  (val_closure)
+] @fold
diff --git a/queries/nu/highlights.scm b/queries/nu/highlights.scm
@@ -180,6 +180,7 @@ key: (identifier) @property
 
 (param_long_flag (long_flag_identifier) @attribute)
 (param_short_flag (param_short_flag_identifier) @attribute)
+(attribute (attribute_identifier) @attribute)
 
 (short_flag (short_flag_identifier) @attribute)
 (long_flag_identifier) @attribute

diff --git a/src/grammar.json b/src/grammar.json
@@ -2050,9 +2050,99 @@
         ]
       }
     },
+    "attribute_list": {
+      "type": "REPEAT1",
+      "content": {
+        "type": "SEQ",
+        "members": [
+          {
+            "type": "SYMBOL",
+            "name": "attribute"
+          },
+          {
+            "type": "CHOICE",
+            "members": [
+              {
+                "type": "STRING",
+                "value": ";"
+              },
+              {
+                "type": "SYMBOL",
+                "name": "_newline"
+              }
+            ]
+          }
+        ]
+      }
+    },
+    "attribute_identifier": {
+      "type": "IMMEDIATE_TOKEN",
+      "content": {
+        "type": "PATTERN",
+        "value": "[0-9\\p{XID_Start}][0-9\\p{XID_Continue}_-]*"
+      }
+    },
+    "attribute": {
+      "type": "SEQ",
+      "members": [
+        {
+          "type": "FIELD",
+          "name": "type",
+          "content": {
+            "type": "SEQ",
+            "members": [
+              {
+                "type": "STRING",
+                "value": "@"
+              },
+              {
+                "type": "SYMBOL",
+                "name": "attribute_identifier"
+              }
+            ]
+          }
+        },
+        {
+          "type": "REPEAT",
+          "content": {
+            "type": "SEQ",
+            "members": [
+              {
+                "type": "SYMBOL",
+                "name": "_space"
+              },
+              {
+                "type": "CHOICE",
+                "members": [
+                  {
+                    "type": "SYMBOL",
+                    "name": "_cmd_arg"
+                  },
+                  {
+                    "type": "BLANK"
+                  }
+                ]
+              }
+            ]
+          }
+        }
+      ]
+    },
     "decl_def": {
       "type": "SEQ",
       "members": [
+        {
+          "type": "CHOICE",
+          "members": [
+            {
+              "type": "SYMBOL",
+              "name": "attribute_list"
+            },
+            {
+              "type": "BLANK"
+            }
+          ]
+        },
         {
           "type": "CHOICE",
           "members": [

diff --git a/src/node-types.json b/src/node-types.json
@@ -65,6 +65,163 @@
       }
     }
   },
+  {
+    "type": "attribute",
+    "named": true,
+    "fields": {
+      "arg": {
+        "multiple": true,
+        "required": false,
+        "types": [
+          {
+            "type": "expr_parenthesized",
+            "named": true
+          },
+          {
+            "type": "val_binary",
+            "named": true
+          },
+          {
+            "type": "val_bool",
+            "named": true
+          },
+          {
+            "type": "val_closure",
+            "named": true
+          },
+          {
+            "type": "val_date",
+            "named": true
+          },
+          {
+            "type": "val_duration",
+            "named": true
+          },
+          {
+            "type": "val_filesize",
+            "named": true
+          },
+          {
+            "type": "val_interpolated",
+            "named": true
+          },
+          {
+            "type": "val_list",
+            "named": true
+          },
+          {
+            "type": "val_nothing",
+            "named": true
+          },
+          {
+            "type": "val_number",
+            "named": true
+          },
+          {
+            "type": "val_range",
+            "named": true
+          },
+          {
+            "type": "val_record",
+            "named": true
+          },
+          {
+            "type": "val_string",
+            "named": true
+          },
+          {
+            "type": "val_table",
+            "named": true
+          },
+          {
+            "type": "val_variable",
+            "named": true
+          }
+        ]
+      },
+      "arg_spread": {
+        "multiple": true,
+        "required": false,
+        "types": [
+          {
+            "type": "expr_parenthesized",
+            "named": true
+          },
+          {
+            "type": "val_list",
+            "named": true
+          },
+          {
+            "type": "val_variable",
+            "named": true
+          }
+        ]
+      },
+      "arg_str": {
+        "multiple": true,
+        "required": false,
+        "types": [
+          {
+            "type": "val_string",
+            "named": true
+          }
+        ]
+      },
+      "flag": {
+        "multiple": true,
+        "required": false,
+        "types": [
+          {
+            "type": "long_flag",
+            "named": true
+          },
+          {
+            "type": "short_flag",
+            "named": true
+          }
+        ]
+      },
+      "redir": {
+        "multiple": true,
+        "required": false,
+        "types": [
+          {
+            "type": "redirection",
+            "named": true
+          }
+        ]
+      },
+      "type": {
+        "multiple": true,
+        "required": true,
+        "types": [
+          {
+            "type": "@",
+            "named": false
+          },
+          {
+            "type": "attribute_identifier",
+            "named": true
+          }
+        ]
+      }
+    }
+  },
+  {
+    "type": "attribute_list",
+    "named": true,
+    "fields": {},
+    "children": {
+      "multiple": true,
+      "required": true,
+      "types": [
+        {
+          "type": "attribute",
+          "named": true
+        }
+      ]
+    }
+  },
   {
     "type": "block",
     "named": true,
@@ -1322,6 +1479,10 @@
       "multiple": true,
       "required": false,
       "types": [
+        {
+          "type": "attribute_list",
+          "named": true
+        },
         {
           "type": "long_flag",
           "named": true
@@ -5672,6 +5833,10 @@
     "type": "as",
     "named": false
   },
+  {
+    "type": "attribute_identifier",
+    "named": true
+  },
   {
     "type": "binary",
     "named": false