implement using linear search

printfn · Oct 30, 2023 · 951a10b · 951a10b
1 parent e89d672
commit 951a10b
Show file tree

Hide file tree

Showing 3 changed files with 81 additions and 130 deletions.
diff --git a/Cargo.lock b/Cargo.lock
diff --git a/core/Cargo.toml b/core/Cargo.toml
@@ -9,6 +9,3 @@ keywords.workspace = true
 categories.workspace = true
 license.workspace = true
 readme = "README.md"
-
-[dependencies]
-phf = { version = "0.11.2", features = ["macros"] }
diff --git a/core/src/lib.rs b/core/src/lib.rs
@@ -44,7 +44,6 @@ use std::{collections::HashMap, fmt, io};
 use error::FendError;
 pub(crate) use eval::Attrs;
 pub use interrupt::Interrupt;
-use phf::phf_map;
 use serialize::{deserialize_string, deserialize_usize, serialize_string, serialize_usize};
 
 /// This contains the result of a computation.
@@ -445,56 +444,58 @@ impl Completion {
 	}
 }
 
-static GREEK_LETTERS: phf::Map<&'static str, &'static str> = phf_map! {
-	"\\alpha" => "α",
-	"\\beta" => "β",
-	"\\gamma" => "γ",
-	"\\delta" => "δ",
-	"\\epsilon" => "ε",
-	"\\zeta" => "ζ",
-	"\\eta" => "η",
-	"\\theta" => "θ",
-	"\\iota" => "ι",
-	"\\kappa" => "κ",
-	"\\lambda" => "λ",
-	"\\mu" => "μ",
-	"\\nu" => "ν",
-	"\\xi" => "ξ",
-	"\\omicron" => "ο",
-	"\\pi" => "π",
-	"\\rho" => "ρ",
-	"\\sigma" => "σ",
-	"\\tau" => "τ",
-	"\\upsilon" => "υ",
-	"\\phi" => "φ",
-	"\\chi" => "χ",
-	"\\psi" => "ψ",
-	"\\omega" => "ω",
-	"\\Alpha" => "Α",
-	"\\Beta" => "Β",
-	"\\Gamma" => "Γ",
-	"\\Delta" => "Δ",
-	"\\Epsilon" => "Ε",
-	"\\Zeta" => "Ζ",
-	"\\Eta" => "Η",
-	"\\Theta" => "Θ",
-	"\\Iota" => "Ι",
-	"\\Kappa" => "Κ",
-	"\\Lambda" => "Λ",
-	"\\Mu" => "Μ",
-	"\\Nu" => "Ν",
-	"\\Xi" => "Ξ",
-	"\\Omicron" => "Ο",
-	"\\Pi" => "Π",
-	"\\Rho" => "Ρ",
-	"\\Sigma" => "Σ",
-	"\\Tau" => "Τ",
-	"\\Upsilon" => "Υ",
-	"\\Phi" => "Φ",
-	"\\Chi" => "Χ",
-	"\\Psi" => "Ψ",
-	"\\Omega" => "Ω",
-};
+static GREEK_LOWERCASE_LETTERS: [(&str, &str); 24] = [
+	("alpha", "α"),
+	("beta", "β"),
+	("gamma", "γ"),
+	("delta", "δ"),
+	("epsilon", "ε"),
+	("zeta", "ζ"),
+	("eta", "η"),
+	("theta", "θ"),
+	("iota", "ι"),
+	("kappa", "κ"),
+	("lambda", "λ"),
+	("mu", "μ"),
+	("nu", "ν"),
+	("xi", "ξ"),
+	("omicron", "ο"),
+	("pi", "π"),
+	("rho", "ρ"),
+	("sigma", "σ"),
+	("tau", "τ"),
+	("upsilon", "υ"),
+	("phi", "φ"),
+	("chi", "χ"),
+	("psi", "ψ"),
+	("omega", "ω"),
+];
+static GREEK_UPPERCASE_LETTERS: [(&str, &str); 24] = [
+	("Alpha", "Α"),
+	("Beta", "Β"),
+	("Gamma", "Γ"),
+	("Delta", "Δ"),
+	("Epsilon", "Ε"),
+	("Zeta", "Ζ"),
+	("Eta", "Η"),
+	("Theta", "Θ"),
+	("Iota", "Ι"),
+	("Kappa", "Κ"),
+	("Lambda", "Λ"),
+	("Mu", "Μ"),
+	("Nu", "Ν"),
+	("Xi", "Ξ"),
+	("Omicron", "Ο"),
+	("Pi", "Π"),
+	("Rho", "Ρ"),
+	("Sigma", "Σ"),
+	("Tau", "Τ"),
+	("Upsilon", "Υ"),
+	("Phi", "Φ"),
+	("Chi", "Χ"),
+	("Psi", "Ψ"),
+	("Omega", "Ω"),
+];
 
 #[must_use]
 pub fn get_completions_for_prefix(mut prefix: &str) -> (usize, Vec<Completion>) {
@@ -504,16 +505,35 @@ pub fn get_completions_for_prefix(mut prefix: &str) -> (usize, Vec<Completion>)
 		prepend = a;
 		prefix = b;
 	}
-	if prefix.starts_with('\\') {
-		return GREEK_LETTERS.get(prefix).map_or((0, vec![]), |&letter| {
-			(
-				0,
-				vec![Completion {
-					display: prefix.to_owned(),
-					insert: letter.to_owned(),
-				}],
-			)
-		});
+	if let Some(letter) = prefix.strip_prefix('\\') {
+		if letter.starts_with(|c: char| !c.is_ascii_alphabetic()) {
+			return (0, vec![]);
+		} else if letter.starts_with(|c: char| c.is_ascii_uppercase()) {
+			return GREEK_UPPERCASE_LETTERS
+				.iter()
+				.find(|l| l.0 == letter)
+				.map_or((0, vec![]), |l| {
+					(
+						0,
+						vec![Completion {
+							display: prefix.to_string(),
+							insert: l.1.to_string(),
+						}],
+					)
+				});
+		}
+		return GREEK_LOWERCASE_LETTERS
+			.iter()
+			.find(|l| l.0 == letter)
+			.map_or((0, vec![]), |l| {
+				(
+					0,
+					vec![Completion {
+						display: prefix.to_string(),
+						insert: l.1.to_string(),
+					}],
+				)
+			});
 	}
 	if prefix.is_empty() {
 		return (0, vec![]);