@@ -16,7 +16,7 @@ use helix_view::{
1616
1717use helix_lsp::{
1818 lsp,
19− util::{lsp_pos_to_pos, pos_to_lsp_pos, range_to_lsp_range},
19+ util::{lsp_pos_to_pos, lsp_range_to_range, pos_to_lsp_pos, range_to_lsp_range},
2020 OffsetEncoding,
2121};
2222use movement::Movement;
@@ -1194,6 +1194,76 @@ pub fn buffer_picker(cx: &mut Context) {
11941194 cx.push_layer(Box::new(picker));
11951195}
11961196
1197+pub fn symbol_picker(cx: &mut Context) {
1198+ fn nested_to_flat(
1199+ list: &mut Vec<lsp::SymbolInformation>,
1200+ file: &lsp::TextDocumentIdentifier,
1201+ symbol: lsp::DocumentSymbol,
1202+ ) {
1203+ #[allow(deprecated)]
1204+ list.push(lsp::SymbolInformation {
1205+ name: symbol.name,
1206+ kind: symbol.kind,
1207+ tags: symbol.tags,
1208+ deprecated: symbol.deprecated,
1209+ location: lsp::Location::new(file.uri.clone(), symbol.selection_range),
1210+ container_name: None,
1211+ });
1212+ for child in symbol.children.into_iter().flatten() {
1213+ nested_to_flat(list, file, child);
1214+ }
1215+ }
1216+ let (view, doc) = cx.current();
1217+
1218+ let language_server = match doc.language_server() {
1219+ Some(language_server) => language_server,
1220+ None => return,
1221+ };
1222+ let offset_encoding = language_server.offset_encoding();
1223+
1224+ let future = language_server.document_symbols(doc.identifier());
1225+
1226+ cx.callback(
1227+ future,
1228+ move |editor: &mut Editor,
1229+ compositor: &mut Compositor,
1230+ response: Option<lsp::DocumentSymbolResponse>| {
1231+ if let Some(symbols) = response {
1232+ // lsp has two ways to represent symbols (flat/nested)
1233+ // convert the nested variant to flat, so that we have a homogeneous list
1234+ let symbols = match symbols {
1235+ lsp::DocumentSymbolResponse::Flat(symbols) => symbols,
1236+ lsp::DocumentSymbolResponse::Nested(symbols) => {
1237+ let (_view, doc) = editor.current();
1238+ let mut flat_symbols = Vec::new();
1239+ for symbol in symbols {
1240+ nested_to_flat(&mut flat_symbols, &doc.identifier(), symbol)
1241+ }
1242+ flat_symbols
1243+ }
1244+ };
1245+
1246+ let picker = Picker::new(
1247+ symbols,
1248+ |symbol| (&symbol.name).into(),
1249+ move |editor: &mut Editor, symbol, _action| {
1250+ push_jump(editor);
1251+ let (view, doc) = editor.current();
1252+
1253+ if let Some(range) =
1254+ lsp_range_to_range(doc.text(), symbol.location.range, offset_encoding)
1255+ {
1256+ doc.set_selection(view.id, Selection::single(range.to(), range.from()));
1257+ align_view(doc, view, Align::Center);
1258+ }
1259+ },
1260+ );
1261+ compositor.push(Box::new(picker))
1262+ }
1263+ },
1264+ )
1265+}
1266+
11971267// I inserts at the first nonwhitespace character of each line with a selection
11981268pub fn prepend_to_line(cx: &mut Context) {
11991269 move_first_nonwhitespace(cx);
@@ -2548,6 +2618,7 @@ pub fn space_mode(cx: &mut Context) {
25482618 match ch {
25492619 'f' => file_picker(cx),
25502620 'b' => buffer_picker(cx),
2621+ 's' => symbol_picker(cx),
25512622 'w' => window_mode(cx),
25522623 // ' ' => toggle_alternate_buffer(cx),
25532624 // TODO: temporary since space mode took its old key