Code at the speed of thought – Zed is a high-performance, multiplayer code editor from the creators of Atom and Tree-sitter.
Fix Vim visual-block hang at wrapped EOF (#66118)
Kirill Bulatov57dfd54adebb
diff --git a/crates/vim/src/visual.rs b/crates/vim/src/visual.rsindex 24e9ec0e860..a27d0c2ec2a 100644--- a/crates/vim/src/visual.rs+++ b/crates/vim/src/visual.rs@@ -344,6 +344,8 @@ impl Vim {tail = movement::saturating_right(map, tail);tail_x = map.x_for_display_point(tail, &text_layout_details);}+ let head_row = head.row();+ let head_buffer_row = map.start_of_relative_buffer_row(head, 0).row();if !is_reversed && !preserve_goal {head = movement::saturating_right(map, head);head_x = map.x_for_display_point(head, &text_layout_details);@@ -364,7 +366,7 @@ impl Vim {let mut selections = Vec::new();let mut row = tail.row();- let going_up = tail.row() > head.row();+ let going_up = tail.row() > head_row;let direction = if going_up { -1 } else { 1 };loop {@@ -402,15 +404,21 @@ impl Vim {// `head.row()` might be a `DisplayPoint` mapped to a soft// wrapped line, hence the need for `<=` and `>=` instead of// `==`.- if going_up && row <= head.row() || !going_up && row >= head.row() {+ if going_up && row <= head_row || !going_up && row >= head_row {break;}// Find the next or previous buffer row where the `row` should// be moved to, so that wrapped lines are skipped.- row = map+ let next_row = map.start_of_relative_buffer_row(DisplayPoint::new(row, 0), direction).row();+ let reached_head = if going_up {+ next_row <= head_buffer_row+ } else {+ next_row >= head_buffer_row+ };+ row = if reached_head { head_row } else { next_row };}s.select(selections);@@ -1656,6 +1664,35 @@ mod test {});}+ #[gpui::test]+ async fn test_visual_block_end_of_document_wrapped_eof(cx: &mut gpui::TestAppContext) {+ let mut cx = NeovimBackedTestContext::new(cx).await;+ cx.set_shared_wrap(12).await;++ cx.set_shared_state("123456789012ˇ34\n12345678901234").await;+ assert_eq!(cx.display_text(), "123456789012\n34\n123456789012\n34");+ cx.simulate_shared_keystrokes("ctrl-v shift-g").await;+ cx.shared_state()+ .await+ .assert_eq("123456789012«3ˇ»4\n123456789012«3ˇ»4");++ cx.set_shared_state("12345678901ˇ2\n12345678901234").await;+ cx.simulate_shared_keystrokes("ctrl-v shift-g").await;+ cx.shared_state()+ .await+ .assert_eq("12345678901«2ˇ»\n12345678901«2ˇ»34");++ cx.set_shared_state("12345678901234\n123456789012ˇ34").await;+ cx.simulate_shared_keystrokes("ctrl-v g g").await;+ cx.shared_state()+ .await+ .assert_eq("123456789012«3ˇ»4\n123456789012«3ˇ»4");++ cx.set_shared_state("ˇ12345678901234").await;+ cx.simulate_shared_keystrokes("g j ctrl-v k").await;+ cx.shared_state().await.assert_eq("123456789012«3ˇ»4");+ }+#[gpui::test]async fn test_visual_object(cx: &mut gpui::TestAppContext) {let mut cx = NeovimBackedTestContext::new(cx).await;diff --git a/crates/vim/test_data/test_visual_block_end_of_document_wrapped_eof.json b/crates/vim/test_data/test_visual_block_end_of_document_wrapped_eof.jsonnew file mode 100644index 00000000000..8b16fbc3aaa--- /dev/null+++ b/crates/vim/test_data/test_visual_block_end_of_document_wrapped_eof.json@@ -0,0 +1,21 @@+{"SetOption":{"value":"wrap"}}+{"SetOption":{"value":"columns=12"}}+{"Put":{"state":"123456789012ˇ34\n12345678901234"}}+{"Key":"ctrl-v"}+{"Key":"shift-g"}+{"Get":{"state":"123456789012«3ˇ»4\n123456789012«3ˇ»4","mode":"VisualBlock"}}+{"Put":{"state":"12345678901ˇ2\n12345678901234"}}+{"Key":"ctrl-v"}+{"Key":"shift-g"}+{"Get":{"state":"12345678901«2ˇ»\n12345678901«2ˇ»34","mode":"VisualBlock"}}+{"Put":{"state":"12345678901234\n123456789012ˇ34"}}+{"Key":"ctrl-v"}+{"Key":"g"}+{"Key":"g"}+{"Get":{"state":"123456789012«3ˇ»4\n123456789012«3ˇ»4","mode":"VisualBlock"}}+{"Put":{"state":"ˇ12345678901234"}}+{"Key":"g"}+{"Key":"j"}+{"Key":"ctrl-v"}+{"Key":"k"}+{"Get":{"state":"123456789012«3ˇ»4","mode":"VisualBlock"}}