Skip to content

Offline, privacy-first grammar checker. Fast, open-source, Rust-powered

refactor(core): span refactorings (#1638)

Steve Kurchd78652dd12fb
diff --git a/harper-core/src/span.rs b/harper-core/src/span.rs
index 23ca9b495..5ba67fccc 100644
--- a/harper-core/src/span.rs
+++ b/harper-core/src/span.rs
@@ -74,8 +74,6 @@ impl<T> Span<T> {
/// Checks whether `idx` is within the range of the span.
pub fn contains(&self, idx: usize) -> bool {
- assert!(self.start <= self.end);
-
self.start <= idx && idx < self.end
}
@@ -84,17 +82,14 @@ impl<T> Span<T> {
(self.start < other.end) && (other.start < self.end)
}
- /// Get the associated content. Will return [`None`] if any aspect is
+ /// Get the associated content. Will return [`None`] if the span is non-empty and any aspect is
/// invalid.
pub fn try_get_content<'a>(&self, source: &'a [T]) -> Option<&'a [T]> {
- if (self.start > self.end) || (self.start >= source.len()) || (self.end > source.len()) {
- if self.is_empty() {
- return Some(&source[0..0]);
- }
- return None;
+ if self.is_empty() {
+ Some(&source[0..0])
+ } else {
+ source.get(self.start..self.end)
}
-
- Some(&source[self.start..self.end])
}
/// Expand the span by either modifying [`Self::start`] or [`Self::end`] to include the target
@@ -160,13 +155,6 @@ impl<T> Span<T> {
clone.end -= by;
Some(clone)
}
-
- /// Add an amount to a copy of both [`Self::start`] and [`Self::end`]
- pub fn with_offset(&self, by: usize) -> Self {
- let mut clone = *self;
- clone.push_by(by);
- clone
- }
}
/// Additional functions for types that implement [`std::fmt::Debug`] and [`Display`].