h/fish-shell
1
Fork 0
mirror of https://github.com/fish-shell/fish-shell.git synced 2026-04-19 23:21:15 -03:00
Code Issues Packages Projects Releases Wiki Activity

functions: Fix --argument-names display

Browse Source 
Mentioned in #10465
This commit is contained in:
Fabian Boehm
2024-05-06 16:50:21 +02:00
parent 2d2b75003d
commit 39b996332e
3 changed files with 6 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
src/function.rs
View File

@@ -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);
}
}

2
tests/checks/function-definition.fish
View File

@@ -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

8
tests/checks/function.fish
View File

@@ -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