Extract a helper function for lsp::Location

helix-term/src/commands/lsp.rs

@@ -11,11 +11,20 @@ use helix_view::editor::Action;
 
 use crate::{
     compositor::{self, Compositor},
-    ui::{self, overlay::overlayed, FilePicker, Popup, Prompt, PromptEvent},
+    ui::{self, overlay::overlayed, FileLocation, FilePicker, Popup, Prompt, PromptEvent},
 };
 
 use std::borrow::Cow;
 
+fn location_to_file_location(location: &lsp::Location) -> FileLocation {
+    let path = location.uri.to_file_path().unwrap();
+    let line = Some((
+        location.range.start.line as usize,
+        location.range.end.line as usize,
+    ));
+    (path, line)
+}
+
 fn sym_picker(
     symbols: Vec<lsp::SymbolInformation>,
     current_path: Option<lsp::Url>,
@@ -55,14 +64,7 @@ fn sym_picker(
                 align_view(doc, view, Align::Center);
             }
         },
-        move |_editor, symbol| {
+        move |_editor, symbol| Some(location_to_file_location(&symbol.location)),
-            let path = symbol.location.uri.to_file_path().unwrap();
-            let line = Some((
-                symbol.location.range.start.line as usize,
-                symbol.location.range.end.line as usize,
-            ));
-            Some((path, line))
-        },
     );
     picker.truncate_start = false;
     picker
@@ -465,15 +467,7 @@ fn goto_impl(
                     format!("{}:{}", file, line).into()
                 },
                 move |cx, location, action| jump_to(cx.editor, location, offset_encoding, action),
-                |_editor, location| {
+                move |_editor, location| Some(location_to_file_location(location)),
-                    // TODO: share code for symbol.location and location
-                    let path = location.uri.to_file_path().unwrap();
-                    let line = Some((
-                        location.range.start.line as usize,
-                        location.range.end.line as usize,
-                    ));
-                    Some((path, line))
-                },
             );
             compositor.push(Box::new(overlayed(picker)));
         }

helix-term/src/ui/mod.rs

@@ -14,7 +14,7 @@ pub use completion::Completion;
 pub use editor::EditorView;
 pub use markdown::Markdown;
 pub use menu::Menu;
-pub use picker::{FilePicker, Picker};
+pub use picker::{FileLocation, FilePicker, Picker};
 pub use popup::Popup;
 pub use prompt::{Prompt, PromptEvent};
 pub use spinner::{ProgressSpinners, Spinner};

helix-term/src/ui/picker.rs

@@ -33,7 +33,7 @@ pub const MIN_AREA_WIDTH_FOR_PREVIEW: u16 = 72;
 pub const MAX_FILE_SIZE_FOR_PREVIEW: u64 = 10 * 1024 * 1024;
 
 /// File path and range of lines (used to align and highlight lines)
-type FileLocation = (PathBuf, Option<(usize, usize)>);
+pub type FileLocation = (PathBuf, Option<(usize, usize)>);
 
 pub struct FilePicker<T> {
     picker: Picker<T>,