Unify suggestion-code, suggest different case words

sharkdp · Jul 27, 2023 · d4297c0 · d4297c0
1 parent a444ac4
commit d4297c0
Show file tree

Hide file tree

Showing 4 changed files with 35 additions and 21 deletions.
diff --git a/numbat/src/lib.rs b/numbat/src/lib.rs
@@ -21,6 +21,7 @@ mod quantity;
 mod registry;
 pub mod resolver;
 mod span;
+mod suggestion;
 mod tokenizer;
 mod typechecker;
 mod typed_ast;

diff --git a/numbat/src/registry.rs b/numbat/src/registry.rs
@@ -6,6 +6,7 @@ use thiserror::Error;
 use crate::{
     arithmetic::{pretty_exponent, Exponent, Power, Rational},
     product::{Canonicalize, Product},
+    suggestion,
 };
 
 #[derive(Clone, Error, Debug, PartialEq, Eq)]
@@ -126,17 +127,13 @@ impl<Metadata> Registry<Metadata> {
             self.derived_entries
                 .get(name)
                 .ok_or_else(|| {
-                    let suggestion = self
-                        .base_entries
-                        .iter()
-                        .map(|(id, _)| id.to_string())
-                        .chain(self.derived_entries.keys().map(|s| s.to_string()))
-                        .min_by_key(|id| strsim::damerau_levenshtein(id, name))
-                        .filter(|id| {
-                            name.len() >= 3
-                                && id.len() >= 2
-                                && strsim::damerau_levenshtein(id, name) <= 3
-                        });
+                    let suggestion = suggestion::did_you_mean(
+                        self.base_entries
+                            .iter()
+                            .map(|(id, _)| id.to_string())
+                            .chain(self.derived_entries.keys().map(|s| s.to_string())),
+                        name,
+                    );
                     RegistryError::UnknownEntry(name.to_owned(), suggestion)
                 })
                 .cloned()

diff --git a/numbat/src/suggestion.rs b/numbat/src/suggestion.rs
@@ -0,0 +1,22 @@
+pub fn did_you_mean<S: AsRef<str>, T: AsRef<str>>(
+    entries: impl Iterator<Item = S>,
+    user_input: T,
+) -> Option<String> {
+    if user_input.as_ref().len() < 3 {
+        return None;
+    }
+
+    entries
+        .map(|ref id| {
+            (
+                id.as_ref().to_string(),
+                strsim::damerau_levenshtein(
+                    &id.as_ref().to_lowercase(),
+                    &user_input.as_ref().to_lowercase(),
+                ),
+            )
+        })
+        .min_by_key(|(_, dist)| *dist)
+        .filter(|(id, dist)| id.len() >= 2 && *dist <= 3)
+        .map(|(id, _)| id)
+}
diff --git a/numbat/src/typechecker.rs b/numbat/src/typechecker.rs
@@ -7,7 +7,7 @@ use crate::name_resolution::LAST_RESULT_IDENTIFIERS;
 use crate::registry::{BaseRepresentation, BaseRepresentationFactor, RegistryError};
 use crate::span::Span;
 use crate::typed_ast::{self, Type};
-use crate::{ast, decorator, ffi};
+use crate::{ast, decorator, ffi, suggestion};
 
 use ast::DimensionExpression;
 use num_traits::{CheckedAdd, CheckedDiv, CheckedMul, CheckedSub, FromPrimitive, Zero};
@@ -169,15 +169,9 @@ pub struct TypeChecker {
 impl TypeChecker {
     fn type_for_identifier(&self, span: Span, name: &str) -> Result<&Type> {
         self.identifiers.get(name).ok_or_else(|| {
-            let suggestion = self
-                .identifiers
-                .iter()
-                .map(|(id, _)| id)
-                .min_by_key(|id| strsim::damerau_levenshtein(id, name))
-                .filter(|id| {
-                    name.len() >= 3 && id.len() >= 2 && strsim::damerau_levenshtein(id, name) <= 3
-                });
-            TypeCheckError::UnknownIdentifier(span, name.into(), suggestion.cloned())
+            let suggestion =
+                suggestion::did_you_mean(self.identifiers.iter().map(|(id, _)| id), name);
+            TypeCheckError::UnknownIdentifier(span, name.into(), suggestion)
         })
     }