git.iko.soy/helix
on master help sign in
Move FilePicker::render from Component impl to normal impl

Merges the code for the Picker and FilePicker into a single Picker that can show a file preview if a preview callback is provided. This change was mainly made to facilitate refactoring out a simple skeleton of a picker that does not do any filtering to be reused in a normal Picker and a DynamicPicker (see #5714; in particular [mikes-comment] and [gokuls-comment]). The crux of the issue is that a picker maintains a list of predefined options (eg. list of files in the directory) and (re-)filters them every time the picker prompt changes, while a dynamic picker (eg. interactive global search, #4687) recalculates the full list of options on every prompt change. Using a filtering picker to drive a dynamic picker hence does duplicate work of filtering thousands of matches for no reason. It could also cause problems like interfering with the regex pattern in the global search. I tried to directly extract a PickerBase to be reused in Picker and FilePicker and DynamicPicker, but the problem is that DynamicPicker is actually a DynamicFilePicker (i.e. it can preview file contents) which means we would need PickerBase, Picker, FilePicker, DynamicPicker and DynamicFilePicker and then another way of sharing the previewing code between a FilePicker and a DynamicFilePicker. By merging Picker and FilePicker into Picker, we only need PickerBase, Picker and DynamicPicker. [gokuls-comment]: https://github.com/helix-editor/helix/issues/5714#issuecomment-1410949578 [mikes-comment]: https://github.com/helix-editor/helix/issues/5714#issuecomment-1407451963

commit40916dff6355a741f91bc47ca0a3c6443ac2d5a3 authorGokul Soumya <gokulps15@gmail.com> dateSun 18 Jun 2023, 11:34 (3 years ago) parentd5af603
1 file changed+7−3
compare with master
unifiedsplit
helix-term/src/ui/picker.rs+7−3
helix-term/src/ui/picker.rs+7−3
@@ -269,10 +269,8 @@ impl<T: Item + 'static> FilePicker<T> {
269269
270270 EventResult::Consumed(callback)
271271 }
272−}
273272
274−impl<T: Item + 'static> Component for FilePicker<T> {
275− fn render(&mut self, area: Rect, surface: &mut Surface, cx: &mut Context) {
273+ fn render_picker(&mut self, area: Rect, surface: &mut Surface, cx: &mut Context) {
276274 // +---------+ +---------+
277275 // |prompt | |preview |
278276 // +---------+ | |
@@ -416,6 +414,12 @@ impl<T: Item + 'static> Component for FilePicker<T> {
416414 }
417415}
418416
417+impl<T: Item + 'static> Component for FilePicker<T> {
418+ fn render(&mut self, area: Rect, surface: &mut Surface, cx: &mut Context) {
419+ self.render_picker(area, surface, cx);
420+ }
421+}
422+
419423#[derive(PartialEq, Eq, Debug)]
420424struct PickerMatch {
421425 score: i64,