mirrors/atuin
1
0
Fork 0
mirror of https://github.com/atuinsh/atuin.git synced 2025-08-04 18:58:13 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions 6

fix: fish up binding bug (#2677)

Browse source 
Closes: #2672

I think this was introduced in #2616 - typing the literally characters
`u p` lead to opening the TUI, as we were still executing the fish 4
bindings.
This commit is contained in:
Ellie Huxtable 2025-04-07 14:15:14 +01:00 • committed by GitHub
parent 336447e7f6
commit 2935a5a6bd
No known key found for this signature in database
GPG key ID: B5690EEEBB952194
1 changed files with 15 additions and 5 deletions
Download patch file Download diff file Expand all files Collapse all files

20
crates/atuin/src/command/client/init/fish.rs
View file

@ -10,20 +10,30 @@ pub fn init_static(disable_up_arrow: bool, disable_ctrl_r: bool) {
// We keep it for compatibility with fish 3.x
if std::env::var("ATUIN_NOBIND").is_err() {
const BIND_CTRL_R: &str = r"bind \cr _atuin_search";
const BIND_UP_ARROW: &str = r"bind -k up _atuin_bind_up
bind up _atuin_bind_up
bind \eOA _atuin_bind_up
bind \e\[A _atuin_bind_up";
const BIND_CTRL_R_INS: &str = r"bind -M insert \cr _atuin_search";
const BIND_UP_ARROW_INS: &str = r"bind -M insert -k up _atuin_bind_up
bind -M insert \eOA _atuin_bind_up
bind -M insert \e\[A _atuin_bind_up";
let bind_up_arrow = match std::env::var("FISH_VERSION") {
Ok(ref version) if version.starts_with("4.") => r"bind up _atuin_bind_up",
Ok(_) => r"bind -k up _atuin_bind_up",
// do nothing - we can't panic or error as this could be in use in
// non-fish pipelines
_ => "",
}
.to_string();
if !disable_ctrl_r {
println!("{BIND_CTRL_R}");
}
if !disable_up_arrow {
println!("{BIND_UP_ARROW}");
println!(
r"{bind_up_arrow}
bind \eOA _atuin_bind_up
bind \e\[A _atuin_bind_up"
);
}
println!("if bind -M insert > /dev/null 2>&1");