mirror of
https://github.com/fish-shell/fish-shell.git
synced 2024-11-28 12:13:55 +08:00
4d2f7b0c0d
This makes it so
```fish
if -e foo
# do something
end
```
complains about `-e` not being a command instead of `end` being used
outside of an if-block.
That means both that `-e` could now be used as a command name (it
already can outside of `if`!) *and* that we get a better error!
The only way to get `if` to be a decorated statement now is to use `if
-h` or `if --help` specifically (with a literal option).
The same goes for switch, while and begin.
It would be possible, alternatively, to disallow `if -e` and point
towards using `test` instead, but the "unknown command" message should
already point towards using `test` more than pointing at the
"end" (that might be quite far away).
92 lines
3.0 KiB
Fish
92 lines
3.0 KiB
Fish
#RUN: %fish -C 'set -g fish %fish' %s
|
|
|
|
# A $status used as a command should not impact the location of other errors.
|
|
echo 'echo foo | exec grep # this exec is not allowed!
|
|
|
|
$status
|
|
|
|
# The error might be found here!' | $fish 2>| string replace -r '(.*)' '<$1>'
|
|
|
|
# CHECK: <fish: The 'exec' command can not be used in a pipeline>
|
|
# CHECK: <echo foo | exec grep # this exec is not allowed!>
|
|
# CHECK: < ^~~~~~~~^>
|
|
|
|
echo 'true | time false' | $fish 2>| string replace -r '(.*)' '<$1>'
|
|
# CHECK: <fish: The 'time' command may only be at the beginning of a pipeline>
|
|
# CHECK: <true | time false>
|
|
# CHECK: < ^~~~~~~~~^>
|
|
|
|
|
|
echo '
|
|
|
|
FOO=BAR (true one)
|
|
(true two)
|
|
|
|
# more things
|
|
' | $fish 2>| string replace -r '(.*)' '<$1>'
|
|
|
|
# CHECK: <fish: command substitutions not allowed here>
|
|
# CHECK: <FOO=BAR (true one)>
|
|
# CHECK: < ^~~~~~~~~^>
|
|
|
|
$fish -c 'echo "unfinished "(subshell' 2>| string replace -r '.*' '<$0>'
|
|
# CHECK: <fish: Unexpected end of string, expecting ')'>
|
|
# CHECK: <echo "unfinished "(subshell>
|
|
# CHECK: < ^>
|
|
|
|
$fish -c 'echo "unfinished "$(subshell' 2>| string replace -r '.*' '<$0>'
|
|
# CHECK: <fish: Unexpected end of string, expecting ')'>
|
|
# CHECK: <echo "unfinished "$(subshell>
|
|
# CHECK: < ^>
|
|
|
|
$fish -c 'echo "ok $(echo still ok)syntax error: \x"' 2>| string replace -r '.*' '<$0>'
|
|
# CHECK: <fish: Invalid token '"ok $(echo still ok)syntax error: \x"'>
|
|
# CHECK: <echo "ok $(echo still ok)syntax error: \x">
|
|
# CHECK: < ^~~~~~~~~~~~~~~~^>
|
|
|
|
echo "function this_should_be_an_error" >$TMPDIR/this_should_be_an_error.fish
|
|
$fish -c "set -g fish_function_path $(string escape $TMPDIR); this_should_be_an_error"
|
|
# CHECKERR: ~/temp/this_should_be_an_error.fish (line 1): Missing end to balance this function definition
|
|
# CHECKERR: function this_should_be_an_error
|
|
# CHECKERR: ^~~~~~~^
|
|
# CHECKERR: from sourcing file ~/temp/this_should_be_an_error.fish
|
|
# CHECKERR: source: Error while reading file '{{.*}}/this_should_be_an_error.fish'
|
|
# CHECKERR: fish: Unknown command: this_should_be_an_error
|
|
# CHECKERR: fish:
|
|
# CHECKERR: set -g fish_function_path {{.*}}; this_should_be_an_error
|
|
# CHECKERR: ^~~~~~~~~~~~~~~~~~~~~~^
|
|
|
|
$fish -c 'echo {$}'
|
|
# CHECKERR: fish: Expected a variable name after this $.
|
|
# CHECKERR: echo {$}
|
|
# CHECKERR: ^
|
|
|
|
$fish -c 'echo {$,}'
|
|
# CHECKERR: fish: Expected a variable name after this $.
|
|
# CHECKERR: echo {$,}
|
|
# CHECKERR: ^
|
|
|
|
echo "bind -M" | $fish
|
|
# CHECKERR: bind: -M: option requires an argument
|
|
# CHECKERR: Standard input (line 1):
|
|
# CHECKERR: bind -M
|
|
# CHECKERR: ^
|
|
# CHECKERR: (Type 'help bind' for related documentation)
|
|
|
|
$fish -c 'if -e; end'
|
|
# CHECKERR: fish: Unknown command: -e
|
|
# CHECKERR: fish:
|
|
# CHECKERR: if -e; end
|
|
# CHECKERR: ^^
|
|
|
|
$fish -c 'begin --notanoption; end'
|
|
# CHECKERR: fish: Unknown command: --notanoption
|
|
# CHECKERR: fish:
|
|
# CHECKERR: begin --notanoption; end
|
|
# CHECKERR: ^~~~~~~~~~~~^
|
|
|
|
$fish -c 'begin --help'
|
|
# CHECKERR: fish: begin: missing man page
|
|
# CHECKERR: Documentation may not be installed.
|
|
# CHECKERR: `help begin` will show an online version
|