diff options
author | Gokul Soumya | 2023-06-18 17:27:11 +0000 |
---|---|---|
committer | Michael Davis | 2023-06-18 17:28:26 +0000 |
commit | f18acadbd0d7b15bc314fc3ede99f4546b72d76d (patch) | |
tree | 1413d7f13ac317a41e6e520d2af31cfa7e2a9631 /helix-term/src/commands/lsp.rs | |
parent | 545acfda8884c890b78e586c86e4f7c5f9a15477 (diff) |
Completely remove old Picker and rename FilePicker to Picker
Diffstat (limited to 'helix-term/src/commands/lsp.rs')
-rw-r--r-- | helix-term/src/commands/lsp.rs | 14 |
1 files changed, 7 insertions, 7 deletions
diff --git a/helix-term/src/commands/lsp.rs b/helix-term/src/commands/lsp.rs index 7cc2eaf8..55153648 100644 --- a/helix-term/src/commands/lsp.rs +++ b/helix-term/src/commands/lsp.rs @@ -31,8 +31,8 @@ use crate::{ compositor::{self, Compositor}, job::Callback, ui::{ - self, lsp::SignatureHelp, overlay::overlaid, DynamicPicker, FileLocation, FilePicker, - Popup, PromptEvent, + self, lsp::SignatureHelp, overlay::overlaid, DynamicPicker, FileLocation, Picker, Popup, + PromptEvent, }, }; @@ -236,11 +236,11 @@ fn jump_to_location( align_view(doc, view, Align::Center); } -type SymbolPicker = FilePicker<SymbolInformationItem>; +type SymbolPicker = Picker<SymbolInformationItem>; fn sym_picker(symbols: Vec<SymbolInformationItem>, current_path: Option<lsp::Url>) -> SymbolPicker { // TODO: drop current_path comparison and instead use workspace: bool flag? - FilePicker::new(symbols, current_path.clone(), move |cx, item, action| { + Picker::new(symbols, current_path.clone(), move |cx, item, action| { let (view, doc) = current!(cx.editor); push_jump(view, doc); @@ -288,7 +288,7 @@ fn diag_picker( diagnostics: BTreeMap<lsp::Url, Vec<(lsp::Diagnostic, usize)>>, current_path: Option<lsp::Url>, format: DiagnosticsFormat, -) -> FilePicker<PickerDiagnostic> { +) -> Picker<PickerDiagnostic> { // TODO: drop current_path comparison and instead use workspace: bool flag? // flatten the map to a vec of (url, diag) pairs @@ -314,7 +314,7 @@ fn diag_picker( error: cx.editor.theme.get("error"), }; - FilePicker::new( + Picker::new( flat_diag, (styles, format), move |cx, @@ -1043,7 +1043,7 @@ fn goto_impl( editor.set_error("No definition found."); } _locations => { - let picker = FilePicker::new(locations, cwdir, move |cx, location, action| { + let picker = Picker::new(locations, cwdir, move |cx, location, action| { jump_to_location(cx.editor, location, offset_encoding, action) }) .with_preview(move |_editor, location| Some(location_to_file_location(location))); |