Mirrors/fish-shell
2
0
Fork 0
mirror of https://github.com/fish-shell/fish-shell synced 2024-09-21 15:01:53 +00:00
Code Issues Projects Releases Packages Wiki Activity

Clarify that the variable/mode *name* is invalid

Browse source 
When you do

```fish
set foo-bar baz
```

"foo-baz" isn't usable as a variable *name*. When you just say the
"variable" is invalid that could also be interpreted to be a special
type of variable or something.
This commit is contained in:
Fabian Homborg 2022-04-08 16:36:06 +02:00
parent 789b2010f5
commit 31e2476fc8
3 changed files with 8 additions and 8 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
src/builtin.h
View file

@ -60,10 +60,10 @@ struct builtin_data_t {
#define BUILTIN_ERR_MAX_ARG_COUNT1 _(L"%ls: expected <= %d arguments; got %d\n") #define BUILTIN_ERR_MAX_ARG_COUNT1 _(L"%ls: expected <= %d arguments; got %d\n")
/// Error message for invalid variable name. /// Error message for invalid variable name.
#define BUILTIN_ERR_VARNAME _(L"%ls: %ls: invalid variable. See `help identifiers`\n") #define BUILTIN_ERR_VARNAME _(L"%ls: %ls: invalid variable name. See `help identifiers`\n")
/// Error message for invalid bind mode name. /// Error message for invalid bind mode name.
#define BUILTIN_ERR_BIND_MODE _(L"%ls: %ls: invalid mode. See `help identifiers`\n") #define BUILTIN_ERR_BIND_MODE _(L"%ls: %ls: invalid mode name. See `help identifiers`\n")
/// Error message when too many arguments are supplied to a builtin. /// Error message when too many arguments are supplied to a builtin.
#define BUILTIN_ERR_TOO_MANY_ARGUMENTS _(L"%ls: too many arguments\n") #define BUILTIN_ERR_TOO_MANY_ARGUMENTS _(L"%ls: too many arguments\n")

4
tests/checks/bind.fish
View file

@ -5,11 +5,11 @@
# Verify that an invalid bind mode is rejected. >&2 # Verify that an invalid bind mode is rejected. >&2
bind -m 'bad bind mode' \cX true bind -m 'bad bind mode' \cX true
# CHECKERR: bind: bad bind mode: invalid mode. See `help identifiers` # CHECKERR: bind: bad bind mode: invalid mode name. See `help identifiers`
# Verify that an invalid bind mode target is rejected. >&2 # Verify that an invalid bind mode target is rejected. >&2
bind -M bind-mode \cX true bind -M bind-mode \cX true
# CHECKERR: bind: bind-mode: invalid mode. See `help identifiers` # CHECKERR: bind: bind-mode: invalid mode name. See `help identifiers`
# CHECKERR: bind: No binding found for sequence '\t' # CHECKERR: bind: No binding found for sequence '\t'
# This should succeed and result in a success, zero, status. # This should succeed and result in a success, zero, status.

8
tests/checks/set.fish
View file

@ -471,7 +471,7 @@ env | grep __fish_empty_uvar
for a,b in y 1 z 3 for a,b in y 1 z 3
echo $a,$b echo $a,$b
end end
# CHECKERR: {{.*}} for: a,b: invalid variable. See `help identifiers` # CHECKERR: {{.*}} for: a,b: invalid variable name. See `help identifiers`
# CHECKERR: for a,b in y 1 z 3 # CHECKERR: for a,b in y 1 z 3
# CHECKERR: ^ # CHECKERR: ^
@ -530,7 +530,7 @@ sh -c "EDITOR='vim -g' $FISH -c "'\'set -S EDITOR\'' | string match -r -e 'globa
# Verify behavior of `set --show` given an invalid var name # Verify behavior of `set --show` given an invalid var name
set --show 'argle bargle' set --show 'argle bargle'
#CHECKERR: set: argle bargle: invalid variable. See `help identifiers` #CHECKERR: set: argle bargle: invalid variable name. See `help identifiers`
#CHECKERR: {{.*}}set.fish (line {{\d+}}): #CHECKERR: {{.*}}set.fish (line {{\d+}}):
#CHECKERR: set --show 'argle bargle' #CHECKERR: set --show 'argle bargle'
#CHECKERR: ^ #CHECKERR: ^
@ -757,14 +757,14 @@ echo $status
true true
set "" foo set "" foo
#CHECKERR: set: : invalid variable. See `help identifiers` #CHECKERR: set: : invalid variable name. See `help identifiers`
#CHECKERR: {{.*}}set.fish (line {{\d+}}): #CHECKERR: {{.*}}set.fish (line {{\d+}}):
#CHECKERR: set "" foo #CHECKERR: set "" foo
#CHECKERR: ^ #CHECKERR: ^
#CHECKERR: (Type 'help set' for related documentation) #CHECKERR: (Type 'help set' for related documentation)
set --show "" set --show ""
#CHECKERR: set: : invalid variable. See `help identifiers` #CHECKERR: set: : invalid variable name. See `help identifiers`
#CHECKERR: {{.*}}set.fish (line {{\d+}}): #CHECKERR: {{.*}}set.fish (line {{\d+}}):
#CHECKERR: set --show "" #CHECKERR: set --show ""
#CHECKERR: ^ #CHECKERR: ^