vim: Fix end of paragraph deletion when there's no blank lines (#29490)
This Pull Request attempts to fix an issue where using `d}` in vim mode would not delete all characters in case there's no blank lines at the end of the buffer. When calculating the end point for this motion, if there's no blank lines at the end of the buffer, Zed was calculating it to be the last character in the last line. However, if there's a newline at the end of the buffer, it calculates the end point to be the point at the right of the last character. Here's an example, for the following buffer contents: ``` Hello! Hello! ``` If the `d}` command is run at `(0, 0)`, the end point will be set to `(1, 5)`. However, fi the same command is run for this buffer instead: ``` Hello! Hello! ``` The end point will be set to `(1, 6)`, there's a 1 unit difference in the column, which leads to all characters actually being deleted. Closes #29393 Release Notes: - Fixed deleting to the end of paragraph when there's no blank lines --------- Co-authored-by: Conrad Irwin <conrad.irwin@gmail.com>
This commit is contained in:
parent
4758173c33
commit
f2813f60ed
@ -1309,6 +1309,16 @@ impl Motion {
|
||||
end_point.row -= 1;
|
||||
end_point.column = 0;
|
||||
selection.end = map.clip_point(map.next_line_boundary(end_point).1, Bias::Left);
|
||||
} else if let Motion::EndOfParagraph = self {
|
||||
// Special case: When using the "}" motion, it's possible
|
||||
// that there's no blank lines after the paragraph the
|
||||
// cursor is currently on.
|
||||
// In this situation the `end_point.column` value will be
|
||||
// greater than 0, so the selection doesn't actually end on
|
||||
// the first character of a blank line. In that case, we'll
|
||||
// want to move one column to the right, to actually include
|
||||
// all characters of the last non-blank line.
|
||||
selection.end = movement::saturating_right(map, selection.end)
|
||||
}
|
||||
}
|
||||
} else if kind == MotionKind::Inclusive {
|
||||
|
@ -351,6 +351,29 @@ mod test {
|
||||
.assert_matches();
|
||||
}
|
||||
|
||||
#[gpui::test]
|
||||
async fn test_delete_end_of_paragraph(cx: &mut gpui::TestAppContext) {
|
||||
let mut cx = NeovimBackedTestContext::new(cx).await;
|
||||
cx.simulate(
|
||||
"d }",
|
||||
indoc! {"
|
||||
ˇhello world.
|
||||
|
||||
hello world."},
|
||||
)
|
||||
.await
|
||||
.assert_matches();
|
||||
|
||||
cx.simulate(
|
||||
"d }",
|
||||
indoc! {"
|
||||
ˇhello world.
|
||||
hello world."},
|
||||
)
|
||||
.await
|
||||
.assert_matches();
|
||||
}
|
||||
|
||||
#[gpui::test]
|
||||
async fn test_delete_0(cx: &mut gpui::TestAppContext) {
|
||||
let mut cx = NeovimBackedTestContext::new(cx).await;
|
||||
|
8
crates/vim/test_data/test_delete_end_of_paragraph.json
Normal file
8
crates/vim/test_data/test_delete_end_of_paragraph.json
Normal file
@ -0,0 +1,8 @@
|
||||
{"Put":{"state":"ˇhello world.\n\nhello world."}}
|
||||
{"Key":"d"}
|
||||
{"Key":"}"}
|
||||
{"Get":{"state":"ˇ\nhello world.","mode":"Normal"}}
|
||||
{"Put":{"state":"ˇhello world.\nhello world."}}
|
||||
{"Key":"d"}
|
||||
{"Key":"}"}
|
||||
{"Get":{"state":"ˇ","mode":"Normal"}}
|
Loading…
Reference in New Issue
Block a user