Skip to content

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

feat(core): respect user precision

Elijah Potter8eb663d8ca33
diff --git a/harper-core/src/lexing/mod.rs b/harper-core/src/lexing/mod.rs
index fed406647..2b40adf70 100644
--- a/harper-core/src/lexing/mod.rs
+++ b/harper-core/src/lexing/mod.rs
@@ -79,11 +79,14 @@ pub fn lex_number(source: &[char]) -> Option<FoundToken> {
// Find the longest possible valid number
while !s.is_empty() {
if let Ok(n) = s.parse::<f64>() {
+ let precision = s.chars().rev().position(|c| c == '.').unwrap_or_default();
+
return Some(FoundToken {
token: TokenKind::Number(Number {
value: n.into(),
suffix: None,
radix: 10,
+ precision,
}),
next_index: s.len(),
});
@@ -127,6 +130,7 @@ pub fn lex_hex_number(source: &[char]) -> Option<FoundToken> {
value: OrderedFloat(n as f64),
suffix: None,
radix: 16,
+ precision: 0,
}),
next_index: s.len() + 2,
});
diff --git a/harper-core/src/linting/currency_placement.rs b/harper-core/src/linting/currency_placement.rs
index 1ea72ab9f..b470304da 100644
--- a/harper-core/src/linting/currency_placement.rs
+++ b/harper-core/src/linting/currency_placement.rs
@@ -49,6 +49,7 @@ fn generate_lint_for_tokens(a: Token, b: Token, document: &Document) -> Option<L
let span = matched_tokens.span().unwrap();
+ dbg!(number);
let correct: Vec<_> = currency.format_amount(number).chars().collect();
let actual = document.get_span_content(span);
@@ -138,4 +139,9 @@ mod tests {
"It was my $20th.",
);
}
+
+ #[test]
+ fn seven_even_two_decimal_clean() {
+ assert_lint_count("$7.00", CurrencyPlacement::default(), 0);
+ }
}
diff --git a/harper-core/src/number.rs b/harper-core/src/number.rs
index 9447eb00e..bcd68d6d3 100644
--- a/harper-core/src/number.rs
+++ b/harper-core/src/number.rs
@@ -9,11 +9,16 @@ pub struct Number {
pub value: OrderedFloat<f64>,
pub suffix: Option<NumberSuffix>,
pub radix: u32,
+ pub precision: usize,
}
impl Display for Number {
fn fmt(&self, f: &mut std::fmt::Formatter<'_>) -> std::fmt::Result {
- write!(f, "{}", self.value)?;
+ if self.radix == 16 {
+ write!(f, "0x{:X}", self.value.0 as u64)?;
+ } else {
+ write!(f, "{:.*}", self.precision, self.value.0)?;
+ }
if let Some(suffix) = self.suffix {
for c in suffix.to_chars() {
@@ -102,3 +107,68 @@ impl NumberSuffix {
}
}
}
+
+#[cfg(test)]
+mod tests {
+ use ordered_float::OrderedFloat;
+
+ use crate::NumberSuffix;
+
+ use super::Number;
+
+ #[test]
+ fn hex_fifteen() {
+ assert_eq!(
+ Number {
+ value: OrderedFloat(15.0),
+ suffix: None,
+ radix: 16,
+ precision: 0
+ }
+ .to_string(),
+ "0xF"
+ )
+ }
+
+ #[test]
+ fn decimal_fifteen() {
+ assert_eq!(
+ Number {
+ value: OrderedFloat(15.0),
+ suffix: None,
+ radix: 10,
+ precision: 0
+ }
+ .to_string(),
+ "15"
+ )
+ }
+
+ #[test]
+ fn decimal_fifteen_suffix() {
+ assert_eq!(
+ Number {
+ value: OrderedFloat(15.0),
+ suffix: Some(NumberSuffix::Th),
+ radix: 10,
+ precision: 0
+ }
+ .to_string(),
+ "15th"
+ )
+ }
+
+ #[test]
+ fn decimal_fifteen_and_a_half() {
+ assert_eq!(
+ Number {
+ value: OrderedFloat(15.5),
+ suffix: None,
+ radix: 10,
+ precision: 2
+ }
+ .to_string(),
+ "15.50"
+ )
+ }
+}