From 39b996332eb1cd83eca5132c7382575d3e3c16c6 Mon Sep 17 00:00:00 2001
From: Fabian Boehm <FHomborg@gmail.com>
Date: Mon, 6 May 2024 16:50:21 +0200
Subject: [PATCH] functions: Fix `--argument-names` display

Mentioned in #10465
---
 src/function.rs                       | 4 +---
 tests/checks/function-definition.fish | 2 +-
 tests/checks/function.fish            | 8 ++++----
 3 files changed, 6 insertions(+), 8 deletions(-)

diff --git a/src/function.rs b/src/function.rs
index 8c9ba2696..e89cba16e 100644
--- a/src/function.rs
+++ b/src/function.rs
@@ -458,10 +458,8 @@ pub fn annotated_definition(&self, name: &wstr) -> WString {
 
         let named = &self.named_arguments;
         if !named.is_empty() {
-            out.push_str(" --argument");
             for name in named {
-                // TODO: should these names be escaped?
-                sprintf!(=> &mut out, " %ls", name);
+                sprintf!(=> &mut out, " --argument-names %ls", name);
             }
         }
 
diff --git a/tests/checks/function-definition.fish b/tests/checks/function-definition.fish
index 9ee933f05..8c6248bcd 100644
--- a/tests/checks/function-definition.fish
+++ b/tests/checks/function-definition.fish
@@ -8,7 +8,7 @@ end
 
 functions stuff
 #CHECK: # Defined in {{.*}}
-#CHECK: function stuff --argument a b c
+#CHECK: function stuff --argument-names a --argument-names b --argument-names c
 #CHECK:    # This is a comment
 #CHECK:    echo stuff
 #CHECK:    # This is another comment
diff --git a/tests/checks/function.fish b/tests/checks/function.fish
index e665e89ec..504447950 100644
--- a/tests/checks/function.fish
+++ b/tests/checks/function.fish
@@ -108,16 +108,16 @@ test "$name3[3..-1]" = "$name3a[3..-1]"; and echo "3 = 3a"
 # Test the first two lines.
 string join \n -- $name1[1..2]
 #CHECK: # Defined in {{(?:(?!, copied).)*}}
-#CHECK: function name1 --argument arg1 arg2
+#CHECK: function name1 --argument-names arg1 --argument-names arg2
 string join \n -- $name1a[1..2]
 #CHECK: # Defined in {{.*}}, copied in {{.*}}
-#CHECK: function name1a --argument arg1 arg2
+#CHECK: function name1a --argument-names arg1 --argument-names arg2
 string join \n -- $name3[1..2]
 #CHECK: # Defined in {{(?:(?!, copied).)*}}
-#CHECK: function name3 --argument arg1 arg2
+#CHECK: function name3 --argument-names arg1 --argument-names arg2
 string join \n -- $name3a[1..2]
 #CHECK: # Defined in {{.*}}, copied in {{.*}}
-#CHECK: function name3a --argument arg1 arg2
+#CHECK: function name3a --argument-names arg1 --argument-names arg2
 
 function test
     echo banana