Merge pull request nushell#66 from kit494way/fix-command-identifier

Add symbols to command identifier
mrdgo · Jan 11, 2024 · 192f8f6 · 192f8f6
2 parents 747cb55 + 3f6d775
commit 192f8f6
Show file tree

Hide file tree

Showing 4 changed files with 16,116 additions and 10,341 deletions.
diff --git a/corpus/decl/def.nu b/corpus/decl/def.nu
@@ -710,3 +710,17 @@ def test [x: record<key: list<int>>]: nothing -> record<key: list<int>> {
         (list_type
           (flat_type))))
     (block)))
+
+======
+def-031-name-special-keys
+======
+
+def a_-!? [] {}
+
+-----
+
+(nu_script
+  (decl_def
+    (cmd_identifier)
+    (parameter_bracks)
+    (block)))
diff --git a/grammar.js b/grammar.js
@@ -45,10 +45,10 @@ module.exports = grammar({
 
     /// Identifiers
     // NOTE:
-    // for simplicity, i used the `rust` definition of an identifier
+    // for simplicity, i used the `rust` definition of an identifier and some symbols
     // but in `nu` the rule is way more relaxed than this
 
-    cmd_identifier: ($) => token(/[_\p{XID_Start}][_\-\p{XID_Continue}]*/),
+    cmd_identifier: ($) => token(/[_\p{XID_Start}][_\-\p{XID_Continue}!?]*/),
 
     identifier: ($) => token(/[_\p{XID_Start}][_\p{XID_Continue}]*/),
 

diff --git a/src/grammar.json b/src/grammar.json
@@ -1298,7 +1298,7 @@
       "type": "TOKEN",
       "content": {
         "type": "PATTERN",
-        "value": "[_\\p{XID_Start}][_\\-\\p{XID_Continue}]*"
+        "value": "[_\\p{XID_Start}][_\\-\\p{XID_Continue}!?]*"
       }
     },
     "identifier": {