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

Don't let sentences span across paragraphs

Browse source
This commit is contained in:
fantacell 2025-08-16 15:44:39 +02:00
parent bbeb1ab02e
commit 52103bc99a
1 changed files with 16 additions and 8 deletions
Download patch file Download diff file Expand all files Collapse all files

24
crates/vim/src/helix/boundary.rs
View file

@ -282,7 +282,7 @@ impl FuzzyBoundary {
&self, &self,
left: char, left: char,
right: char, right: char,
classifier: CharClassifier, classifier: &CharClassifier,
) -> Option<Box<dyn Fn(DisplayPoint, &'a DisplaySnapshot) -> Option<DisplayPoint>>> { ) -> Option<Box<dyn Fn(DisplayPoint, &'a DisplaySnapshot) -> Option<DisplayPoint>>> {
if is_buffer_start(left) { if is_buffer_start(left) {
return Some(Box::new(|identifier, _| Some(identifier))); return Some(Box::new(|identifier, _| Some(identifier)));
@ -297,7 +297,11 @@ impl FuzzyBoundary {
})) }))
} }
Self::Sentence => { Self::Sentence => {
if !is_sentence_end(left, right, &classifier) { if let Some(find_paragraph_start) =
Self::Paragraph.is_near_potential_start(left, right, classifier)
{
return Some(find_paragraph_start);
} else if !is_sentence_end(left, right, classifier) {
return None; return None;
} }
Some(Box::new(|identifier, map| { Some(Box::new(|identifier, map| {
@ -315,7 +319,7 @@ impl FuzzyBoundary {
&self, &self,
left: char, left: char,
right: char, right: char,
classifier: CharClassifier, classifier: &CharClassifier,
) -> Option<Box<dyn Fn(DisplayPoint, &'a DisplaySnapshot) -> Option<DisplayPoint>>> { ) -> Option<Box<dyn Fn(DisplayPoint, &'a DisplaySnapshot) -> Option<DisplayPoint>>> {
if is_buffer_end(right) { if is_buffer_end(right) {
return Some(Box::new(|identifier, _| Some(identifier))); return Some(Box::new(|identifier, _| Some(identifier)));
@ -332,7 +336,11 @@ impl FuzzyBoundary {
})) }))
} }
Self::Sentence => { Self::Sentence => {
if !is_sentence_end(left, right, &classifier) { if let Some(find_paragraph_end) =
Self::Paragraph.is_near_potential_end(left, right, classifier)
{
return Some(find_paragraph_end);
} else if !is_sentence_end(left, right, &classifier) {
return None; return None;
} }
Some(Box::new(|identifier, _| Some(identifier))) Some(Box::new(|identifier, _| Some(identifier)))
@ -349,7 +357,7 @@ impl BoundedObject for FuzzyBoundary {
let classifier = map let classifier = map
.buffer_snapshot .buffer_snapshot
.char_classifier_at(point.to_offset(map, Bias::Left)); .char_classifier_at(point.to_offset(map, Bias::Left));
self.is_near_potential_start(left, right, classifier) self.is_near_potential_start(left, right, &classifier)
.map(|reach_start| (point, reach_start)) .map(|reach_start| (point, reach_start))
}) })
{ {
@ -371,7 +379,7 @@ impl BoundedObject for FuzzyBoundary {
let classifier = map let classifier = map
.buffer_snapshot .buffer_snapshot
.char_classifier_at(point.to_offset(map, Bias::Left)); .char_classifier_at(point.to_offset(map, Bias::Left));
self.is_near_potential_end(left, right, classifier) self.is_near_potential_end(left, right, &classifier)
.map(|reach_end| (point, reach_end)) .map(|reach_end| (point, reach_end))
}) })
{ {
@ -393,7 +401,7 @@ impl BoundedObject for FuzzyBoundary {
let classifier = map let classifier = map
.buffer_snapshot .buffer_snapshot
.char_classifier_at(point.to_offset(map, Bias::Left)); .char_classifier_at(point.to_offset(map, Bias::Left));
self.is_near_potential_start(left, right, classifier) self.is_near_potential_start(left, right, &classifier)
.map(|reach_start| (point, reach_start)) .map(|reach_start| (point, reach_start))
}) })
{ {
@ -415,7 +423,7 @@ impl BoundedObject for FuzzyBoundary {
let classifier = map let classifier = map
.buffer_snapshot .buffer_snapshot
.char_classifier_at(point.to_offset(map, Bias::Left)); .char_classifier_at(point.to_offset(map, Bias::Left));
self.is_near_potential_end(left, right, classifier) self.is_near_potential_end(left, right, &classifier)
.map(|reach_end| (point, reach_end)) .map(|reach_end| (point, reach_end))
}) })
{ {