|
|
@ -5,8 +5,8 @@ use helix_lsp::{
|
|
|
|
self, CodeAction, CodeActionOrCommand, CodeActionTriggerKind, DiagnosticSeverity,
|
|
|
|
self, CodeAction, CodeActionOrCommand, CodeActionTriggerKind, DiagnosticSeverity,
|
|
|
|
NumberOrString,
|
|
|
|
NumberOrString,
|
|
|
|
},
|
|
|
|
},
|
|
|
|
util::{diagnostic_to_lsp_diagnostic, lsp_range_to_range, range_to_lsp_range},
|
|
|
|
util::{diagnostic_to_lsp_diagnostic, lsp_pos_to_pos, lsp_range_to_range, range_to_lsp_range},
|
|
|
|
Client, LanguageServerId, OffsetEncoding,
|
|
|
|
Client, CodeLens, LanguageServerId, OffsetEncoding,
|
|
|
|
};
|
|
|
|
};
|
|
|
|
use tokio_stream::StreamExt;
|
|
|
|
use tokio_stream::StreamExt;
|
|
|
|
use tui::{text::Span, widgets::Row};
|
|
|
|
use tui::{text::Span, widgets::Row};
|
|
|
@ -14,8 +14,9 @@ use tui::{text::Span, widgets::Row};
|
|
|
|
use super::{align_view, push_jump, Align, Context, Editor};
|
|
|
|
use super::{align_view, push_jump, Align, Context, Editor};
|
|
|
|
|
|
|
|
|
|
|
|
use helix_core::{
|
|
|
|
use helix_core::{
|
|
|
|
syntax::LanguageServerFeature, text_annotations::InlineAnnotation, Selection, Uri,
|
|
|
|
syntax::LanguageServerFeature, text_annotations::InlineAnnotation, Rope, Selection, Uri,
|
|
|
|
};
|
|
|
|
};
|
|
|
|
|
|
|
|
pub use helix_lsp::lsp::Command;
|
|
|
|
use helix_stdx::path;
|
|
|
|
use helix_stdx::path;
|
|
|
|
use helix_view::{
|
|
|
|
use helix_view::{
|
|
|
|
document::{DocumentInlayHints, DocumentInlayHintsId},
|
|
|
|
document::{DocumentInlayHints, DocumentInlayHintsId},
|
|
|
@ -61,6 +62,17 @@ macro_rules! language_server_with_feature {
|
|
|
|
}};
|
|
|
|
}};
|
|
|
|
}
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
impl ui::menu::Item for CodeLens {
|
|
|
|
|
|
|
|
type Data = ();
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
fn format(&self, _: &Self::Data) -> Row {
|
|
|
|
|
|
|
|
match self.command.clone() {
|
|
|
|
|
|
|
|
Some(cmd) => cmd.title.into(),
|
|
|
|
|
|
|
|
None => "unresolved".into(),
|
|
|
|
|
|
|
|
}
|
|
|
|
|
|
|
|
}
|
|
|
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
|
|
struct SymbolInformationItem {
|
|
|
|
struct SymbolInformationItem {
|
|
|
|
symbol: lsp::SymbolInformation,
|
|
|
|
symbol: lsp::SymbolInformation,
|
|
|
|
offset_encoding: OffsetEncoding,
|
|
|
|
offset_encoding: OffsetEncoding,
|
|
|
@ -1423,3 +1435,203 @@ fn compute_inlay_hints_for_view(
|
|
|
|
|
|
|
|
|
|
|
|
Some(callback)
|
|
|
|
Some(callback)
|
|
|
|
}
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
fn map_code_lens(
|
|
|
|
|
|
|
|
doc_text: &Rope,
|
|
|
|
|
|
|
|
cl: &lsp::CodeLens,
|
|
|
|
|
|
|
|
offset_enc: OffsetEncoding,
|
|
|
|
|
|
|
|
language_server_id: LanguageServerId,
|
|
|
|
|
|
|
|
) -> CodeLens {
|
|
|
|
|
|
|
|
use helix_core::diagnostic::Range;
|
|
|
|
|
|
|
|
let start = lsp_pos_to_pos(doc_text, cl.range.start, offset_enc).unwrap();
|
|
|
|
|
|
|
|
CodeLens {
|
|
|
|
|
|
|
|
range: Range {
|
|
|
|
|
|
|
|
start,
|
|
|
|
|
|
|
|
end: lsp_pos_to_pos(doc_text, cl.range.end, offset_enc).unwrap(),
|
|
|
|
|
|
|
|
},
|
|
|
|
|
|
|
|
line: doc_text.char_to_line(start),
|
|
|
|
|
|
|
|
data: cl.data.clone(),
|
|
|
|
|
|
|
|
language_server_id,
|
|
|
|
|
|
|
|
command: cl.command.clone(),
|
|
|
|
|
|
|
|
}
|
|
|
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
pub fn code_lens_under_cursor(cx: &mut Context) {
|
|
|
|
|
|
|
|
let (view, doc) = current!(cx.editor);
|
|
|
|
|
|
|
|
let doc_text = doc.text();
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
let language_server =
|
|
|
|
|
|
|
|
language_server_with_feature!(cx.editor, doc, LanguageServerFeature::CodeLens);
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
let offset_encoding = language_server.offset_encoding();
|
|
|
|
|
|
|
|
let pos = doc.position(view.id, offset_encoding);
|
|
|
|
|
|
|
|
let uri = match doc.uri() {
|
|
|
|
|
|
|
|
Some(uri) => uri,
|
|
|
|
|
|
|
|
None => {
|
|
|
|
|
|
|
|
return;
|
|
|
|
|
|
|
|
}
|
|
|
|
|
|
|
|
};
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
if let Some(lenses) = cx.editor.code_lenses.get(&uri) {
|
|
|
|
|
|
|
|
let lenses: Vec<CodeLens> = lenses
|
|
|
|
|
|
|
|
.iter()
|
|
|
|
|
|
|
|
.filter(|cl| {
|
|
|
|
|
|
|
|
// TODO: fix the check
|
|
|
|
|
|
|
|
cl.range.start.line == pos.line
|
|
|
|
|
|
|
|
})
|
|
|
|
|
|
|
|
.map(|cl| {
|
|
|
|
|
|
|
|
// if cl.command.is_none() {
|
|
|
|
|
|
|
|
// if let Some(req) = language_server.code_lens_resolve(cl.clone()) {
|
|
|
|
|
|
|
|
// if let Some(code_lens) = block_on(req).ok().unwrap() {
|
|
|
|
|
|
|
|
// log::info!("code_lense: resolved {:?} into {:?}", cl, code_lens);
|
|
|
|
|
|
|
|
// return map_code_lens(doc, &code_lens);
|
|
|
|
|
|
|
|
// }
|
|
|
|
|
|
|
|
// }
|
|
|
|
|
|
|
|
// }
|
|
|
|
|
|
|
|
map_code_lens(doc_text, cl, offset_encoding, language_server.id())
|
|
|
|
|
|
|
|
})
|
|
|
|
|
|
|
|
.collect();
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
if lenses.is_empty() {
|
|
|
|
|
|
|
|
cx.editor.set_status("No code lens available");
|
|
|
|
|
|
|
|
return;
|
|
|
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
let mut picker = ui::Menu::new(lenses, (), move |editor, code_lens, event| {
|
|
|
|
|
|
|
|
if event != PromptEvent::Validate {
|
|
|
|
|
|
|
|
return;
|
|
|
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
let code_lens = code_lens.unwrap();
|
|
|
|
|
|
|
|
let Some(language_server) = editor.language_server_by_id(code_lens.language_server_id)
|
|
|
|
|
|
|
|
else {
|
|
|
|
|
|
|
|
editor.set_error("Language Server disappeared");
|
|
|
|
|
|
|
|
return;
|
|
|
|
|
|
|
|
};
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
let lens = code_lens.clone();
|
|
|
|
|
|
|
|
if let Some(cmd) = lens.command {
|
|
|
|
|
|
|
|
let future = match language_server.command(cmd) {
|
|
|
|
|
|
|
|
Some(future) => future,
|
|
|
|
|
|
|
|
None => {
|
|
|
|
|
|
|
|
editor.set_error("Language server does not support executing commands");
|
|
|
|
|
|
|
|
return;
|
|
|
|
|
|
|
|
}
|
|
|
|
|
|
|
|
};
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
tokio::spawn(async move {
|
|
|
|
|
|
|
|
let res = future.await;
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
if let Err(e) = res {
|
|
|
|
|
|
|
|
log::error!("execute LSP command: {}", e);
|
|
|
|
|
|
|
|
}
|
|
|
|
|
|
|
|
});
|
|
|
|
|
|
|
|
}
|
|
|
|
|
|
|
|
});
|
|
|
|
|
|
|
|
picker.move_down(); // pre-select the first item
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
let popup = Popup::new("code-lens", picker).with_scrollbar(false);
|
|
|
|
|
|
|
|
cx.push_layer(Box::new(popup));
|
|
|
|
|
|
|
|
};
|
|
|
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
pub fn code_lenses_picker(cx: &mut Context) {
|
|
|
|
|
|
|
|
let doc = doc!(cx.editor);
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
let language_server =
|
|
|
|
|
|
|
|
language_server_with_feature!(cx.editor, doc, LanguageServerFeature::CodeLens);
|
|
|
|
|
|
|
|
let language_server_id = language_server.id();
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
let request = match language_server.code_lens(doc.identifier()) {
|
|
|
|
|
|
|
|
Some(future) => future,
|
|
|
|
|
|
|
|
None => {
|
|
|
|
|
|
|
|
cx.editor
|
|
|
|
|
|
|
|
.set_error("Language server does not support code lens");
|
|
|
|
|
|
|
|
return;
|
|
|
|
|
|
|
|
}
|
|
|
|
|
|
|
|
};
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
let doc_id = doc.id();
|
|
|
|
|
|
|
|
let offset_enc = language_server.offset_encoding();
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
cx.callback(
|
|
|
|
|
|
|
|
request,
|
|
|
|
|
|
|
|
move |editor, compositor, lenses: Option<Vec<lsp::CodeLens>>| {
|
|
|
|
|
|
|
|
if let Some(lenses) = lenses {
|
|
|
|
|
|
|
|
let doc = doc_mut!(editor, &doc_id);
|
|
|
|
|
|
|
|
let doc_text = doc.text();
|
|
|
|
|
|
|
|
if let Some(uri) = doc.uri() {
|
|
|
|
|
|
|
|
editor.code_lenses.insert(uri, lenses.clone());
|
|
|
|
|
|
|
|
};
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
let lenses: Vec<CodeLens> = lenses
|
|
|
|
|
|
|
|
.iter()
|
|
|
|
|
|
|
|
.map(|l| map_code_lens(doc_text, l, offset_enc, language_server_id))
|
|
|
|
|
|
|
|
.collect();
|
|
|
|
|
|
|
|
log::error!("lenses got: {:?}", lenses);
|
|
|
|
|
|
|
|
doc.set_code_lens(lenses.clone());
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
let columns = [
|
|
|
|
|
|
|
|
ui::PickerColumn::new("title", |item: &CodeLens, _| match &item.command {
|
|
|
|
|
|
|
|
Some(cmd) => cmd.title.clone().into(),
|
|
|
|
|
|
|
|
None => "".into(),
|
|
|
|
|
|
|
|
}),
|
|
|
|
|
|
|
|
ui::PickerColumn::new("command", |item: &CodeLens, _| match &item.command {
|
|
|
|
|
|
|
|
Some(Command {
|
|
|
|
|
|
|
|
command,
|
|
|
|
|
|
|
|
arguments: None,
|
|
|
|
|
|
|
|
..
|
|
|
|
|
|
|
|
}) => command.clone().into(),
|
|
|
|
|
|
|
|
Some(Command {
|
|
|
|
|
|
|
|
command,
|
|
|
|
|
|
|
|
arguments: Some(arguments),
|
|
|
|
|
|
|
|
..
|
|
|
|
|
|
|
|
}) => format!(
|
|
|
|
|
|
|
|
"{} {}",
|
|
|
|
|
|
|
|
command,
|
|
|
|
|
|
|
|
arguments
|
|
|
|
|
|
|
|
.iter()
|
|
|
|
|
|
|
|
.map(|a| a.to_string())
|
|
|
|
|
|
|
|
.collect::<Vec<String>>()
|
|
|
|
|
|
|
|
.join(" ")
|
|
|
|
|
|
|
|
)
|
|
|
|
|
|
|
|
.into(),
|
|
|
|
|
|
|
|
None => "".into(),
|
|
|
|
|
|
|
|
}),
|
|
|
|
|
|
|
|
];
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
let picker = Picker::new(columns, 1, lenses, (), |cx, meta, _action| {
|
|
|
|
|
|
|
|
let doc = doc!(cx.editor);
|
|
|
|
|
|
|
|
let language_server = language_server_with_feature!(
|
|
|
|
|
|
|
|
cx.editor,
|
|
|
|
|
|
|
|
doc,
|
|
|
|
|
|
|
|
LanguageServerFeature::CodeLens
|
|
|
|
|
|
|
|
);
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
if let Some(cmd) = meta.command.clone() {
|
|
|
|
|
|
|
|
let future = match language_server.command(cmd) {
|
|
|
|
|
|
|
|
Some(future) => future,
|
|
|
|
|
|
|
|
None => {
|
|
|
|
|
|
|
|
cx.editor.set_error(
|
|
|
|
|
|
|
|
"Language server does not support executing commands",
|
|
|
|
|
|
|
|
);
|
|
|
|
|
|
|
|
return;
|
|
|
|
|
|
|
|
}
|
|
|
|
|
|
|
|
};
|
|
|
|
|
|
|
|
tokio::spawn(async move {
|
|
|
|
|
|
|
|
let res = future.await;
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
if let Err(e) = res {
|
|
|
|
|
|
|
|
log::error!("execute LSP command: {}", e);
|
|
|
|
|
|
|
|
}
|
|
|
|
|
|
|
|
});
|
|
|
|
|
|
|
|
}
|
|
|
|
|
|
|
|
});
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
compositor.push(Box::new(picker));
|
|
|
|
|
|
|
|
} else {
|
|
|
|
|
|
|
|
editor.set_status("no lens found");
|
|
|
|
|
|
|
|
}
|
|
|
|
|
|
|
|
},
|
|
|
|
|
|
|
|
)
|
|
|
|
|
|
|
|
}
|
|
|
|