Skip to content

Commit 4586c24

Browse files
committed
Merge remote-tracking branch 'origin/main' into fix/unicode-filepath-suffix-panic
2 parents a09292e + 2465c2c commit 4586c24

68 files changed

Lines changed: 7916 additions & 3026 deletions

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

.gitignore

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -15,6 +15,7 @@ result
1515
# all the perf like utility files
1616
*.data
1717
node_modules/
18+
crates/fff-notify-debouncer-full/
1819

1920
dist/
2021
scripts/benchmark-results/

Cargo.lock

Lines changed: 69 additions & 23 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

Cargo.toml

Lines changed: 6 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -7,11 +7,12 @@ members = [
77
"crates/fff-query-parser",
88
"crates/fff-grep",
99
]
10+
exclude = ["crates/fff-notify-debouncer-full"]
1011
resolver = "2"
1112

1213
[workspace.dependencies]
13-
fff-grep = { version = "0.5.1", path = "crates/fff-grep" }
14-
fff-query-parser = { version = "0.5.1", path = "crates/fff-query-parser", default-features = false }
14+
fff-grep = { version = "0.6.0", path = "crates/fff-grep" }
15+
fff-query-parser = { version = "0.6.0", path = "crates/fff-query-parser", default-features = false }
1516

1617
# Shared dependencies
1718
ahash = "0.8"
@@ -34,9 +35,9 @@ mimalloc = "0.1.47"
3435
zlob = "1.3.0"
3536

3637
mlua = { version = "0.11.1", features = ["module", "luajit"] }
37-
neo_frizbee = { version = "0.9.1", features = ["match_end_col"] }
38-
notify = "8.1.0"
39-
notify-debouncer-full = "0.7"
38+
neo_frizbee = { version = "0.10.1", features = ["match_end_col"] }
39+
notify = { version = "9.0.0-rc.3" }
40+
notify-debouncer-full = { package = "fff-notify-debouncer-full", version = "0.9.1" }
4041
once_cell = "1.20.2"
4142
parking_lot = "0.12"
4243
pathdiff = "0.2.1"

README.md

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -152,6 +152,7 @@ require('fff').setup({
152152
max_results = 100,
153153
max_threads = 4,
154154
lazy_sync = true, -- set to false if you want file indexing to start on open
155+
prompt_vim_mode = false, -- set to true to enable vim-mode in the prompt: <Esc> leaves insert for normal mode bindings (also allows <leader>p or <leader>l to jump around) the second <Esc> closes the picker
155156
layout = {
156157
height = 0.8,
157158
width = 0.8,

_typos.toml

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -6,6 +6,9 @@ noice = "noice"
66
fo = "fo"
77
ba = "ba"
88
ue = "ue"
9+
# some typos we use for tests
10+
comparsion = "comparsion"
11+
modfiers = "modfiers"
912

1013
[default]
1114
extend-ignore-re = [

crates/fff-c/Cargo.toml

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
[package]
22
name = "fff-c"
3-
version = "0.5.2"
3+
version = "0.6.0"
44
edition = "2024"
55
description = "Raw C api of FFF file finder"
66
license = "MIT"
@@ -17,7 +17,7 @@ mimalloc.workspace = true
1717
tracing.workspace = true
1818
git2.workspace = true
1919

20-
fff = { package = "fff-search", path = "../fff-core" , version = "0.5.1" }
21-
fff-query-parser = { path = "../fff-query-parser" , version = "0.5.2" }
20+
fff = { package = "fff-search", path = "../fff-core" , version = "0.6.0" }
21+
fff-query-parser = { path = "../fff-query-parser" , version = "0.6.0" }
2222
serde = { version = "1.0", features = ["derive"] }
2323
serde_json = "1.0"

0 commit comments

Comments
 (0)