git.iko.soy/helix
on master help sign in
Do not show (running) when opening picker (#8148)

* only stream from background thread if necessary If the file transversal is longer shorter 30ms it will now be performed on the main thread. Spawning a thread can take a while (or rather it takes a while until that thread is scheduled) so the files can actually take a while to show up. This prevents the `(running)` indicator from briefly showing up when opening the file picker in a small directory. * run partial cargo update

commit0cfd46c14f67351db1e739834f58d8ed15d2bb4d authorPascal Kuthe <pascal.kuthe@semimod.de> dateWed 6 Sep 2023, 07:01 (3 years ago) parent8778083
2 files changed+32−45
compare with master
unifiedsplit
Cargo.lock+11−38 helix-term/src/ui/mod.rs+21−7
Cargo.lock+11−38
@@ -17,17 +17,6 @@ version = "1.0.2"
1717source = "registry+https://github.com/rust-lang/crates.io-index"
1818checksum = "f26201604c87b1e01bd3d98f8d5d9a8fcbb815e8cedb41ffccbeb4bf593a35fe"
1919
20−[[package]]
21−name = "ahash"
22−version = "0.7.6"
23−source = "registry+https://github.com/rust-lang/crates.io-index"
24−checksum = "fcb51a0695d8f838b1ee009b3fbf66bda078cd64590202a864a8f3e8c4315c47"
25−dependencies = [
26− "getrandom",
27− "once_cell",
28− "version_check",
29−]
30−
3120[[package]]
3221name = "ahash"
3322version = "0.8.3"
@@ -107,7 +96,7 @@ dependencies = [
10796 "cc",
10897 "cfg-if",
10998 "libc",
110− "miniz_oxide 0.7.1",
99+ "miniz_oxide",
111100 "object",
112101 "rustc-demangle",
113102]
@@ -495,12 +484,12 @@ dependencies = [
495484
496485[[package]]
497486name = "flate2"
498−version = "1.0.25"
487+version = "1.0.27"
499488source = "registry+https://github.com/rust-lang/crates.io-index"
500−checksum = "a8a2db397cb1c8772f31494cb8917e48cd1e64f0fa7efac59fbd741a0a8ce841"
489+checksum = "c6c98ee8095e9d1dcbf2fcc6d95acccb90d1c81db1e44725c6a984b1dbdfb010"
501490dependencies = [
502491 "crc32fast",
503− "miniz_oxide 0.6.2",
492+ "miniz_oxide",
504493]
505494
506495[[package]]
@@ -1237,9 +1226,6 @@ name = "hashbrown"
12371226version = "0.12.3"
12381227source = "registry+https://github.com/rust-lang/crates.io-index"
12391228checksum = "8a9ee70c43aaf417c914396645a0fa852624801b24ebb7ae78fe8272889ac888"
1240−dependencies = [
1241− "ahash 0.7.6",
1242−]
12431229
12441230[[package]]
12451231name = "hashbrown"
@@ -1247,7 +1233,7 @@ version = "0.14.0"
12471233source = "registry+https://github.com/rust-lang/crates.io-index"
12481234checksum = "2c6201b9ff9fd90a5a3bac2e56a830d0caa509576f0e503818ee82c181b3437a"
12491235dependencies = [
1250− "ahash 0.8.3",
1236+ "ahash",
12511237 "allocator-api2",
12521238]
12531239
@@ -1255,7 +1241,7 @@ dependencies = [
12551241name = "helix-core"
12561242version = "0.6.0"
12571243dependencies = [
1258− "ahash 0.8.3",
1244+ "ahash",
12591245 "arc-swap",
12601246 "bitflags 2.4.0",
12611247 "chrono",
@@ -1546,7 +1532,7 @@ version = "0.1.5"
15461532source = "registry+https://github.com/rust-lang/crates.io-index"
15471533checksum = "e98c1d0ad70fc91b8b9654b1f33db55e59579d3b3de2bffdced0fdb810570cb8"
15481534dependencies = [
1549− "ahash 0.8.3",
1535+ "ahash",
15501536 "hashbrown 0.12.3",
15511537]
15521538
@@ -1722,15 +1708,6 @@ version = "0.2.1"
17221708source = "registry+https://github.com/rust-lang/crates.io-index"
17231709checksum = "68354c5c6bd36d73ff3feceb05efa59b6acb7626617f4962be322a825e61f79a"
17241710
1725−[[package]]
1726−name = "miniz_oxide"
1727−version = "0.6.2"
1728−source = "registry+https://github.com/rust-lang/crates.io-index"
1729−checksum = "b275950c28b37e794e8c55d88aeb5e139d0ce23fdbbeda68f8d7174abdf9e8fa"
1730−dependencies = [
1731− "adler",
1732−]
1733−
17341711[[package]]
17351712name = "miniz_oxide"
17361713version = "0.7.1"
@@ -1764,9 +1741,9 @@ dependencies = [
17641741
17651742[[package]]
17661743name = "nucleo"
1767−version = "0.2.0"
1744+version = "0.2.1"
17681745source = "registry+https://github.com/rust-lang/crates.io-index"
1769−checksum = "0ccab936f2c8ad271bb31430944d98d358f74153566ea323265497f5639b11b6"
1746+checksum = "ae5331f4bcce475cf28cb29c95366c3091af4b0aa7703f1a6bc858f29718fdf3"
17701747dependencies = [
17711748 "nucleo-matcher",
17721749 "parking_lot",
@@ -2509,13 +2486,9 @@ checksum = "e5464a87b239f13a63a501f2701565754bae92d243d4bb7eb12f6d57d2269bf4"
25092486
25102487[[package]]
25112488name = "unicode-linebreak"
2512−version = "0.1.4"
2489+version = "0.1.5"
25132490source = "registry+https://github.com/rust-lang/crates.io-index"
2514−checksum = "c5faade31a542b8b35855fff6e8def199853b2da8da256da52f52f1316ee3137"
2515−dependencies = [
2516− "hashbrown 0.12.3",
2517− "regex",
2518−]
2491+checksum = "3b09c83c3c29d37506a3e260c08c03743a6bb66a9cd432c6934ab501a190571f"
25192492
25202493[[package]]
25212494name = "unicode-normalization"
helix-term/src/ui/mod.rs+21−7
@@ -190,7 +190,7 @@ pub fn file_picker(root: PathBuf, config: &helix_view::editor::Config) -> Picker
190190 .build()
191191 .expect("failed to build excluded_types");
192192 walk_builder.types(excluded_types);
193− let files = walk_builder.build().filter_map(|entry| {
193+ let mut files = walk_builder.build().filter_map(|entry| {
194194 let entry = entry.ok()?;
195195 if !entry.file_type()?.is_file() {
196196 return None;
@@ -211,13 +211,27 @@ pub fn file_picker(root: PathBuf, config: &helix_view::editor::Config) -> Picker
211211 })
212212 .with_preview(|_editor, path| Some((path.clone().into(), None)));
213213 let injector = picker.injector();
214− std::thread::spawn(move || {
215− for file in files {
216− if injector.push(file).is_err() {
217− break;
218− }
214+ let timeout = std::time::Instant::now() + std::time::Duration::from_millis(30);
215+
216+ let mut hit_timeout = false;
217+ for file in &mut files {
218+ if injector.push(file).is_err() {
219+ break;
219220 }
220− });
221+ if std::time::Instant::now() >= timeout {
222+ hit_timeout = true;
223+ break;
224+ }
225+ }
226+ if hit_timeout {
227+ std::thread::spawn(move || {
228+ for file in files {
229+ if injector.push(file).is_err() {
230+ break;
231+ }
232+ }
233+ });
234+ }
221235 picker
222236}
223237