fix: overlay use/hide (#180)

fixes some failed cases of overlay ```nushell overlay use foo.nu overlay hide -k foo ```
nushell · Jan 27, 2025 · b51db01 · b51db01
1 parent 9822fc6
commit b51db01
Show file tree

Hide file tree

Showing 6 changed files with 290,599 additions and 281,345 deletions.
diff --git a/grammar.js b/grammar.js
@@ -621,7 +621,13 @@ module.exports = grammar({
     overlay_list: (_$) => seq(KEYWORD().overlay, "list"),
 
     overlay_hide: ($) =>
-      seq(KEYWORD().overlay, "hide", field("overlay", $._command_name)),
+      seq(
+        KEYWORD().overlay,
+        "hide",
+        repeat(choice($._flag, $.val_list)),
+        field("overlay", choice($.unquoted, $._stringish)),
+        repeat(choice($._flag, $.val_list)),
+      ),
 
     overlay_new: ($) => seq(KEYWORD().overlay, "new", $._command_name),
 
@@ -630,9 +636,9 @@ module.exports = grammar({
         KEYWORD().overlay,
         "use",
         repeat($._flag),
-        field("overlay", $.identifier),
-        repeat($._flag),
+        field("overlay", choice($.unquoted, $._stringish)),
         optional(seq(KEYWORD().as, field("rename", $._command_name))),
+        repeat($._flag),
       ),
 
     scope_pattern: ($) =>

diff --git a/src/grammar.json b/src/grammar.json
@@ -4917,12 +4917,53 @@
           "type": "STRING",
           "value": "hide"
         },
+        {
+          "type": "REPEAT",
+          "content": {
+            "type": "CHOICE",
+            "members": [
+              {
+                "type": "SYMBOL",
+                "name": "_flag"
+              },
+              {
+                "type": "SYMBOL",
+                "name": "val_list"
+              }
+            ]
+          }
+        },
         {
           "type": "FIELD",
           "name": "overlay",
           "content": {
-            "type": "SYMBOL",
-            "name": "_command_name"
+            "type": "CHOICE",
+            "members": [
+              {
+                "type": "SYMBOL",
+                "name": "unquoted"
+              },
+              {
+                "type": "SYMBOL",
+                "name": "_stringish"
+              }
+            ]
+          }
+        },
+        {
+          "type": "REPEAT",
+          "content": {
+            "type": "CHOICE",
+            "members": [
+              {
+                "type": "SYMBOL",
+                "name": "_flag"
+              },
+              {
+                "type": "SYMBOL",
+                "name": "val_list"
+              }
+            ]
           }
         }
       ]
@@ -4966,15 +5007,17 @@
           "type": "FIELD",
           "name": "overlay",
           "content": {
-            "type": "SYMBOL",
-            "name": "identifier"
-          }
-        },
-        {
-          "type": "REPEAT",
-          "content": {
-            "type": "SYMBOL",
-            "name": "_flag"
+            "type": "CHOICE",
+            "members": [
+              {
+                "type": "SYMBOL",
+                "name": "unquoted"
+              },
+              {
+                "type": "SYMBOL",
+                "name": "_stringish"
+              }
+            ]
           }
         },
         {
@@ -5001,6 +5044,13 @@
               "type": "BLANK"
             }
           ]
+        },
+        {
+          "type": "REPEAT",
+          "content": {
+            "type": "SYMBOL",
+            "name": "_flag"
+          }
         }
       ]
     },

diff --git a/src/node-types.json b/src/node-types.json
@@ -3031,35 +3031,45 @@
         "required": true,
         "types": [
           {
-            "type": "cmd_identifier",
+            "type": "expr_parenthesized",
             "named": true
           },
           {
-            "type": "val_string",
+            "type": "unquoted",
             "named": true
-          }
-        ]
-      },
-      "quoted_name": {
-        "multiple": false,
-        "required": false,
-        "types": [
+          },
+          {
+            "type": "val_interpolated",
+            "named": true
+          },
           {
             "type": "val_string",
             "named": true
-          }
-        ]
-      },
-      "unquoted_name": {
-        "multiple": false,
-        "required": false,
-        "types": [
+          },
           {
-            "type": "cmd_identifier",
+            "type": "val_variable",
             "named": true
           }
         ]
       }
+    },
+    "children": {
+      "multiple": true,
+      "required": false,
+      "types": [
+        {
+          "type": "long_flag",
+          "named": true
+        },
+        {
+          "type": "short_flag",
+          "named": true
+        },
+        {
+          "type": "val_list",
+          "named": true
+        }
+      ]
     }
   },
   {
@@ -3102,7 +3112,23 @@
         "required": true,
         "types": [
           {
-            "type": "identifier",
+            "type": "expr_parenthesized",
+            "named": true
+          },
+          {
+            "type": "unquoted",
+            "named": true
+          },
+          {
+            "type": "val_interpolated",
+            "named": true
+          },
+          {
+            "type": "val_string",
+            "named": true
+          },
+          {
+            "type": "val_variable",
             "named": true
           }
         ]