Yehowshua/ZIm
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

vim: Respect count for paragraphs (#33489)

Browse source 
Closes #32462 

Release Notes:

- vim: Paragraph objects now support counts (`d2ap`, `v2ap`, etc.)

---------

Co-authored-by: Rift <no@e.mail>
Co-authored-by: Conrad Irwin <conrad.irwin@gmail.com>
This commit is contained in:
Rift 2025-06-28 00:05:47 -04:00 • committed by GitHub
parent ba4fc1bcfc
commit 97c5c5a6e7
No known key found for this signature in database
GPG key ID: B5690EEEBB952194
17 changed files with 182 additions and 54 deletions
Download patch file Download diff file Expand all files Collapse all files

54
crates/vim/src/object.rs
View file

@ -373,10 +373,12 @@ pub fn register(editor: &mut Editor, cx: &mut Context<Vim>) {
impl Vim {
fn object(&mut self, object: Object, window: &mut Window, cx: &mut Context<Self>) {
let count = Self::take_count(cx);
match self.mode {
Mode::Normal => self.normal_object(object, window, cx),
Mode::Normal => self.normal_object(object, count, window, cx),
Mode::Visual | Mode::VisualLine | Mode::VisualBlock => {
self.visual_object(object, window, cx)
self.visual_object(object, count, window, cx)
}
Mode::Insert | Mode::Replace | Mode::HelixNormal => {
// Shouldn't execute a text object in insert mode. Ignoring
@ -485,6 +487,7 @@ impl Object {
map: &DisplaySnapshot,
selection: Selection<DisplayPoint>,
around: bool,
times: Option<usize>,
) -> Option<Range<DisplayPoint>> {
let relative_to = selection.head();
match self {
@ -503,7 +506,8 @@ impl Object {
}
}
Object::Sentence => sentence(map, relative_to, around),
Object::Paragraph => paragraph(map, relative_to, around),
//change others later
Object::Paragraph => paragraph(map, relative_to, around, times.unwrap_or(1)),
Object::Quotes => {
surrounding_markers(map, relative_to, around, self.is_multiline(), '\'', '\'')
}
@ -692,8 +696,9 @@ impl Object {
map: &DisplaySnapshot,
selection: &mut Selection<DisplayPoint>,
around: bool,
times: Option<usize>,
) -> bool {
if let Some(range) = self.range(map, selection.clone(), around) {
if let Some(range) = self.range(map, selection.clone(), around, times) {
selection.start = range.start;
selection.end = range.end;
true
@ -1399,30 +1404,37 @@ fn paragraph(
map: &DisplaySnapshot,
relative_to: DisplayPoint,
around: bool,
times: usize,
) -> Option<Range<DisplayPoint>> {
let mut paragraph_start = start_of_paragraph(map, relative_to);
let mut paragraph_end = end_of_paragraph(map, relative_to);
let paragraph_end_row = paragraph_end.row();
let paragraph_ends_with_eof = paragraph_end_row == map.max_point().row();
let point = relative_to.to_point(map);
let current_line_is_empty = map.buffer_snapshot.is_line_blank(MultiBufferRow(point.row));
for i in 0..times {
let paragraph_end_row = paragraph_end.row();
let paragraph_ends_with_eof = paragraph_end_row == map.max_point().row();
let point = relative_to.to_point(map);
let current_line_is_empty = map.buffer_snapshot.is_line_blank(MultiBufferRow(point.row));
if around {
if paragraph_ends_with_eof {
if current_line_is_empty {
return None;
}
if around {
if paragraph_ends_with_eof {
if current_line_is_empty {
return None;
}
let paragraph_start_row = paragraph_start.row();
if paragraph_start_row.0 != 0 {
let previous_paragraph_last_line_start =
DisplayPoint::new(paragraph_start_row - 1, 0);
paragraph_start = start_of_paragraph(map, previous_paragraph_last_line_start);
let paragraph_start_row = paragraph_start.row();
if paragraph_start_row.0 != 0 {
let previous_paragraph_last_line_start =
Point::new(paragraph_start_row.0 - 1, 0).to_display_point(map);
paragraph_start = start_of_paragraph(map, previous_paragraph_last_line_start);
}
} else {
let mut start_row = paragraph_end_row.0 + 1;
if i > 0 {
start_row += 1;
}
let next_paragraph_start = Point::new(start_row, 0).to_display_point(map);
paragraph_end = end_of_paragraph(map, next_paragraph_start);
}
} else {
let next_paragraph_start = DisplayPoint::new(paragraph_end_row + 1, 0);
paragraph_end = end_of_paragraph(map, next_paragraph_start);
}
}