Added workspace_symbol_picker (#1041)

* Added workspace_symbol_picker

* Moved truncation of the symbol pickers to the end.

* Fixed typo
pull/999/head
Ebbe Steenhoudt 3 years ago committed by GitHub
parent 1817b7f581
commit edc976b6bb
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23

@ -211,6 +211,7 @@ This layer is a kludge of mappings, mostly pickers.
| `b` | Open buffer picker | `buffer_picker` | | `b` | Open buffer picker | `buffer_picker` |
| `k` | Show documentation for item under cursor (**LSP**) | `hover` | | `k` | Show documentation for item under cursor (**LSP**) | `hover` |
| `s` | Open document symbol picker (**LSP**) | `symbol_picker` | | `s` | Open document symbol picker (**LSP**) | `symbol_picker` |
| `S` | Open workspace symbol picker (**LSP**) | `workspace_symbol_picker` |
| `r` | Rename symbol (**LSP**) | `rename_symbol` | | `r` | Rename symbol (**LSP**) | `rename_symbol` |
| `a` | Apply code action (**LSP**) | `code_action` | | `a` | Apply code action (**LSP**) | `code_action` |
| `'` | Open last fuzzy picker | `last_picker` | | `'` | Open last fuzzy picker | `last_picker` |

@ -237,6 +237,7 @@ impl Command {
code_action, "Perform code action", code_action, "Perform code action",
buffer_picker, "Open buffer picker", buffer_picker, "Open buffer picker",
symbol_picker, "Open symbol picker", symbol_picker, "Open symbol picker",
workspace_symbol_picker, "Open workspace symbol picker",
last_picker, "Open last picker", last_picker, "Open last picker",
prepend_to_line, "Insert at start of line", prepend_to_line, "Insert at start of line",
append_to_line, "Insert at end of line", append_to_line, "Insert at end of line",
@ -2723,7 +2724,7 @@ fn symbol_picker(cx: &mut Context) {
} }
}; };
let picker = FilePicker::new( let mut picker = FilePicker::new(
symbols, symbols,
|symbol| (&symbol.name).into(), |symbol| (&symbol.name).into(),
move |editor: &mut Editor, symbol, _action| { move |editor: &mut Editor, symbol, _action| {
@ -2748,6 +2749,69 @@ fn symbol_picker(cx: &mut Context) {
Some((path, line)) Some((path, line))
}, },
); );
picker.truncate_start = false;
compositor.push(Box::new(picker))
}
},
)
}
fn workspace_symbol_picker(cx: &mut Context) {
let (_, doc) = current!(cx.editor);
let language_server = match doc.language_server() {
Some(language_server) => language_server,
None => return,
};
let offset_encoding = language_server.offset_encoding();
let future = language_server.workspace_symbols("".to_string());
let current_path = doc_mut!(cx.editor).path().cloned();
cx.callback(
future,
move |_editor: &mut Editor,
compositor: &mut Compositor,
response: Option<Vec<lsp::SymbolInformation>>| {
if let Some(symbols) = response {
let mut picker = FilePicker::new(
symbols,
move |symbol| {
let path = symbol.location.uri.to_file_path().unwrap();
if current_path.as_ref().map(|p| p == &path).unwrap_or(false) {
(&symbol.name).into()
} else {
let relative_path = helix_core::path::get_relative_path(path.as_path())
.to_str()
.unwrap()
.to_owned();
format!("{} ({})", &symbol.name, relative_path).into()
}
},
move |editor: &mut Editor, symbol, action| {
let path = symbol.location.uri.to_file_path().unwrap();
editor.open(path, action).expect("editor.open failed");
let (view, doc) = current!(editor);
if let Some(range) =
lsp_range_to_range(doc.text(), symbol.location.range, offset_encoding)
{
// we flip the range so that the cursor sits on the start of the symbol
// (for example start of the function).
doc.set_selection(view.id, Selection::single(range.head, range.anchor));
align_view(doc, view, Align::Center);
}
},
move |_editor, symbol| {
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;
compositor.push(Box::new(picker)) compositor.push(Box::new(picker))
} }
}, },

@ -641,6 +641,7 @@ impl Default for Keymaps {
"f" => file_picker, "f" => file_picker,
"b" => buffer_picker, "b" => buffer_picker,
"s" => symbol_picker, "s" => symbol_picker,
"S" => workspace_symbol_picker,
"a" => code_action, "a" => code_action,
"'" => last_picker, "'" => last_picker,
"w" => { "Window" "w" => { "Window"

@ -37,6 +37,7 @@ type FileLocation = (PathBuf, Option<(usize, usize)>);
pub struct FilePicker<T> { pub struct FilePicker<T> {
picker: Picker<T>, picker: Picker<T>,
pub truncate_start: bool,
/// Caches paths to documents /// Caches paths to documents
preview_cache: HashMap<PathBuf, CachedPreview>, preview_cache: HashMap<PathBuf, CachedPreview>,
read_buffer: Vec<u8>, read_buffer: Vec<u8>,
@ -90,6 +91,7 @@ impl<T> FilePicker<T> {
) -> Self { ) -> Self {
Self { Self {
picker: Picker::new(false, options, format_fn, callback_fn), picker: Picker::new(false, options, format_fn, callback_fn),
truncate_start: true,
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),
@ -172,6 +174,7 @@ 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 {
@ -277,6 +280,8 @@ pub struct Picker<T> {
prompt: Prompt, prompt: Prompt,
/// Whether to render in the middle of the area /// Whether to render in the middle of the area
render_centered: bool, render_centered: bool,
/// Wheather to truncate the start (default true)
pub truncate_start: bool,
format_fn: Box<dyn Fn(&T) -> Cow<str>>, format_fn: Box<dyn Fn(&T) -> Cow<str>>,
callback_fn: Box<dyn Fn(&mut Editor, &T, Action)>, callback_fn: Box<dyn Fn(&mut Editor, &T, Action)>,
@ -306,6 +311,7 @@ impl<T> Picker<T> {
cursor: 0, cursor: 0,
prompt, prompt,
render_centered, render_centered,
truncate_start: true,
format_fn: Box::new(format_fn), format_fn: Box::new(format_fn),
callback_fn: Box::new(callback_fn), callback_fn: Box::new(callback_fn),
}; };
@ -521,7 +527,7 @@ impl<T: 'static> Component for Picker<T> {
text_style text_style
}, },
true, true,
true, self.truncate_start,
); );
} }
} }

Loading…
Cancel
Save