fix(bash): fix and improve the keybinding to up

[akinomyoga]

This PR includes three different fixes related to the keybinding to up in Bash. The descriptions are found in commit messages and in code comments.

[vercel]

The latest updates on your projects. Learn more about Vercel for Git ↗︎

Name	Status	Preview	Comments	Updated (UTC)
atuin-docs	✅ Ready (Inspect)	Visit Preview	💬 Add feedback	Jan 7, 2024 10:18pm

[akinomyoga]

Now, the inlined script is so long that it might be better to consider outputting just the switches for C-r and up and moving the actual binding code to atuin.bash with the test for the switch. For example, we simplify fn init_bash(&self) as

let base = include_str!("../shell/atuin.bash");
let mut bind_ctrl_r = false;
let mut bind_up_arrow = false;
if std::env::var("ATUIN_NOBIND").is_err() {
    bind_ctrl_r = !self.disable_ctrl_r;
    bind_up_arrow = !self.disable_up_arrow;
}

println!("__atuin_bind_ctrl_r={bind_ctrl_r}");
println!("__atuin_bind_up_arrow={bind_up_arrow}");
println!("{base}");

and do branching in atuin.bash as

...

if [[ $__atuin_bind_ctrl_r == true ]]; then
    bind -m emacs -x '"\C-r": __atuin_history'
    ...
fi
if [[ $__atuin_bind_up_arrow == true ]]; then
    ...
fi
...

What do you think? (Edit: Commit da9df8a is an example implementation. I can drop the commit if you don't like it.)

[ellie]

I'm happy with this, thank you! Once the conflicts are resolved I'll get it merged

[akinomyoga]

Thanks! I have rebased it!

[ellie]

Thank you! Really appreciate all the improvements you've been doing in this area

[akinomyoga]

Hmm, clippy requires me to rewrite

let mut bind_ctrl_r = false;
let mut bind_up_arrow = false;
if std::env::var("ATUIN_NOBIND").is_err() {
    bind_ctrl_r = !self.disable_ctrl_r;
    bind_up_arrow = !self.disable_up_arrow;
}

as

let mut bind_ctrl_r = false;
let bind_up_arrow = if std::env::var("ATUIN_NOBIND").is_err() {
    bind_ctrl_r = !self.disable_ctrl_r;
    !self.disable_up_arrow
} else {
    false
};

but this breaks the symmetry of bind_ctrl_r and bind_up_arrow.

---

OK, this time I can write it in this way:

let (bind_ctrl_r, bind_up_arrow) = if std::env::var("ATUIN_NOBIND").is_err() {
    (!self.disable_ctrl_r, !self.disable_up_arrow)
} else {
    (false, false)
};

though this wouldn't be the general solution in similar cases.

[akinomyoga]

Probably it reads better when the condition is inversed. I've amended it.

[akinomyoga]

Thank you for all your help!

[atuin-bot]

This pull request has been mentioned on Atuin Community. There might be relevant details there:

https://forum.atuin.sh/t/up-arrow-error-commands-not-saved/339/3