transition to nucleo for fuzzy matching

helix-core/Cargo.toml

@@ -48,6 +48,9 @@ chrono = { version = "0.4", default-features = false, features = ["alloc", "std"
 etcetera = "0.8"
 textwrap = "0.16.0"
 
+nucleo = { version = "0.1", git = "https://github.com/helix-editor/nucleo.git" }
+parking_lot = "0.12"
+
 [dev-dependencies]
 quickcheck = { version = "1", default-features = false }
 indoc = "2.0.3"

helix-core/src/fuzzy.rs

@@ -0,0 +1,22 @@
+use nucleo::{CaseMatching, MatcherConfig};
+use parking_lot::Mutex;
+
+pub static MATCHER: Mutex<Option<nucleo::Matcher>> = Mutex::new(None);
+
+/// convenicne function to easily fuzzy match
+/// on a (relatievly small list of inputs). This is not recommended for building a full tui
+/// application that can match large numbers of matches as all matching is done on the current
+/// thread, effectively blocking the UI
+pub fn fuzzy_match<T: AsRef<str>>(
+    pattern: &str,
+    items: impl IntoIterator<Item = T>,
+    path: bool,
+) -> Vec<(T, u32)> {
+    let mut matcher_lock = MATCHER.lock();
+    let matcher = matcher_lock.get_or_insert_with(nucleo::Matcher::default);
+    matcher.config = MatcherConfig::DEFAULT;
+    if path {
+        matcher.config.set_match_paths();
+    }
+    nucleo::fuzzy_match(matcher, pattern, items, CaseMatching::Smart)
+}

helix-core/src/lib.rs

@@ -7,6 +7,7 @@ pub mod config;
 pub mod diagnostic;
 pub mod diff;
 pub mod doc_formatter;
+pub mod fuzzy;
 pub mod graphemes;
 pub mod history;
 pub mod increment;

helix-term/Cargo.toml

@@ -49,7 +49,7 @@ chrono = { version = "0.4", default-features = false, features = ["clock"] }
 log = "0.4"
 
 # File picker
-fuzzy-matcher = "0.3"
+nucleo = { version = "0.1", git = "https://github.com/helix-editor/nucleo.git" }
 ignore = "0.4"
 # markdown doc rendering
 pulldown-cmark = { version = "0.9", default-features = false }

helix-term/src/application.rs

@@ -166,7 +166,11 @@ impl Application {
             if first.is_dir() {
                 helix_loader::set_current_working_dir(first.clone())?;
                 editor.new_file(Action::VerticalSplit);
-                let picker = ui::file_picker(".".into(), &config.load().editor);
+                let picker = ui::file_picker(
+                    ".".into(),
+                    &config.load().editor,
+                    editor.redraw_handle.0.clone(),
+                );
                 compositor.push(Box::new(overlaid(picker)));
             } else {
                 let nr_of_files = args.files.len();