kc/helix
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions 1

Make truncate_start a builder method instead

Browse source
This commit is contained in:
Blaž Hrastnik 2022-03-27 13:59:49 +09:00
parent 20cf75dfa1
commit 4940db3e2d
No known key found for this signature in database
GPG key ID: 1238B9C4AD889640
2 changed files with 15 additions and 6 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

6
helix-term/src/commands/lsp.rs
View file

@ -71,7 +71,7 @@ fn sym_picker(
) -> FilePicker<lsp::SymbolInformation> { ) -> FilePicker<lsp::SymbolInformation> {
// TODO: drop current_path comparison and instead use workspace: bool flag? // TODO: drop current_path comparison and instead use workspace: bool flag?
let current_path2 = current_path.clone(); let current_path2 = current_path.clone();
let mut picker = FilePicker::new( let picker = FilePicker::new(
symbols, symbols,
move |symbol| { move |symbol| {
if current_path.as_ref() == Some(&symbol.location.uri) { if current_path.as_ref() == Some(&symbol.location.uri) {
@ -104,8 +104,8 @@ fn sym_picker(
} }
}, },
move |_editor, symbol| Some(location_to_file_location(&symbol.location)), move |_editor, symbol| Some(location_to_file_location(&symbol.location)),
); )
picker.truncate_start = false; .truncate_start(false);
picker picker
} }

15
helix-term/src/ui/picker.rs
View file

@ -91,15 +91,25 @@ impl<T> FilePicker<T> {
callback_fn: impl Fn(&mut Context, &T, Action) + 'static, callback_fn: impl Fn(&mut Context, &T, Action) + 'static,
preview_fn: impl Fn(&Editor, &T) -> Option<FileLocation> + 'static, preview_fn: impl Fn(&Editor, &T) -> Option<FileLocation> + 'static,
) -> Self { ) -> Self {
let truncate_start = true;
let mut picker = Picker::new(options, format_fn, callback_fn);
picker.truncate_start = truncate_start;
Self { Self {
picker: Picker::new(options, format_fn, callback_fn), picker,
truncate_start: true, truncate_start,
preview_cache: HashMap::new(), preview_cache: HashMap::new(),
read_buffer: Vec::with_capacity(1024), read_buffer: Vec::with_capacity(1024),
file_fn: Box::new(preview_fn), file_fn: Box::new(preview_fn),
} }
} }
pub fn truncate_start(mut self, truncate_start: bool) -> Self {
self.truncate_start = truncate_start;
self.picker.truncate_start = truncate_start;
self
}
fn current_file(&self, editor: &Editor) -> Option<FileLocation> { fn current_file(&self, editor: &Editor) -> Option<FileLocation> {
self.picker self.picker
.selection() .selection()
@ -176,7 +186,6 @@ impl<T: 'static> Component for FilePicker<T> {
}; };
let picker_area = area.with_width(picker_width); let picker_area = area.with_width(picker_width);
self.picker.truncate_start = self.truncate_start;
self.picker.render(picker_area, surface, cx); self.picker.render(picker_area, surface, cx);
if !render_preview { if !render_preview {