mirror of
https://github.com/fish-shell/fish-shell.git
synced 2025-02-16 06:12:44 +08:00
1bf2b43d30
For compound commands we already have begin/end but
> it is long, which it is not convenient for the command line
> it is different than {} which shell users have been using for >50 years
The difference from {} can break muscle memory and add extra steps
when I'm trying to write simple commands that work in any shell.
Fix that by embracing the traditional style too.
---
Since { and } have always been special syntax in fish, we can also
allow
{ }
{ echo }
which I find intuitive even without having used a shell that supports
this (like zsh. The downside is that this doesn't work in some other
shells. The upside is in aesthetics and convenience (this is for
interactive use). Not completely sure about this.
---
This implementation adds a hack to the tokenizer: '{' is usually a
brace expansion. Make it compound command when in command position
(not something the tokenizer would normally know). We need to disable
this when parsing a freestanding argument lists (in "complete somecmd
-a "{true,false}"). It's not really clear what "read -t" should do.
For now, keep the existing behavior (don't parse compound statements).
Add another hack to increase backwards compatibility: parse something
like "{ foo }" as brace statement only if it has a space after
the opening brace. This style is less likely to be used for brace
expansion. Perhaps we can change this in future (I'll make a PR).
Use separate terminal token types for braces; we could make the
left brace an ordinary string token but since string tokens undergo
unescaping during expansion etc., every such place would need to know
whether it's dealing with a command or an argument. Certainly possible
but it seems simpler (especially for tab-completions) to strip braces
in the parser. We could change this.
---
In future we could allow the following alternative syntax (which is
invalid today).
if true {
}
if true; {
}
Closes #10895
Closes #10898
37 lines
1.3 KiB
Fish
37 lines
1.3 KiB
Fish
#RUN: fish=%fish %fish %s
|
|
set -g PATH
|
|
$fish -c "nonexistent-command-1234 banana rama"
|
|
#CHECKERR: fish: Unknown command: nonexistent-command-1234
|
|
#CHECKERR: fish:
|
|
#CHECKERR: nonexistent-command-1234 banana rama
|
|
#CHECKERR: ^~~~~~~~~~~~~~~~~~~~~~~^
|
|
$fish -C 'function fish_command_not_found; echo cmd-not-found; end' -ic "nonexistent-command-1234 1 2 3 4"
|
|
#CHECKERR: cmd-not-found
|
|
#CHECKERR: fish:
|
|
#CHECKERR: nonexistent-command-1234 1 2 3 4
|
|
#CHECKERR: ^~~~~~~~~~~~~~~~~~~~~~~^
|
|
$fish -C 'function fish_command_not_found; echo command-not-found $argv; end' -c "nonexistent-command-abcd foo bar baz"
|
|
#CHECKERR: command-not-found nonexistent-command-abcd foo bar baz
|
|
#CHECKERR: fish:
|
|
#CHECKERR: nonexistent-command-abcd foo bar baz
|
|
#CHECKERR: ^~~~~~~~~~~~~~~~~~~~~~~^
|
|
|
|
$fish -C 'functions --erase fish_command_not_found' -c 'nonexistent-command apple friday'
|
|
#CHECKERR: fish: Unknown command: nonexistent-command
|
|
#CHECKERR: nonexistent-command apple friday
|
|
#CHECKERR: ^~~~~~~~~~~~~~~~~~^
|
|
|
|
command -v nonexistent-command-1234
|
|
echo $status
|
|
#CHECK: 127
|
|
|
|
set -g PATH .
|
|
echo banana > foobar
|
|
foobar --banana
|
|
# CHECKERR: {{.*}}checks/command-not-found.fish (line {{\d+}}): Unknown command. './foobar' exists but is not an executable file.
|
|
# CHECKERR: foobar --banana
|
|
# CHECKERR: ^~~~~^
|
|
|
|
|
|
exit 0
|