github-mirror/fish-shell
2
0
Fork 0
mirror of https://github.com/fish-shell/fish-shell.git synced 2025-02-19 18:48:30 +08:00
Code Issues Actions Packages Projects Releases Wiki Activity

Treat '!' as super-command (it's not reserved!)

Browse Source 
Other sigil-aliases ('[' and '_') are reserved words that cannot be
redefined as function. Only '!' is not.

Whereas several users define "function !!", I
found only one public occurrence of "function !":
5c7f87ed07/fish/functions/!.fish

Note that "function !" only works if invoked as "!", "! -h" or
"! --help" or "foo | !".  In most other cases we parse it as negation.

We should probably make it a reserved word to reduce confusion.
If we do that, we should also add it to __fish_print_help, to make
"! -h" work.

For now let's rearrange the code so we can recognize "!" as
super-command. This fixes completion-based autosuggestions on "! ".
This commit is contained in:
Johannes Altmanninger 2025-01-12 09:50:10 +01:00
parent e678fb8578
commit 373bb56441
1 changed files with 12 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

13
src/parser_keywords.rs
View File

@ -4,6 +4,7 @@ use crate::wchar::prelude::*;
struct ReservedWord { struct ReservedWord {
text: &'static wstr, text: &'static wstr,
is_reserved: bool,
is_super_command: bool, is_super_command: bool,
} }
@ -11,12 +12,21 @@ macro_rules! rw {
( ( $text:literal ) ) => { ( ( $text:literal ) ) => {
ReservedWord { ReservedWord {
text: L!($text), text: L!($text),
is_reserved: true,
is_super_command: false, is_super_command: false,
} }
}; };
( ( $text:literal, [subcommand] ) ) => { ( ( $text:literal, [subcommand] ) ) => {
ReservedWord { ReservedWord {
text: L!($text), text: L!($text),
is_reserved: true,
is_super_command: true,
}
};
( ( $text:literal, [subcommand], not reserved ) ) => {
ReservedWord {
text: L!($text),
is_reserved: false,
is_super_command: true, is_super_command: true,
} }
}; };
@ -29,6 +39,7 @@ macro_rules! reserved_words {
// Don't forget to add any new reserved keywords to the documentation // Don't forget to add any new reserved keywords to the documentation
const RESERVED_WORDS: &[ReservedWord] = reserved_words!( const RESERVED_WORDS: &[ReservedWord] = reserved_words!(
("!", [subcommand], not reserved),
("["), ("["),
("_"), ("_"),
("and", [subcommand]), ("and", [subcommand]),
@ -74,5 +85,5 @@ pub fn parser_keywords_is_subcommand(cmd: &impl AsRef<wstr>) -> bool {
/// functions that change the block or command scope, like 'for', 'end' or 'command' or 'exec'. /// functions that change the block or command scope, like 'for', 'end' or 'command' or 'exec'.
/// These functions may not be overloaded, so their names are reserved. /// These functions may not be overloaded, so their names are reserved.
pub fn parser_keywords_is_reserved(word: &wstr) -> bool { pub fn parser_keywords_is_reserved(word: &wstr) -> bool {
reserved_word(word).is_some() reserved_word(word).is_some_and(|reserved_word| reserved_word.is_reserved)
} }