h/fish-shell
1
Fork 0
mirror of https://github.com/fish-shell/fish-shell.git synced 2026-06-06 17:31:14 -03:00
Code Issues Packages Projects Releases Wiki Activity

Extract function for running commands from bindings

Browse Source
This commit is contained in:
Johannes Altmanninger
2024-04-06 17:42:02 +02:00
parent f285e85b0c
commit de730b7885
1 changed files with 9 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files

18
src/reader.rs
View File

@@ -1996,13 +1996,17 @@ fn readline(&mut self, nchars: Option<NonZeroUsize>) -> Option<WString> {
rls.finished.then(|| zelf.command_line.text().to_owned())
}
fn eval_bind_cmd(&mut self, cmd: &wstr) {
let last_statuses = self.parser().vars().get_last_statuses();
self.parser().eval(cmd, &IoChain::new());
self.parser().set_last_statuses(last_statuses);
}
/// Run a sequence of commands from an input binding.
fn run_input_command_scripts(&mut self, cmd: &wstr) {
let last_statuses = self.parser().vars().get_last_statuses();
self.update_commandline_state();
self.parser().eval(cmd, &IoChain::new());
self.eval_bind_cmd(cmd);
self.apply_commandline_state_changes();
self.parser().set_last_statuses(last_statuses);
// Restore tty to shell modes.
// Some input commands will take over the tty - see #2114 for an example where vim is invoked
@@ -2615,9 +2619,7 @@ fn handle_readline_command(&mut self, c: ReadlineCmd, rls: &mut ReadlineLoopStat
}
rl::BackwardWord | rl::BackwardBigword | rl::PrevdOrBackwardWord => {
if c == rl::PrevdOrBackwardWord && self.command_line.is_empty() {
let last_statuses = self.parser().vars().get_last_statuses();
self.parser().eval(L!("prevd"), &IoChain::new());
self.parser().set_last_statuses(last_statuses);
self.eval_bind_cmd(L!("prevd"));
self.force_exec_prompt_and_repaint = true;
self.inputter
.queue_char(CharEvent::from_readline(ReadlineCmd::Repaint));
@@ -2639,9 +2641,7 @@ fn handle_readline_command(&mut self, c: ReadlineCmd, rls: &mut ReadlineLoopStat
}
rl::ForwardWord | rl::ForwardBigword | rl::NextdOrForwardWord => {
if c == rl::NextdOrForwardWord && self.command_line.is_empty() {
let last_statuses = self.parser().vars().get_last_statuses();
self.parser().eval(L!("nextd"), &IoChain::new());
self.parser().set_last_statuses(last_statuses);
self.eval_bind_cmd(L!("nextd"));
self.force_exec_prompt_and_repaint = true;
self.inputter
.queue_char(CharEvent::from_readline(ReadlineCmd::Repaint));