Merge commit 'refs/pull/9647/head' of https://github.com/helix-editor…

…/helix
postsolar · Mar 10, 2024 · 72d9450 · 72d9450
2 parents 3953713 + 5bc0a19
commit 72d9450
Show file tree

Hide file tree

Showing 15 changed files with 1,306 additions and 819 deletions.
diff --git a/Cargo.lock b/Cargo.lock
diff --git a/Cargo.toml b/Cargo.toml
@@ -38,9 +38,9 @@ package.helix-term.opt-level = 2
 
 [workspace.dependencies]
 tree-sitter = { version = "0.20", git = "https://github.com/helix-editor/tree-sitter", rev = "660481dbf71413eba5a928b0b0ab8da50c1109e0" }
-nucleo = "0.2.0"
 ignore = "0.4"
 globset = "0.4.14"
+nucleo = "0.4.0"
 
 [workspace.package]
 version = "23.10.0"

diff --git a/README.md b/README.md
@@ -1,3 +1,11 @@
+# PRs merged into this branch
+
+[Add `unbind_default_keys` config option #9384](https://github.com/helix-editor/helix/pull/9384)
+[Add a simple amp-like jump command #8875](https://github.com/helix-editor/helix/pull/8875)
+[Add command expansions `%key{body}` #6979](https://github.com/helix-editor/helix/pull/6979)
+[Globbing support in `:open` #9723](https://github.com/helix-editor/helix/pull/9723)
+[Pickers "v2" #9647](https://github.com/helix-editor/helix/pull/9647)
+
 <div align="center">
 
 <h1>

diff --git a/book/src/themes.md b/book/src/themes.md
@@ -301,6 +301,7 @@ These scopes are used for theming the editor interface:
 | `ui.bufferline.background`        | Style for bufferline background                                                                |
 | `ui.popup`                        | Documentation popups (e.g. Space + k)                                                          |
 | `ui.popup.info`                   | Prompt for multiple key options                                                                |
+| `ui.picker.header`                | Column names in pickers with multiple columns                                                  |
 | `ui.window`                       | Borderlines separating splits                                                                  |
 | `ui.help`                         | Description box for commands                                                                   |
 | `ui.text`                         | Default text style, command prompts, popup text, etc.                                          |

diff --git a/helix-core/src/fuzzy.rs b/helix-core/src/fuzzy.rs
@@ -1,6 +1,6 @@
 use std::ops::DerefMut;
 
-use nucleo::pattern::{Atom, AtomKind, CaseMatching};
+use nucleo::pattern::{Atom, AtomKind, CaseMatching, Normalization};
 use nucleo::Config;
 use parking_lot::Mutex;
 
@@ -38,6 +38,12 @@ pub fn fuzzy_match<T: AsRef<str>>(
     if path {
         matcher.config.set_match_paths();
     }
-    let pattern = Atom::new(pattern, CaseMatching::Smart, AtomKind::Fuzzy, false);
+    let pattern = Atom::new(
+        pattern,
+        CaseMatching::Smart,
+        Normalization::Smart,
+        AtomKind::Fuzzy,
+        false,
+    );
     pattern.match_list(items, &mut matcher)
 }