github-mirror/fish-shell
2
0
Fork 0
mirror of https://github.com/fish-shell/fish-shell.git synced 2024-12-01 06:53:39 +08:00
Code Issues Actions 2 Packages Projects Releases Wiki Activity
6325b3662d
fish-shell/tests/checks/syntax-error-location.fish

76 lines
2.6 KiB
Fish
Raw Normal View History

Don't set error offset for $status This would break the location of any prior errors without doing anything of value. E.g. ```fish echo foo | exec grep # this exec is not allowed! $status somethingelse # The error might be found here! ``` Would apply the offset of `$status` to the offset of `exec`, locating the error for `exec` somewhere after $status!
2021-09-28 23:15:33 +08:00
#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!>
Add length to the parse_util syntax errors
2022-08-12 22:53:31 +08:00
# CHECK: < ^~~~~~~~^>
Don't add expansion error offset twice Like the $status commit, this would add the offset to already existing errors, so ```fish (foo) (bar) something ``` would see the "(foo)" error, store the correct error location, then see the "(bar)" error, and *add the offset of (bar)* to the "(foo)" error location. Solve this by making a new error list and appending it to the existing ones. There's a few other ways to solve this, including: - Stopping after the first error (we only display the first anyway, I think?) - Making it so the source location has an "absolute" flag that shows the offset has already been added (but do we ever need to add two offsets?) I went with the simpler fix.
2021-09-28 23:59:59 +08:00
Emit an error if time is used past the first command in a pipeline Fixes #8841
2022-04-01 07:14:59 +08:00
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>
Add length to the parse_util syntax errors
2022-08-12 22:53:31 +08:00
# CHECK: < ^~~~~~~~~^>
Emit an error if time is used past the first command in a pipeline Fixes #8841
2022-04-01 07:14:59 +08:00
Don't add expansion error offset twice Like the $status commit, this would add the offset to already existing errors, so ```fish (foo) (bar) something ``` would see the "(foo)" error, store the correct error location, then see the "(bar)" error, and *add the offset of (bar)* to the "(foo)" error location. Solve this by making a new error list and appending it to the existing ones. There's a few other ways to solve this, including: - Stopping after the first error (we only display the first anyway, I think?) - Making it so the source location has an "absolute" flag that shows the offset has already been added (but do we ever need to add two offsets?) I went with the simpler fix.
2021-09-28 23:59:59 +08:00
echo '
Unallowed command subst error: add missing newline and simplify Fixes ommitted newline char shown after complete -n'(foo)' Also axes the 'contains syntax errors' line before the error. Update tests before > complete -n'(foo)' complete: Condition '(foo)' contained a syntax error complete: Command substitutions not allowed⏎ after > complete -n'(foo)' complete: -n '(foo)': command substitutions not allowed here
2022-10-27 10:50:46 +08:00
FOO=BAR (true one)
Don't add expansion error offset twice Like the $status commit, this would add the offset to already existing errors, so ```fish (foo) (bar) something ``` would see the "(foo)" error, store the correct error location, then see the "(bar)" error, and *add the offset of (bar)* to the "(foo)" error location. Solve this by making a new error list and appending it to the existing ones. There's a few other ways to solve this, including: - Stopping after the first error (we only display the first anyway, I think?) - Making it so the source location has an "absolute" flag that shows the offset has already been added (but do we ever need to add two offsets?) I went with the simpler fix.
2021-09-28 23:59:59 +08:00
(true two)
# more things
' | $fish 2>| string replace -r '(.*)' '<$1>'
Unallowed command subst error: add missing newline and simplify Fixes ommitted newline char shown after complete -n'(foo)' Also axes the 'contains syntax errors' line before the error. Update tests before > complete -n'(foo)' complete: Condition '(foo)' contained a syntax error complete: Command substitutions not allowed⏎ after > complete -n'(foo)' complete: -n '(foo)': command substitutions not allowed here
2022-10-27 10:50:46 +08:00
# CHECK: <fish: command substitutions not allowed here>
# CHECK: <FOO=BAR (true one)>
# CHECK: < ^~~~~~~~~^>
Report sub-token error locations again This fixes a regression about where we report errors: echo error(here old: ^ fixed: ^ Commit 0c22f67bd (Remove the old parser bits, 2020-07-02) removed uses of "error_offset_within_token" so we always report errors at token start. Add it back, hopefully restoring the 3.1.2 behavior. Note that for cases like echo "$(" we report "unbalanced quotes" because we treat the $( as double quote. Giving a better error seems hard because of the ambguity - we don't know if quote is meant to be inside or outside the command substitution.
2021-12-04 21:41:54 +08:00
$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: < ^>
Autoload: Call the parser directly instead of going via "subshell" This used to call exec_subshell, which has two issues: 1. It creates a command substitution block which shows up in a stack trace 2. It does much more work than necessary This removes a useless "in command substitution" from an error message in an autoloaded file, and it speeds up autoloading a bit (not measurable in actual benchmarks, but microbenchmarks are 2x).
2022-03-24 00:33:24 +08:00
Make string syntax error location a bit more precise String tokens are subdivided by command substitutions. Some syntax errors can occur in the gap between two command substitutions. Make the caret point to the start of that gap, instead of the token start.
2022-04-03 22:29:13 +08:00
$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">
Add length to the parse_util syntax errors
2022-08-12 22:53:31 +08:00
# CHECK: < ^~~~~~~~~~~~~~~~^>
Make string syntax error location a bit more precise String tokens are subdivided by command substitutions. Some syntax errors can occur in the gap between two command substitutions. Make the caret point to the start of that gap, instead of the token start.
2022-04-03 22:29:13 +08:00
tests: Rename a function NetBSD actually has a /usr/bin/error by default, so we ended up starting that.
2022-07-24 23:51:26 +08:00
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
Add acceptable errors to tests
2022-08-11 23:22:03 +08:00
# CHECKERR: ^~~~~~~^
tests: Rename a function NetBSD actually has a /usr/bin/error by default, so we ended up starting that.
2022-07-24 23:51:26 +08:00
# 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
Make string syntax error location a bit more precise String tokens are subdivided by command substitutions. Some syntax errors can occur in the gap between two command substitutions. Make the caret point to the start of that gap, instead of the token start.
2022-04-03 22:29:13 +08:00
# CHECKERR: fish:
tests: Rename a function NetBSD actually has a /usr/bin/error by default, so we ended up starting that.
2022-07-24 23:51:26 +08:00
# CHECKERR: set -g fish_function_path {{.*}}; this_should_be_an_error
Add acceptable errors to tests
2022-08-11 23:22:03 +08:00
# CHECKERR: ^~~~~~~~~~~~~~~~~~~~~~^
Fix error for {$} Fixes #9337
2022-11-16 02:02:30 +08:00
$fish -c 'echo {$}'
fixup!
2022-11-16 02:03:06 +08:00
# CHECKERR: fish: Expected a variable name after this $.
Fix error for {$} Fixes #9337
2022-11-16 02:02:30 +08:00
# CHECKERR: echo {$}
# CHECKERR: ^
$fish -c 'echo {$,}'
# CHECKERR: fish: Expected a variable name after this $.
# CHECKERR: echo {$,}
# CHECKERR: ^
Revert "Remove print_hints from builtin_missing_argument and builtin_unknown_option" Unfortunately print_hints was true *by default* - so for all builtins that didn't pass it it would now be false instead. This resulted in the trailer missing, which includes the line number and context. So if you ran a script that includes `bind -M` the error message would now just be "bind: -M: option requires an argument", with no indication as to where. This reverts commit 8a50d47a469b547581c8fafede50d740230d42f2.
2022-12-23 00:23:42 +08:00
echo "bind -M" | $fish
# CHECKERR: bind: -M: option requires an argument
# CHECKERR: Standard input (line 1):
# CHECKERR: bind -M
# CHECKERR: ^
Fix tests I always forget that littlecheck escapes these
2022-12-23 00:34:10 +08:00
# CHECKERR: (Type 'help bind' for related documentation)
Revert "Remove print_hints from builtin_missing_argument and builtin_unknown_option" Unfortunately print_hints was true *by default* - so for all builtins that didn't pass it it would now be false instead. This resulted in the trailer missing, which includes the line number and context. So if you ran a script that includes `bind -M` the error message would now just be "bind: -M: option requires an argument", with no indication as to where. This reverts commit 8a50d47a469b547581c8fafede50d740230d42f2.
2022-12-23 00:23:42 +08:00
Reference in New Issue Copy Permalink