Expand keyboard navigation and selection in the transcript (#57221)

## What changed

- Add word motions (`w`, `b`, `e`), logical line boundaries, page and half-page motions, and jumps to the transcript's beginning and end. Honor configured pager bindings for navigation.
- Add whole-line selection with `V` and active-end swapping with `o`.
- Adopt existing mouse selections when entering select mode, preserving selection units and endpoint bounds so keyboard motions can adjust the range.

## Testing

Add regression tests for word motion across entries, reverse whole-line selection, empty-line boundaries, configured pager motion, final-grapheme selection, endpoint swapping, and caret placement after copying.

GitOrigin-RevId: f0cd05900f2a7a15840777cee4d50659a2c8b134
This commit is contained in:
Felipe Coury
2026-10-26 20:03:10 +00:00
committed by copyberry
parent 20f5dde714
commit abf4bb91ec
4 changed files with 588 additions and 21 deletions
@@ -1,4 +1,5 @@
use super::*;
use crate::clipboard_copy::CopyStatus;
use crate::history_cell::PlainHistoryCell;
use pretty_assertions::assert_eq;
use ratatui::text::Line;
@@ -104,6 +105,57 @@ fn character_motion_crosses_line_and_entry_boundaries_without_invisible_stops()
press(&mut view, &cells, KeyCode::Left);
press(&mut view, &cells, KeyCode::Char('v'));
assert_eq!(view.selected_text(&cells).as_deref(), Some("0"));
let cells = vec![cell(&["ab"]), cell(&["cd"])];
let mut view = TranscriptView::default();
render(&mut view, &cells);
let start = Anchor {
key: EntryKey::cell(&cells[0]),
index: 0,
offset: 0,
row_bias: 0,
};
let end = Anchor {
key: EntryKey::cell(&cells[1]),
index: 1,
offset: 0,
row_bias: 0,
};
let mut selection = Selection::keyboard(view.capture_snapshot(&cells), start);
selection.set_keyboard_range(start, end);
view.selection = Some(selection);
assert!(view.begin_select_mode(&cells));
assert_eq!(
view.select_mode
.and_then(|mode| mode.mark)
.expect("marked range")
.active,
Anchor { offset: 1, ..start }
);
assert_eq!(view.selected_text(&cells).as_deref(), Some("ab\n"));
press(&mut view, &cells, KeyCode::Char('o'));
assert_eq!(view.selected_text(&cells).as_deref(), Some("ab\n"));
press(&mut view, &cells, KeyCode::Char('l'));
assert_eq!(view.selected_text(&cells).as_deref(), Some("b"));
let cells = vec![cell(&["abc"])];
let mut view = TranscriptView::default();
render(&mut view, &cells);
let start = Anchor {
key: EntryKey::cell(&cells[0]),
index: 0,
offset: 1,
row_bias: 0,
};
let end = Anchor { offset: 3, ..start };
let mut selection = Selection::keyboard(view.capture_snapshot(&cells), start);
selection.set_keyboard_range(start, end);
view.selection = Some(selection);
assert!(view.begin_select_mode(&cells));
press(&mut view, &cells, KeyCode::Char('h'));
assert_eq!(view.selected_text(&cells).as_deref(), Some("b"));
press(&mut view, &cells, KeyCode::Char('h'));
assert_eq!(view.selected_text(&cells).as_deref(), Some("ab"));
}
#[test]
@@ -146,3 +198,156 @@ fn enter_without_a_mark_exits_but_enter_with_a_mark_copies_and_follows() {
Some(ViewAction::CopyAndFollow(text)) if text == "c"
));
}
#[test]
fn word_motion_crosses_entries_and_word_end_selects_the_destination_word() {
let cells = vec![cell(&["alpha"]), cell(&["beta gamma"])];
let mut view = TranscriptView::default();
render(&mut view, &cells);
assert!(view.begin_select_mode(&cells));
press(&mut view, &cells, KeyCode::Char('g'));
press(&mut view, &cells, KeyCode::Char('j'));
press(&mut view, &cells, KeyCode::Char('w'));
press(&mut view, &cells, KeyCode::Char('v'));
press(&mut view, &cells, KeyCode::Char('e'));
assert_eq!(view.selected_text(&cells).as_deref(), Some("beta"));
}
#[test]
fn reverse_line_selection_copies_complete_lines_in_document_order() {
let cells = vec![cell(&["first", "second", "third"])];
let mut view = TranscriptView::default();
render(&mut view, &cells);
assert!(view.begin_select_mode(&cells));
press(&mut view, &cells, KeyCode::Char('g'));
press(&mut view, &cells, KeyCode::Char('j'));
press(&mut view, &cells, KeyCode::Char('j'));
press(&mut view, &cells, KeyCode::Char('V'));
press(&mut view, &cells, KeyCode::Char('k'));
assert_eq!(view.selected_text(&cells).as_deref(), Some("second\nthird"));
}
#[test]
fn logical_line_end_handles_empty_lines_and_shifted_dollar() {
let cells = vec![cell(&["abc", "", "z"])];
let mut view = TranscriptView::default();
render(&mut view, &cells);
assert!(view.begin_select_mode(&cells));
press(&mut view, &cells, KeyCode::Char('g'));
assert!(matches!(
view.handle_key(
KeyEvent::new(KeyCode::Char('$'), KeyModifiers::SHIFT),
&cells,
),
Some(ViewAction::Changed)
));
press(&mut view, &cells, KeyCode::Char('v'));
assert_eq!(view.selected_text(&cells).as_deref(), Some("c"));
press(&mut view, &cells, KeyCode::Esc);
press(&mut view, &cells, KeyCode::Char('j'));
press(&mut view, &cells, KeyCode::End);
press(&mut view, &cells, KeyCode::Char('v'));
assert_eq!(view.selected_text(&cells), None);
let cells = vec![cell(&["abc", ""])];
let mut view = TranscriptView::default();
render(&mut view, &cells);
assert!(view.begin_select_mode(&cells));
press(&mut view, &cells, KeyCode::Char('g'));
press(&mut view, &cells, KeyCode::Char('j'));
press(&mut view, &cells, KeyCode::End);
}
#[test]
fn configured_pager_page_motion_moves_the_select_cursor() {
let cells = vec![Arc::new(PlainHistoryCell::new(
(0..12).map(|row| format!("line {row}").into()).collect(),
)) as Arc<dyn HistoryCell>];
let config = serde_json::from_value(serde_json::json!({
"pager": {"page_down": "x"}
}))
.expect("keymap config");
let keymap = crate::keymap::RuntimeKeymap::from_config(&config).expect("configured page down");
let mut view = TranscriptView::default();
view.set_keymap_bindings(&keymap);
render(&mut view, &cells);
assert!(view.begin_select_mode(&cells));
press(&mut view, &cells, KeyCode::Char('g'));
press(&mut view, &cells, KeyCode::Char('v'));
assert!(view.select_mode.is_some_and(|mode| mode.mark.is_some()));
press(&mut view, &cells, KeyCode::Char('x'));
let cursor = view
.select_mode
.expect("select mode")
.cursor(view.selection.as_ref().expect("selection"));
let layout = view.layout(&cells, cursor.index).expect("cursor layout");
assert_eq!(
layout
.row_for_offset(cursor.offset)
.saturating_add_signed(cursor.row_bias.saturating_neg()),
5
);
}
#[test]
fn transcript_end_character_selection_includes_the_last_grapheme() {
let cells = vec![cell(&["start"]), cell(&["tail🙂"])];
let mut view = TranscriptView::default();
render(&mut view, &cells);
assert!(view.begin_select_mode(&cells));
press(&mut view, &cells, KeyCode::Char('G'));
press(&mut view, &cells, KeyCode::Char('v'));
assert_eq!(view.selected_text(&cells).as_deref(), Some("🙂"));
}
#[test]
fn swapping_the_active_end_preserves_text_and_moves_the_shrinking_endpoint() {
let cells = vec![cell(&["abcdef"])];
let mut view = TranscriptView::default();
render(&mut view, &cells);
assert!(view.begin_select_mode(&cells));
press(&mut view, &cells, KeyCode::Char('v'));
press(&mut view, &cells, KeyCode::Char('o'));
assert_eq!(view.selected_text(&cells).as_deref(), Some("a"));
press(&mut view, &cells, KeyCode::Char('o'));
for _ in 0..3 {
press(&mut view, &cells, KeyCode::Char('l'));
}
assert_eq!(view.selected_text(&cells).as_deref(), Some("abcd"));
press(&mut view, &cells, KeyCode::Char('o'));
press(&mut view, &cells, KeyCode::Char('l'));
assert_eq!(view.selected_text(&cells).as_deref(), Some("bcd"));
}
#[test]
fn confirmed_copy_keeps_the_select_mode_caret_on_the_active_grapheme() {
let cells = vec![cell(&["abc"])];
let mut view = TranscriptView::default();
render(&mut view, &cells);
assert!(view.begin_select_mode(&cells));
press(&mut view, &cells, KeyCode::Char('v'));
press(&mut view, &cells, KeyCode::Char('l'));
let Some(ViewAction::Copy(text)) = view.handle_key(KeyCode::Char('y').into(), &cells) else {
panic!("copy key should copy the marked range");
};
assert_eq!(text, "ab");
assert_eq!(
view.copy_selected_text_with(
&cells,
&text,
/*clear_selection*/ true,
|_, _| { Ok(CopyStatus::Confirmed) }
),
Ok(CopyStatus::Confirmed)
);
assert!(view.select_mode.is_some());
press(&mut view, &cells, KeyCode::Char('v'));
assert_eq!(view.selected_text(&cells).as_deref(), Some("b"));
}