Skip to content

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

fix: match only ascii digits, tests for word before and after

hippietrail8517445d75f3
diff --git a/harper-core/src/lexing/mod.rs b/harper-core/src/lexing/mod.rs
index ce1e24f1c..376e6bc2d 100644
--- a/harper-core/src/lexing/mod.rs
+++ b/harper-core/src/lexing/mod.rs
@@ -148,10 +148,10 @@ pub fn lex_long_decade(source: &[char]) -> Option<FoundToken> {
if source[0] != '1' && source[0] != '2' {
return None;
}
- if !source[1].is_numeric() {
+ if !source[1].is_ascii_digit() {
return None;
}
- if !source[2].is_numeric() {
+ if !source[2].is_ascii_digit() {
return None;
}
if source[3] != '0' {
@@ -399,6 +399,30 @@ mod tests {
));
}
+ #[test]
+ fn lexes_word_before_decade() {
+ let source: Vec<_> = "late 1980s".chars().collect();
+ assert!(matches!(
+ lex_token(&source),
+ Some(FoundToken {
+ token: TokenKind::Word(_),
+ ..
+ })
+ ));
+ }
+
+ #[test]
+ fn lexes_word_after_decade() {
+ let source: Vec<_> = "1980s and".chars().collect();
+ assert!(matches!(
+ lex_token(&source),
+ Some(FoundToken {
+ token: TokenKind::Decade,
+ ..
+ })
+ ));
+ }
+
#[test]
fn doesnt_lex_far_future_decade() {
let source: Vec<_> = "3190s".chars().collect();