git.iko.soy/helix
on master help sign in
Don't use word splitting during fuzzy matching (#8192)
e6cdc5fPascal Kuthe
helix-core/src/fuzzy.rs+3−3
compare with master
unifiedsplit
@@ -1,6 +1,6 @@
1use std::ops::DerefMut;
1use std::ops::DerefMut;
2
2
3−use nucleo::pattern::{AtomKind, CaseMatching, Pattern};
3+use nucleo::pattern::{Atom, AtomKind, CaseMatching};
4use nucleo::Config;
4use nucleo::Config;
5use parking_lot::Mutex;
5use parking_lot::Mutex;
6
6
@@ -32,12 +32,12 @@ pub fn fuzzy_match<T: AsRef<str>>(
32 pattern: &str,
32 pattern: &str,
33 items: impl IntoIterator<Item = T>,
33 items: impl IntoIterator<Item = T>,
34 path: bool,
34 path: bool,
35−) -> Vec<(T, u32)> {
35+) -> Vec<(T, u16)> {
36 let mut matcher = MATCHER.lock();
36 let mut matcher = MATCHER.lock();
37 matcher.config = Config::DEFAULT;
37 matcher.config = Config::DEFAULT;
38 if path {
38 if path {
39 matcher.config.set_match_paths();
39 matcher.config.set_match_paths();
40 }
40 }
41− let pattern = Pattern::new(pattern, CaseMatching::Smart, AtomKind::Fuzzy);
41+ let pattern = Atom::new(pattern, CaseMatching::Smart, AtomKind::Fuzzy, false);
42 pattern.match_list(items, &mut matcher)
42 pattern.match_list(items, &mut matcher)
43}
43}
helix-term/src/ui/menu.rs+3−3
@@ -5,7 +5,7 @@ use crate::{
5 ctrl, key, shift,
5 ctrl, key, shift,
6};
6};
7use helix_core::fuzzy::MATCHER;
7use helix_core::fuzzy::MATCHER;
8−use nucleo::pattern::{AtomKind, CaseMatching, Pattern};
8+use nucleo::pattern::{Atom, AtomKind, CaseMatching};
9use nucleo::{Config, Utf32Str};
9use nucleo::{Config, Utf32Str};
10use tui::{buffer::Buffer as Surface, widgets::Table};
10use tui::{buffer::Buffer as Surface, widgets::Table};
11
11
@@ -94,13 +94,13 @@ impl<T: Item> Menu<T> {
94 self.matches.clear();
94 self.matches.clear();
95 let mut matcher = MATCHER.lock();
95 let mut matcher = MATCHER.lock();
96 matcher.config = Config::DEFAULT;
96 matcher.config = Config::DEFAULT;
97− let pattern = Pattern::new(pattern, CaseMatching::Ignore, AtomKind::Fuzzy);
97+ let pattern = Atom::new(pattern, CaseMatching::Ignore, AtomKind::Fuzzy, false);
98 let mut buf = Vec::new();
98 let mut buf = Vec::new();
99 let matches = self.options.iter().enumerate().filter_map(|(i, option)| {
99 let matches = self.options.iter().enumerate().filter_map(|(i, option)| {
100 let text = option.filter_text(&self.editor_data);
100 let text = option.filter_text(&self.editor_data);
101 pattern
101 pattern
102 .score(Utf32Str::new(&text, &mut buf), &mut matcher)
102 .score(Utf32Str::new(&text, &mut buf), &mut matcher)
103− .map(|score| (i as u32, score))
103+ .map(|score| (i as u32, score as u32))
104 });
104 });
105 self.matches.extend(matches);
105 self.matches.extend(matches);
106 self.matches
106 self.matches