Offline, privacy-first grammar checker. Fast, open-source, Rust-powered
refactor(core): simplify code (#2393)
Steve Kurchbc25f28592ba
diff --git a/harper-core/src/token_string_ext.rs b/harper-core/src/token_string_ext.rsindex 3ff3aed0d..5a510e5f0 100644--- a/harper-core/src/token_string_ext.rs+++ b/harper-core/src/token_string_ext.rs@@ -191,51 +191,11 @@ impl TokenStringExt for [Token] {}fn iter_chunks(&self) -> impl Iterator<Item = &'_ [Token]> + '_ {- let first_chunk = self- .iter_chunk_terminator_indices()- .next()- .map(|first_term| &self[0..=first_term]);-- let rest = self- .iter_chunk_terminator_indices()- .tuple_windows()- .map(move |(a, b)| &self[a + 1..=b]);-- let last = if let Some(last_i) = self.last_chunk_terminator_index() {- if last_i + 1 < self.len() {- Some(&self[last_i + 1..])- } else {- None- }- } else {- Some(self)- };-- first_chunk.into_iter().chain(rest).chain(last)+ self.split_inclusive(|tok| tok.kind.is_chunk_terminator())}fn iter_paragraphs(&self) -> impl Iterator<Item = &'_ [Token]> + '_ {- let first_pg = self- .iter_paragraph_break_indices()- .next()- .map(|first_term| &self[0..=first_term]);-- let rest = self- .iter_paragraph_break_indices()- .tuple_windows()- .map(move |(a, b)| &self[a + 1..=b]);-- let last_pg = if let Some(last_i) = self.last_paragraph_break_index() {- if last_i + 1 < self.len() {- Some(&self[last_i + 1..])- } else {- None- }- } else {- Some(self)- };-- first_pg.into_iter().chain(rest).chain(last_pg)+ self.split_inclusive(|tok| tok.kind.is_paragraph_break())}fn iter_headings(&self) -> impl Iterator<Item = &'_ [Token]> + '_ {@@ -250,27 +210,7 @@ impl TokenStringExt for [Token] {}fn iter_sentences(&self) -> impl Iterator<Item = &'_ [Token]> + '_ {- let first_sentence = self- .iter_sentence_terminator_indices()- .next()- .map(|first_term| &self[0..=first_term]);-- let rest = self- .iter_sentence_terminator_indices()- .tuple_windows()- .map(move |(a, b)| &self[a + 1..=b]);-- let last_sentence = if let Some(last_i) = self.last_sentence_terminator_index() {- if last_i + 1 < self.len() {- Some(&self[last_i + 1..])- } else {- None- }- } else {- Some(self)- };-- first_sentence.into_iter().chain(rest).chain(last_sentence)+ self.split_inclusive(|token| token.kind.is_sentence_terminator())}fn iter_sentences_mut(&mut self) -> impl Iterator<Item = &mut [Token]> + '_ {