github-mirror/fish-shell
2
0
Fork 0
mirror of https://github.com/fish-shell/fish-shell.git synced 2024-11-22 11:22:52 +08:00
Code Issues Actions Packages Projects Releases Wiki Activity

Update commandline state changes eagerly as well

Browse Source 
The new reader_execute_readline_cmd() runs apply_commandline_state_changes()
to make sure that given

    bind x "commandline --insert foo; commandline -f backward-char"

the backward-char command knows about the insertion of "foo".  This
causes problems when running "sleep 1&" and typing some characters -
the commandline will be cleared when the job finishes.  This is because
apply_commandline_state_changes() works with stale information in this case.

Let's call it as soon as we know it's needed.  This is less messy and fits
better with the new bind function semantics ("execute things in the order
they are written").
This commit is contained in:
Johannes Altmanninger 2024-04-11 12:02:18 +02:00
parent 57d3614fd8
commit 8386088b3d
1 changed files with 13 additions and 15 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

28
src/reader.rs
View File

@ -657,10 +657,6 @@ fn read_i(parser: &Parser) -> i32 {
// Reset the warning.
data.did_warn_for_bg_jobs = false;
}
// Apply any command line update from this command or fish_postexec, etc.
// See #8807.
data.apply_commandline_state_changes();
}
reader_pop();
@ -910,7 +906,6 @@ pub fn reader_execute_readline_cmd(ch: CharEvent) {
data.rls = Some(ReadlineLoopState::new());
}
data.save_screen_state();
data.apply_commandline_state_changes();
data.handle_char_event(Some(ch));
data.update_commandline_state();
}
@ -941,8 +936,6 @@ pub fn reader_reading_interrupted() -> i32 {
pub fn reader_readline(nchars: usize) -> Option<WString> {
let nchars = NonZeroUsize::try_from(nchars).ok();
let data = current_data().unwrap();
// Apply any outstanding commandline changes (#8633).
data.apply_commandline_state_changes();
data.readline(nchars)
}
@ -954,16 +947,22 @@ pub fn commandline_get_state() -> CommandlineState {
/// Set the command line text and position. This may be called on a background thread; the reader
/// will pick it up when it is done executing.
pub fn commandline_set_buffer(text: WString, cursor_pos: Option<usize>) {
let mut state = commandline_state_snapshot();
state.cursor_pos = cmp::min(cursor_pos.unwrap_or(usize::MAX), text.len());
state.text = text;
{
let mut state = commandline_state_snapshot();
state.cursor_pos = cmp::min(cursor_pos.unwrap_or(usize::MAX), text.len());
state.text = text;
}
current_data().map(|data| data.apply_commandline_state_changes());
}
pub fn commandline_set_search_field(text: WString, cursor_pos: Option<usize>) {
let mut state = commandline_state_snapshot();
assert!(state.search_field.is_some());
let new_pos = cmp::min(cursor_pos.unwrap_or(usize::MAX), text.len());
state.search_field = Some((text, new_pos));
{
let mut state = commandline_state_snapshot();
assert!(state.search_field.is_some());
let new_pos = cmp::min(cursor_pos.unwrap_or(usize::MAX), text.len());
state.search_field = Some((text, new_pos));
}
current_data().map(|data| data.apply_commandline_state_changes());
}
/// Return the current interactive reads loop count. Useful for determining how many commands have
@ -1903,7 +1902,6 @@ impl ReaderData {
fn run_input_command_scripts(&mut self, cmd: &wstr) {
self.update_commandline_state();
self.eval_bind_cmd(cmd);
self.apply_commandline_state_changes();
// Restore tty to shell modes.
// Some input commands will take over the tty - see #2114 for an example where vim is invoked