Skip to content

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

feat(core): handle more cases in `DollarPlacement`

Elijah Potter2b57550b5055
diff --git a/harper-core/src/linting/dollar_placement.rs b/harper-core/src/linting/dollar_placement.rs
index ccbe1477a..5052fbabf 100644
--- a/harper-core/src/linting/dollar_placement.rs
+++ b/harper-core/src/linting/dollar_placement.rs
@@ -1,5 +1,5 @@
use crate::{
- patterns::{Pattern, SequencePattern},
+ patterns::{EitherPattern, Pattern, SequencePattern},
Punctuation, Token, TokenKind, TokenStringExt,
};
@@ -13,11 +13,19 @@ pub struct DollarPlacement {
impl Default for DollarPlacement {
fn default() -> Self {
- let pattern = SequencePattern::default().then_number().then(Box::new(
- |t: &Token, _source: &[char]| {
- matches!(t.kind, TokenKind::Punctuation(Punctuation::Dollar))
- },
- ));
+ let dollar_pat = Box::new(|t: &Token, _source: &[char]| {
+ matches!(t.kind, TokenKind::Punctuation(Punctuation::Dollar))
+ });
+
+ let pattern = EitherPattern::new(vec![
+ Box::new(
+ SequencePattern::default()
+ .then_number()
+ .then_whitespace()
+ .then(dollar_pat.clone()),
+ ),
+ Box::new(SequencePattern::default().then_number().then(dollar_pat)),
+ ]);
Self {
pattern: Box::new(pattern),
@@ -30,10 +38,10 @@ impl PatternLinter for DollarPlacement {
self.pattern.as_ref()
}
- fn match_to_lint(&self, matched_tokens: &[Token], source: &[char]) -> Lint {
- let _ = source;
+ fn match_to_lint(&self, matched_tokens: &[Token], _source: &[char]) -> Lint {
// We can unwrap like this thanks to the pattern.
- let (value, suffix) = matched_tokens.first().unwrap().kind.as_number().unwrap();
+ let number_tok = matched_tokens.first_number().unwrap();
+ let (value, suffix) = number_tok.kind.as_number().unwrap();
let mut fix = vec!['$'];
@@ -44,7 +52,7 @@ impl PatternLinter for DollarPlacement {
}
Lint {
- span: matched_tokens[0..2].span().unwrap(),
+ span: matched_tokens.span().unwrap(),
lint_kind: LintKind::Formatting,
suggestions: vec![Suggestion::ReplaceWith(fix)],
message: DESCRIPTION.to_string(),
@@ -81,6 +89,24 @@ mod tests {
);
}
+ #[test]
+ fn blog_title_with_space() {
+ assert_suggestion_result(
+ "The Best 25 $ I Ever Spent",
+ DollarPlacement::default(),
+ "The Best $25 I Ever Spent",
+ );
+ }
+
+ #[test]
+ fn multiple() {
+ assert_suggestion_result(
+ "They were either 25$ 24$ or 23$.",
+ DollarPlacement::default(),
+ "They were either $25 $24 or $23.",
+ );
+ }
+
#[test]
fn suffix() {
assert_suggestion_result(
diff --git a/harper-core/src/patterns/sequence_pattern.rs b/harper-core/src/patterns/sequence_pattern.rs
index e3b21b9d0..c1eb7ac53 100644
--- a/harper-core/src/patterns/sequence_pattern.rs
+++ b/harper-core/src/patterns/sequence_pattern.rs
@@ -11,6 +11,7 @@ pub struct SequencePattern {
token_patterns: Vec<Box<dyn Pattern>>,
}
+/// Generate a `then_*` method from an available `is_*` function on [`TokenKind`].
macro_rules! gen_then_from_is {
($quality:ident) => {
paste! {