89efb4f · helix · git.iko.soy

git.iko.soy/helix

on master help sign in

lsp: Resolve completion item asynchronously on idle-timeout (#4781)

89efb4fMichael Davis4 years ago

helix-lsp/src/client.rs+3−4

compare with master

unifiedsplit

@@ -650,12 +650,11 @@ impl Client {

650 self.call::<lsp::request::Completion>(params)

651 }

652

653− pub async fn resolve_completion_item(

653+ pub fn resolve_completion_item(

654 &self,

655 completion_item: lsp::CompletionItem,

656− ) -> Result<lsp::CompletionItem> {

656+ ) -> impl Future<Output = Result<Value>> {

657− self.request::<lsp::request::ResolveCompletionItem>(completion_item)

657+ self.call::<lsp::request::ResolveCompletionItem>(completion_item)

658− .await

659 }

658 }

660

659

661 pub fn text_document_signature_help(

660 pub fn text_document_signature_help(

helix-term/src/ui/completion.rs+38−10

@@ -257,7 +257,7 @@ impl Completion {

257 let future = language_server.resolve_completion_item(completion_item);

258 let response = helix_lsp::block_on(future);

259 match response {

260− Ok(completion_item) => Some(completion_item),

260+ Ok(value) => serde_json::from_value(value).ok(),

261 Err(err) => {

262 log::error!("execute LSP command: {}", err);

263 None

@@ -304,6 +304,12 @@ impl Completion {

304 self.popup.contents().is_empty()

305 }

306

307+ fn replace_item(&mut self, old_item: lsp::CompletionItem, new_item: lsp::CompletionItem) {

308+ self.popup.contents_mut().replace_option(old_item, new_item);

309+ }

310+

311+ /// Asynchronously requests that the currently selection completion item is

312+ /// resolved through LSP `completionItem/resolve`.

307 pub fn ensure_item_resolved(&mut self, cx: &mut commands::Context) -> bool {

313 pub fn ensure_item_resolved(&mut self, cx: &mut commands::Context) -> bool {

308 // > If computing full completion items is expensive, servers can additionally provide a

314 // > If computing full completion items is expensive, servers can additionally provide a

309 // > handler for the completion item resolve request. ...

315 // > handler for the completion item resolve request. ...

@@ -313,16 +319,38 @@ impl Completion {

313 // > 'completionItem/resolve' request is sent with the selected completion item as a parameter.

319 // > 'completionItem/resolve' request is sent with the selected completion item as a parameter.

314 // > The returned completion item should have the documentation property filled in.

320 // > The returned completion item should have the documentation property filled in.

315 // https://microsoft.github.io/language-server-protocol/specifications/lsp/3.17/specification/#textDocument_completion

321 // https://microsoft.github.io/language-server-protocol/specifications/lsp/3.17/specification/#textDocument_completion

316− match self.popup.contents_mut().selection_mut() {

322+ let current_item = match self.popup.contents().selection() {

317− Some(item) if item.documentation.is_none() => {

323+ Some(item) if item.documentation.is_none() => item.clone(),

324+ _ => return false,

325+ };

326+

318− let doc = doc!(cx.editor);

327+ let language_server = match doc!(cx.editor).language_server() {

328+ Some(language_server) => language_server,

329+ None => return false,

330+ };

331+

332+ // This method should not block the compositor so we handle the response asynchronously.

319− if let Some(resolved_item) = Self::resolve_completion_item(doc, item.clone()) {

333+ let future = language_server.resolve_completion_item(current_item.clone());

334+

335+ cx.callback(

336+ future,

337+ move |_editor, compositor, response: Option<lsp::CompletionItem>| {

338+ let resolved_item = match response {

339+ Some(item) => item,

340+ None => return,

341+ };

342+

343+ if let Some(completion) = &mut compositor

344+ .find::<crate::ui::EditorView>()

345+ .unwrap()

346+ .completion

347+ {

320− *item = resolved_item;

348+ completion.replace_item(current_item, resolved_item);

321 }

349 }

322− true

323− }

350+ },

324− _ => false,

351+ );

325− }

352+

353+ true

326 }

354 }

327}

355}

328

356

helix-term/src/ui/menu.rs+11

@@ -224,6 +224,17 @@ impl<T: Item> Menu<T> {

224 }

225}

226

227+impl<T: Item + PartialEq> Menu<T> {

228+ pub fn replace_option(&mut self, old_option: T, new_option: T) {

229+ for option in &mut self.options {

230+ if old_option == *option {

231+ *option = new_option;

232+ break;

233+ }

234+ }

235+ }

236+}

237+

227use super::PromptEvent as MenuEvent;

238use super::PromptEvent as MenuEvent;

228

239

229impl<T: Item + 'static> Component for Menu<T> {

240impl<T: Item + 'static> Component for Menu<T> {