Mirrors/fish-shell
2
0
Fork 0
mirror of https://github.com/fish-shell/fish-shell synced 2024-12-29 14:23:09 +00:00
Code Issues Projects Releases Packages Wiki Activity
fish-shell/tests/checks/andandoror.fish

153 lines
3 KiB
Fish
Raw Normal View History

Extended & human-friendly keys See the changelog additions for user-visible changes. Since we enable/disable terminal protocols whenever we pass terminal ownership, tests can no longer run in parallel on the same terminal. For the same reason, readline shortcuts in the gdb REPL will not work anymore. As a remedy, use gdbserver, or lobby for CSI u support in libreadline. Add sleep to some tests, otherwise they fall (both in CI and locally). There are two weird failures on FreeBSD remaining, disable them for now https://github.com/fish-shell/fish-shell/pull/10359/checks?check_run_id=23330096362 Design and implementation borrows heavily from Kakoune. In future, we should try to implement more of the kitty progressive enhancements. Closes #10359
2024-03-30 15:10:12 +00:00
#RUN: %fish %s | %filter-ctrlseqs
Port andandoror test to littlecheck
2019-06-26 19:06:07 +00:00
# "Basic && and || support"
Implement execution of && and || This adds support for basic constructs. if and while is not yet supported.
2018-03-02 02:30:48 +00:00
echo first && echo second
echo third || echo fourth
Run fish_indent on all our fish scripts It's now good enough to do so. We don't allow grid-alignment: ```fish complete -c foo -s b -l barnanana -a '(something)' complete -c foo -s z -a '(something)' ``` becomes ```fish complete -c foo -s b -l barnanana -a '(something)' complete -c foo -s z -a '(something)' ``` It's just more trouble than it is worth. The one part I'd change: We align and/or'd parts of an if-condition with the in-block code: ```fish if true and false dosomething end ``` becomes ```fish if true and false dosomething end ``` but it's not used terribly much and if we ever fix it we can just reindent.
2020-01-13 19:34:22 +00:00
true && false
echo "true && false: $status"
true || false
echo "true || false: $status"
true && false || true
echo "true && false || true: $status"
Port andandoror test to littlecheck
2019-06-26 19:06:07 +00:00
# CHECK: first
# CHECK: second
# CHECK: third
# CHECK: true && false: 1
# CHECK: true || false: 0
# CHECK: true && false || true: 0
Add && and || support to the conditions of if and while This updates the "boolean tail" feature of the if and while conditions to know about job_conjunction, thereby respecting && and ||
2018-03-02 18:23:57 +00:00
Port andandoror test to littlecheck
2019-06-26 19:06:07 +00:00
# "&& and || in if statements"
Add && and || support to the conditions of if and while This updates the "boolean tail" feature of the if and while conditions to know about job_conjunction, thereby respecting && and ||
2018-03-02 18:23:57 +00:00
Run fish_indent on all our fish scripts It's now good enough to do so. We don't allow grid-alignment: ```fish complete -c foo -s b -l barnanana -a '(something)' complete -c foo -s z -a '(something)' ``` becomes ```fish complete -c foo -s b -l barnanana -a '(something)' complete -c foo -s z -a '(something)' ``` It's just more trouble than it is worth. The one part I'd change: We align and/or'd parts of an if-condition with the in-block code: ```fish if true and false dosomething end ``` becomes ```fish if true and false dosomething end ``` but it's not used terribly much and if we ever fix it we can just reindent.
2020-01-13 19:34:22 +00:00
if true || false
echo "if test 1 ok"
end
if true && false
else
echo "if test 2 ok"
end
if true && false; or true
echo "if test 3 ok"
end
if [ 0 = 1 ] || [ 5 -ge 3 ]
echo "if test 4 ok"
end
Port andandoror test to littlecheck
2019-06-26 19:06:07 +00:00
# CHECK: if test 1 ok
# CHECK: if test 2 ok
# CHECK: if test 3 ok
# CHECK: if test 4 ok
Add && and || support to the conditions of if and while This updates the "boolean tail" feature of the if and while conditions to know about job_conjunction, thereby respecting && and ||
2018-03-02 18:23:57 +00:00
Port andandoror test to littlecheck
2019-06-26 19:06:07 +00:00
# "&& and || in while statements"
Add && and || support to the conditions of if and while This updates the "boolean tail" feature of the if and while conditions to know about job_conjunction, thereby respecting && and ||
2018-03-02 18:23:57 +00:00
set alpha 0
set beta 0
set gamma 0
set delta 0
while [ $alpha -lt 2 ] && [ $beta -lt 3 ]
Run fish_indent on all our fish scripts It's now good enough to do so. We don't allow grid-alignment: ```fish complete -c foo -s b -l barnanana -a '(something)' complete -c foo -s z -a '(something)' ``` becomes ```fish complete -c foo -s b -l barnanana -a '(something)' complete -c foo -s z -a '(something)' ``` It's just more trouble than it is worth. The one part I'd change: We align and/or'd parts of an if-condition with the in-block code: ```fish if true and false dosomething end ``` becomes ```fish if true and false dosomething end ``` but it's not used terribly much and if we ever fix it we can just reindent.
2020-01-13 19:34:22 +00:00
or [ $gamma -lt 4 ] || [ $delta -lt 5 ]
Add && and || support to the conditions of if and while This updates the "boolean tail" feature of the if and while conditions to know about job_conjunction, thereby respecting && and ||
2018-03-02 18:23:57 +00:00
echo $alpha $beta $gamma
set alpha ( math $alpha + 1 )
set beta ( math $beta + 1 )
set gamma ( math $gamma + 1 )
set delta ( math $delta + 1 )
end
Port andandoror test to littlecheck
2019-06-26 19:06:07 +00:00
# CHECK: 0 0 0
# CHECK: 1 1 1
# CHECK: 2 2 2
# CHECK: 3 3 3
# CHECK: 4 4 4
Add && and || support to the conditions of if and while This updates the "boolean tail" feature of the if and while conditions to know about job_conjunction, thereby respecting && and ||
2018-03-02 18:23:57 +00:00
Port andandoror test to littlecheck
2019-06-26 19:06:07 +00:00
# "Nots"
Add support for ! as an analog to 'not' ! and not are effectively interchangeable now. Mark them both as operators for syntax highlighting.
2018-03-05 00:06:32 +00:00
Run fish_indent on all our fish scripts It's now good enough to do so. We don't allow grid-alignment: ```fish complete -c foo -s b -l barnanana -a '(something)' complete -c foo -s z -a '(something)' ``` becomes ```fish complete -c foo -s b -l barnanana -a '(something)' complete -c foo -s z -a '(something)' ``` It's just more trouble than it is worth. The one part I'd change: We align and/or'd parts of an if-condition with the in-block code: ```fish if true and false dosomething end ``` becomes ```fish if true and false dosomething end ``` but it's not used terribly much and if we ever fix it we can just reindent.
2020-01-13 19:34:22 +00:00
true && ! false
echo $status
not true && ! false
echo $status
not not not true
echo $status
not ! ! not true
echo $status
not ! echo not !
echo $status
Port andandoror test to littlecheck
2019-06-26 19:06:07 +00:00
# CHECK: 0
# CHECK: 1
# CHECK: 1
# CHECK: 0
# CHECK: not !
# CHECK: 0
Add support for ! as an analog to 'not' ! and not are effectively interchangeable now. Mark them both as operators for syntax highlighting.
2018-03-05 00:06:32 +00:00
Port andandoror test to littlecheck
2019-06-26 19:06:07 +00:00
# "Complex scenarios"
Add && and || support to the conditions of if and while This updates the "boolean tail" feature of the if and while conditions to know about job_conjunction, thereby respecting && and ||
2018-03-02 18:23:57 +00:00
Run fish_indent on all our fish scripts It's now good enough to do so. We don't allow grid-alignment: ```fish complete -c foo -s b -l barnanana -a '(something)' complete -c foo -s z -a '(something)' ``` becomes ```fish complete -c foo -s b -l barnanana -a '(something)' complete -c foo -s z -a '(something)' ``` It's just more trouble than it is worth. The one part I'd change: We align and/or'd parts of an if-condition with the in-block code: ```fish if true and false dosomething end ``` becomes ```fish if true and false dosomething end ``` but it's not used terribly much and if we ever fix it we can just reindent.
2020-01-13 19:34:22 +00:00
begin
echo 1
false
end || begin
echo 2 && echo 3
end
Rework 'and' and 'or' to be "job decorators" This promotes "and" and "or" from a type of statement to "job decorators," as a possible prefix on a job. The point is to rationalize how they interact with && and ||. In the new world 'and' and 'or' apply to a entire job conjunction, i.e. they have "lower precedence." Example: if [ $age -ge 0 ] && [ $age -le 18 ] or [ $age -ge 75 ] && [ $age -le 100 ] echo "Child or senior" end
2018-03-03 02:09:16 +00:00
if false && true
Run fish_indent on all our fish scripts It's now good enough to do so. We don't allow grid-alignment: ```fish complete -c foo -s b -l barnanana -a '(something)' complete -c foo -s z -a '(something)' ``` becomes ```fish complete -c foo -s b -l barnanana -a '(something)' complete -c foo -s z -a '(something)' ``` It's just more trouble than it is worth. The one part I'd change: We align and/or'd parts of an if-condition with the in-block code: ```fish if true and false dosomething end ``` becomes ```fish if true and false dosomething end ``` but it's not used terribly much and if we ever fix it we can just reindent.
2020-01-13 19:34:22 +00:00
or not false
echo 4
Rework 'and' and 'or' to be "job decorators" This promotes "and" and "or" from a type of statement to "job decorators," as a possible prefix on a job. The point is to rationalize how they interact with && and ||. In the new world 'and' and 'or' apply to a entire job conjunction, i.e. they have "lower precedence." Example: if [ $age -ge 0 ] && [ $age -le 18 ] or [ $age -ge 75 ] && [ $age -le 100 ] echo "Child or senior" end
2018-03-03 02:09:16 +00:00
end
Port andandoror test to littlecheck
2019-06-26 19:06:07 +00:00
# CHECK: 1
# CHECK: 2
# CHECK: 3
# CHECK: 4
Correctly implement and --help and or --help
2019-09-08 17:42:24 +00:00
Allow newlines after && and || We do the same for pipes (#1285). This matches POSIX sh behavior.
2020-08-04 19:39:37 +00:00
# Newlines
true &&
echo newline after conjunction
# CHECK: newline after conjunction
false ||
echo newline after disjunction
# CHECK: newline after disjunction
true &&
echo empty lines after conjunction
# CHECK: empty lines after conjunction
true &&
# can have comments here!
echo comment after conjunction
# CHECK: comment after conjunction
Correctly implement and --help and or --help
2019-09-08 17:42:24 +00:00
# --help works
builtin and --help >/dev/null
Update tests for changed error output
2021-11-04 05:52:17 +00:00
# CHECKERR: fish: and: missing man page
# CHECKERR: Documentation may not be installed.
# CHECKERR: `help and` will show an online version
Correctly implement and --help and or --help
2019-09-08 17:42:24 +00:00
echo $status
and --help >/dev/null
Update tests for changed error output
2021-11-04 05:52:17 +00:00
# CHECKERR: fish: and: missing man page
# CHECKERR: Documentation may not be installed.
# CHECKERR: `help and` will show an online version
Correctly implement and --help and or --help
2019-09-08 17:42:24 +00:00
echo $status
# CHECK: 0
# CHECK: 0
builtin or --help >/dev/null
Update tests for changed error output
2021-11-04 05:52:17 +00:00
# CHECKERR: fish: or: missing man page
# CHECKERR: Documentation may not be installed.
# CHECKERR: `help or` will show an online version
Correctly implement and --help and or --help
2019-09-08 17:42:24 +00:00
echo $status
or --help >/dev/null
Update tests for changed error output
2021-11-04 05:52:17 +00:00
# CHECKERR: fish: or: missing man page
# CHECKERR: Documentation may not be installed.
# CHECKERR: `help or` will show an online version
Correctly implement and --help and or --help
2019-09-08 17:42:24 +00:00
echo $status
# CHECK: 0
# CHECK: 0
builtin not --help >/dev/null
Update tests for changed error output
2021-11-04 05:52:17 +00:00
# CHECKERR: fish: not: missing man page
# CHECKERR: Documentation may not be installed.
# CHECKERR: `help not` will show an online version
Correctly implement and --help and or --help
2019-09-08 17:42:24 +00:00
echo $status
not --help >/dev/null
Update tests for changed error output
2021-11-04 05:52:17 +00:00
# CHECKERR: fish: not: missing man page
# CHECKERR: Documentation may not be installed.
# CHECKERR: `help not` will show an online version
Correctly implement and --help and or --help
2019-09-08 17:42:24 +00:00
echo $status
# CHECK: 0
# CHECK: 0
Reference in a new issue Copy permalink