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

Don't schedule redundant repaints as autosuggestions are toggled

Browse Source 
Tweak 86b8cc2097 (Allow turning off autosuggestions, 2021-10-21)
to avoid redundantly executing the prompt and repainting.
This commit is contained in:
Johannes Altmanninger
2025-12-30 05:24:20 +01:00
parent b31387416d
commit f510b62b7f
1 changed files with 13 additions and 14 deletions
Download Patch File Download Diff File Expand all files Collapse all files

27
src/reader/reader.rs
View File

@@ -1099,9 +1099,7 @@ pub fn reader_set_autosuggestion_enabled(vars: &dyn Environment) {
let enable = check_bool_var(vars, L!("fish_autosuggestion_enabled"), true);
if data.conf.autosuggest_ok != enable {
data.conf.autosuggest_ok = enable;
data.force_exec_prompt_and_repaint = true;
data.input_data
.queue_char(CharEvent::from_readline(ReadlineCmd::Repaint));
data.schedule_prompt_repaint();
}
}
}
@@ -1121,11 +1119,7 @@ pub fn reader_schedule_prompt_repaint() {
let Some(data) = current_data() else {
return;
};
if !data.force_exec_prompt_and_repaint {
data.force_exec_prompt_and_repaint = true;
data.input_data
.queue_char(CharEvent::from_readline(ReadlineCmd::Repaint));
}
data.schedule_prompt_repaint();
}
pub fn reader_update_termsize(parser: &Parser) {
@@ -1622,6 +1616,15 @@ pub fn mouse_left_click(&mut self, click_position: ViewportPosition) {
CharOffset::Pager(_) | CharOffset::None => {}
}
}
fn schedule_prompt_repaint(&mut self) {
if self.force_exec_prompt_and_repaint {
return;
}
self.force_exec_prompt_and_repaint = true;
self.input_data
.queue_char(CharEvent::from_readline(ReadlineCmd::Repaint));
}
}
pub fn reader_save_screen_state() {
@@ -3503,9 +3506,7 @@ fn handle_readline_command(&mut self, c: ReadlineCmd) {
| rl::PrevdOrBackwardWord => {
if c == rl::PrevdOrBackwardWord && self.command_line.is_empty() {
self.eval_bind_cmd(L!("prevd"));
self.force_exec_prompt_and_repaint = true;
self.input_data
.queue_char(CharEvent::from_readline(ReadlineCmd::Repaint));
self.schedule_prompt_repaint();
return;
}
@@ -3529,9 +3530,7 @@ fn handle_readline_command(&mut self, c: ReadlineCmd) {
| rl::NextdOrForwardWord => {
if c == rl::NextdOrForwardWord && self.command_line.is_empty() {
self.eval_bind_cmd(L!("nextd"));
self.force_exec_prompt_and_repaint = true;
self.input_data
.queue_char(CharEvent::from_readline(ReadlineCmd::Repaint));
self.schedule_prompt_repaint();
return;
}