Skip to content
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

Revert "Fix move to line start in multi-line history entries" #704

Merged
merged 1 commit into from
Jan 11, 2024
Merged

Revert "Fix move to line start in multi-line history entries" #704

Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
119 changes: 13 additions & 106 deletions src/engine.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1403,6 +1403,15 @@
/// Executes [`EditCommand`] actions by modifying the internal state appropriately. Does not output itself.
pub fn run_edit_commands(&mut self, commands: &[EditCommand]) {
if self.input_mode == InputMode::HistoryTraversal {
if matches!(
self.history_cursor.get_navigation(),

Check warning on line 1407 in src/engine.rs

View check run for this annotation

Codecov / codecov/patch

src/engine.rs#L1406-L1407 

Added lines #L1406 - L1407 were not covered by tests
HistoryNavigationQuery::Normal(_)
) {
if let Some(string) = self.history_cursor.string_at_cursor() {
self.editor
.set_buffer(string, UndoBehavior::HistoryNavigation);
}
}

Check warning on line 1414 in src/engine.rs

View check run for this annotation

Codecov / codecov/patch

src/engine.rs#L1410-L1414 

Added lines #L1410 - L1414 were not covered by tests
self.input_mode = InputMode::Regular;
}

Expand Down Expand Up @@ -1757,110 +1766,8 @@
}
}

#[cfg(test)]
mod test {
use super::*;
use crate::DefaultPrompt;
use pretty_assertions::assert_eq;
use rstest::rstest;
use std::error::Error;
use std::result::Result;

#[test]
fn thread_safe() {
fn f<S: Send>(_: S) {}
f(Reedline::create());
}

#[rstest]
#[case("")]
#[case("line of text")]
#[case(
"longgggggggggggggggggggggggggggggggggggggggggggggggggggggggggggggggggggggg line of text"
)]
fn test_move_to_line_start(#[case] input: &str) -> Result<(), Box<dyn Error>> {
let mut reedline = Reedline::create();
let prompt = DefaultPrompt::default();

let insert_input_event =
ReedlineEvent::Edit(vec![EditCommand::InsertString(input.to_string())]);
let move_to_line_start_event = ReedlineEvent::Edit(vec![EditCommand::MoveToLineStart]);

// Have to resize, or painting.utils.estimate_single_line_wraps panics with divide-by-zero.
reedline.handle_event(&prompt, ReedlineEvent::Resize(u16::MAX, u16::MAX))?;

// Write the string, and then move to the start of the line.
reedline.handle_event(&prompt, insert_input_event)?;
reedline.handle_event(&prompt, move_to_line_start_event.clone())?;
assert_eq!(reedline.editor.line_buffer().insertion_point(), 0);

// Enter the string into history, then scroll back up and move to the start of the line.
reedline.handle_event(&prompt, ReedlineEvent::Enter)?;
reedline.handle_event(&prompt, ReedlineEvent::Up)?;
reedline.handle_event(&prompt, move_to_line_start_event)?;
assert_eq!(reedline.editor.line_buffer().insertion_point(), 0);

Ok(())
}

#[rstest]
// Each input must be >=2 lines.
// Up/Down commands move in text/history depending on the number of lines.
#[case("a\nb", 2, 2)]
#[case("123456789\n123456789\n123456789", 10, 20)]
#[case("0\n1\n2\n3\n4\n5\n6\n7\n8\n9", 2, 18)]
fn test_move_to_line_start_multiline(
#[case] input: &str,
#[case] second_line_start: usize,
#[case] last_line_start: usize,
) -> Result<(), Box<dyn Error>> {
let mut reedline = Reedline::create();
let prompt = DefaultPrompt::default();

let insert_input_event =
ReedlineEvent::Edit(vec![EditCommand::InsertString(input.to_string())]);
let move_to_line_start_event = ReedlineEvent::Edit(vec![EditCommand::MoveToLineStart]);
let move_to_end_event = ReedlineEvent::Edit(vec![EditCommand::MoveToEnd]);

// Have to resize, or painting.utils.estimate_single_line_wraps panics with divide-by-zero.
reedline.handle_event(&prompt, ReedlineEvent::Resize(u16::MAX, u16::MAX))?;

// Write the string, and then move to the start of the last line.
reedline.handle_event(&prompt, insert_input_event)?;
reedline.handle_event(&prompt, move_to_line_start_event.clone())?;
assert_eq!(
reedline.editor.line_buffer().insertion_point(),
last_line_start
);

// Enter the string into history, then scroll back up and move to the start of the first line.
reedline.handle_event(&prompt, ReedlineEvent::Enter)?;
reedline.handle_event(&prompt, ReedlineEvent::Up)?;
reedline.handle_event(&prompt, move_to_line_start_event.clone())?;
assert_eq!(reedline.editor.line_buffer().insertion_point(), 0);

// Enter the string again, then scroll up in history, move down one line,
// and move to the start of the second line.
reedline.handle_event(&prompt, ReedlineEvent::Enter)?;
reedline.handle_event(&prompt, ReedlineEvent::Up)?;
reedline.handle_event(&prompt, ReedlineEvent::Down)?;
reedline.handle_event(&prompt, move_to_line_start_event.clone())?;
assert_eq!(
reedline.editor.line_buffer().insertion_point(),
second_line_start
);

// Enter the string again, then scroll up in history, move to the end of the text,
// and move to the start of the last line.
reedline.handle_event(&prompt, ReedlineEvent::Enter)?;
reedline.handle_event(&prompt, ReedlineEvent::Up)?;
reedline.handle_event(&prompt, move_to_end_event)?;
reedline.handle_event(&prompt, move_to_line_start_event)?;
assert_eq!(
reedline.editor.line_buffer().insertion_point(),
last_line_start
);

Ok(())
}
#[test]
fn thread_safe() {
fn f<S: Send>(_: S) {}
f(Reedline::create());
}