fix: space issues

Author: blindFS

languages.ncl

@@ -4,9 +4,8 @@
       extensions = ["nu"],
       grammar.source.git = {
         git = "https://github.com/blindfs/tree-sitter-nu.git",
-        rev = "46ca5853edec9f3bc19a36d68d1311c1f36cd540",
+        rev = "b3ececada7a378336732d17351e824919512d3f5",
       },
-
     },
   },
 }

languages/nu.scm

@@ -13,6 +13,9 @@
   (val_number)
   (val_string)
   (val_variable)
+  (cmd_identifier)
+  (identifier)
+  (path)
 ] @leaf
 
 ;; keep empty lines
@@ -31,40 +34,6 @@
 
 [
   "="
-  (match_guard)
-  (short_flag)
-  (long_flag)
-] @prepend_space
-
-;; FIXME: temp workaround for the whitespace issue
-(short_flag "=" @prepend_antispace)
-(long_flag "=" @prepend_antispace)
-(param_value "=" @append_space)
-
-(assignment
-  opr: _
-  rhs: (pipeline
-    (pipe_element
-      (val_string
-        (raw_string_begin)
-      )
-    )
-  ) @prepend_space
-)
-
-(
-  "="
-  .
-  (pipeline
-    (pipe_element
-      (val_string
-        (raw_string_begin)
-      )
-    )
-  ) @prepend_space
-)
-
-[
   "->"
   "=>"
   "alias"
@@ -93,6 +62,7 @@
   "source-env"
   "use"
   "where"
+  (match_guard)
 ] @prepend_space @append_space
 
 (pipeline
@@ -104,7 +74,7 @@
   opr: _ @append_input_softline @prepend_input_softline
 )
 
-(assignment opr: _ @prepend_space)
+(assignment opr: _ @prepend_space @append_space)
 
 (where_predicate
   opr: _ @append_input_softline @prepend_input_softline
@@ -119,19 +89,12 @@
   .
   (_)
 )
+(short_flag "=" @prepend_antispace @append_antispace)
+(long_flag "=" @prepend_antispace @append_antispace)
+(env_var "=" @prepend_antispace @append_antispace)
 
 (overlay_hide
-  overlay: _ @prepend_space
-)
-
-;; FIXME: temp workaround for the whitespace issue
-(hide_env
-  [
-    (short_flag)
-    (long_flag)
-  ] @append_antispace
-  .
-  (_)
+  overlay: _ @prepend_space @append_space
 )
 
 (hide_env
@@ -354,3 +317,10 @@
   key: _ @prepend_space
   (#delimiter! ",")
 )
+
+(composite_type
+  type: _ @append_delimiter
+  .
+  type: _ @prepend_space
+  (#delimiter! ",")
+)

test/expected_decl.nu

@@ -49,7 +49,10 @@ use module [ "foo" bar ]
 
 # decl_module
 module greetings {
-  export def hello [name: string] {
+  export def hello [
+    name: string
+    --experimental-options: oneof<list<string>, string> # enable or disable experimental options
+  ] {
     $"hello ($name)!"
   }
 

test/input_decl.nu

@@ -44,7 +44,8 @@ use module ["foo" bar]
 
 # decl_module
 module greetings {
-    export def hello [name: string] {
+    export def hello [name: string --experimental-options: oneof<list<string>, string> # enable or disable experimental options
+] {
         $"hello ($name)!"
     }