Yehowshua/ZIm
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Return anchored completions from Buffer::completions

Browse source 
Co-Authored-By: Antonio Scandurra <me@as-cii.com>
This commit is contained in:
Nathan Sobo 2022-01-31 11:25:00 -07:00
parent 03bcbdc33d
commit 0344c543af
1 changed files with 20 additions and 39 deletions
Download patch file Download diff file Expand all files Collapse all files

59
crates/language/src/buffer.rs
View file

@ -12,7 +12,6 @@ use crate::{
use anyhow::{anyhow, Result}; use anyhow::{anyhow, Result};
use clock::ReplicaId; use clock::ReplicaId;
use futures::FutureExt as _; use futures::FutureExt as _;
use fuzzy::StringMatchCandidate;
use gpui::{fonts::HighlightStyle, AppContext, Entity, ModelContext, MutableAppContext, Task}; use gpui::{fonts::HighlightStyle, AppContext, Entity, ModelContext, MutableAppContext, Task};
use lazy_static::lazy_static; use lazy_static::lazy_static;
use lsp::LanguageServer; use lsp::LanguageServer;
@ -1642,8 +1641,7 @@ impl Buffer {
let abs_path = file.abs_path(cx); let abs_path = file.abs_path(cx);
let position = self.offset_to_point_utf16(position.to_offset(self)); let position = self.offset_to_point_utf16(position.to_offset(self));
cx.spawn(|this, mut cx| async move { cx.spawn(|this, cx| async move {
let t0 = Instant::now();
let completions = server let completions = server
.request::<lsp::request::Completion>(lsp::CompletionParams { .request::<lsp::request::Completion>(lsp::CompletionParams {
text_document_position: lsp::TextDocumentPositionParams::new( text_document_position: lsp::TextDocumentPositionParams::new(
@ -1657,10 +1655,8 @@ impl Buffer {
partial_result_params: Default::default(), partial_result_params: Default::default(),
}) })
.await?; .await?;
dbg!("completions", t0.elapsed());
// fuzzy::match_strings(candidates, query, smart_case, max_results, cancel_flag, background)
let mut completions = if let Some(completions) = completions { let completions = if let Some(completions) = completions {
match completions { match completions {
lsp::CompletionResponse::Array(completions) => completions, lsp::CompletionResponse::Array(completions) => completions,
lsp::CompletionResponse::List(list) => list.items, lsp::CompletionResponse::List(list) => list.items,
@ -1669,40 +1665,25 @@ impl Buffer {
Default::default() Default::default()
}; };
this.update(&mut cx, |this, cx| { this.read_with(&cx, |this, _| {
this.edit([0..0], "use std::sync::Arc;\n", cx) Ok(completions.into_iter().filter_map(|lsp_completion| {
}); let (old_range, new_text) = match lsp_completion.text_edit.as_ref()? {
lsp::CompletionTextEdit::Edit(edit) => (range_from_lsp(edit.range), edit.new_text.clone()),
lsp::CompletionTextEdit::InsertAndReplace(_) => {
log::info!("received an insert and replace completion but we don't yet support that");
return None
},
};
let mut futures = Vec::new(); let old_range = this.anchor_after(old_range.start)..this.anchor_before(old_range.end);
for completion in completions {
futures.push(server.request::<lsp::request::ResolveCompletionItem>(completion)); Some(Completion {
} old_range,
new_text,
let completions = futures::future::try_join_all(futures).await?; lsp_completion,
dbg!("resolution", t0.elapsed(), completions); })
// let candidates = completions }).collect())
// .iter() })
// .enumerate()
// .map(|(id, completion)| {
// let text = completion
// .filter_text
// .clone()
// .unwrap_or_else(|| completion.label.clone());
// StringMatchCandidate::new(id, text)
// })
// .collect::<Vec<_>>();
// let matches = fuzzy::match_strings(
// &candidates,
// "Arc",
// false,
// 100,
// &Default::default(),
// cx.background(),
// )
// .await;
// dbg!(matches);
Ok(Default::default())
}) })
} else { } else {
Task::ready(Ok(Default::default())) Task::ready(Ok(Default::default()))