Skip to content

Fix interrupted interactive search #576

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
gwenn merged 2 commits into from
Dec 4, 2021
Merged

Fix interrupted interactive search #576

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
f2cf638
Fix interrupted interactive search
gwenn Dec 4, 2021
cbac6bd
Rename edit_move_to_end to move_cursor_to_end
gwenn Dec 4, 2021
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion src/command.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -222,7 +222,7 @@ pub fn execute<H: Helper>(
// Move to end, in case cursor was in the middle of the
// line, so that next thing application prints goes after
// the input
s.edit_move_buffer_end()?;
s.move_cursor_to_end()?;
return Err(error::ReadlineError::Interrupted);
}
_ => {
Expand Down
9 changes: 9 additions & 0 deletions src/edit.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -130,6 +130,15 @@ impl<'out, 'prompt, H: Helper> State<'out, 'prompt, H> {
Ok(())
}

pub fn move_cursor_to_end(&mut self) -> Result<()> {
if self.layout.cursor == self.layout.end {
return Ok(());
}
self.out.move_cursor(self.layout.cursor, self.layout.end)?;
self.layout.cursor = self.layout.end;
Ok(())
}

pub fn move_cursor_at_leftmost(&mut self, rdr: &mut <Terminal as Term>::Reader) -> Result<()> {
self.out.move_cursor_at_leftmost(rdr)
}
Expand Down