fix(clap_complete_nushell): order positional arguments by index

Author: nitsky

clap_complete_nushell/src/lib.rs

@@ -219,7 +219,16 @@ fn generate_completion(completions: &mut String, cmd: &Command, is_subcommand: b
         completions.push_str(format!("  export extern {name} [\n").as_str());
     }
 
-    for arg in cmd.get_arguments() {
+    let flags: Vec<_> = cmd.get_arguments().filter(|a| !a.is_positional()).collect();
+    let mut positionals: Vec<_> = cmd.get_positionals().collect();
+
+    positionals.sort_by_key(|arg| arg.get_index());
+
+    for arg in flags {
+        append_argument(arg, name, completions);
+    }
+
+    for arg in positionals {
         append_argument(arg, name, completions);
     }
 

clap_complete_nushell/tests/snapshots/aliases.nu

@@ -8,9 +8,9 @@ module completions {
     --option(-o): string      # cmd option
     --opt: string             # cmd option
     -O: string                # cmd option
-    positional?: string
     --help(-h)                # Print help
     --version(-V)             # Print version
+    positional?: string
   ]
 
 }

clap_complete_nushell/tests/snapshots/feature_sample.nu

@@ -6,13 +6,13 @@ module completions {
 
   # Tests completions
   export extern my-app [
-    file?: path               # some input file
     --config(-c)              # some config file with another line
     --conf                    # some config file with another line
     -C                        # some config file with another line
-    choice?: string@"nu-complete my-app choice"
     --help(-h)                # Print help
     --version(-V)             # Print version
+    file?: path               # some input file
+    choice?: string@"nu-complete my-app choice"
   ]
 
   # tests things

clap_complete_nushell/tests/snapshots/positional_index.nu

@@ -3,12 +3,12 @@ module completions {
   # Tests positional argument index ordering
   export extern my-app [
     --flag(-f)                # some flag
-    third?: string            # third positional
-    first?: string            # first positional
     --option(-o): string      # some option
-    second?: string           # second positional
     --help(-h)                # Print help
     --version(-V)             # Print version
+    first?: string            # first positional
+    second?: string           # second positional
+    third?: string            # third positional
   ]
 
 }

clap_complete_nushell/tests/snapshots/special_commands.nu

@@ -6,13 +6,13 @@ module completions {
 
   # Tests completions
   export extern my-app [
-    file?: path               # some input file
     --config(-c)              # some config file with another line
     --conf                    # some config file with another line
     -C                        # some config file with another line
-    choice?: string@"nu-complete my-app choice"
     --help(-h)                # Print help
     --version(-V)             # Print version
+    file?: path               # some input file
+    choice?: string@"nu-complete my-app choice"
   ]
 
   # tests things
@@ -25,9 +25,9 @@ module completions {
   # tests other things
   export extern "my-app some_cmd" [
     --config: string          # the other case to test
-    ...path: string
     --help(-h)                # Print help
     --version(-V)             # Print version
+    ...path: string
   ]
 
   export extern "my-app some-cmd-with-hyphens" [

clap_complete_nushell/tests/snapshots/sub_subcommands.nu

@@ -6,13 +6,13 @@ module completions {
 
   # Tests completions
   export extern my-app [
-    file?: path               # some input file
     --config(-c)              # some config file with another line
     --conf                    # some config file with another line
     -C                        # some config file with another line
-    choice?: string@"nu-complete my-app choice"
     --help(-h)                # Print help
     --version(-V)             # Print version
+    file?: path               # some input file
+    choice?: string@"nu-complete my-app choice"
   ]
 
   # tests things

clap_complete_nushell/tests/snapshots/value_hint.nu

@@ -14,12 +14,12 @@ module completions {
     --exe(-e): path
     --cmd-name: string
     --cmd(-c): string
-    command_with_args?: string
     --user(-u): string
     --host(-H): string
     --url: string
     --email: string
     --help(-h)                # Print help
+    command_with_args?: string
   ]
 
 }