mirrors/zed
1
0
Fork 0
mirror of https://github.com/zed-industries/zed.git synced 2024-12-24 17:28:40 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions 9

If documentation included in original completion then parse up front

Browse source
This commit is contained in:
Julia 2023-10-06 00:17:36 -04:00
parent 32a29cd4d3
commit 9d8cff1275
2 changed files with 28 additions and 50 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

51
crates/editor/src/editor.rs
View file

@ -61,10 +61,10 @@ pub use language::{char_kind, CharKind};
use language::{
language_settings::{self, all_language_settings, InlayHintSettings},
markdown::MarkdownHighlight,
point_from_lsp, prepare_completion_documentation, AutoindentMode, BracketPair, Buffer,
CodeAction, CodeLabel, Completion, CursorShape, Diagnostic, DiagnosticSeverity, Documentation,
File, IndentKind, IndentSize, Language, LanguageServerName, OffsetRangeExt, OffsetUtf16, Point,
Selection, SelectionGoal, TransactionId,
point_from_lsp, AutoindentMode, BracketPair, Buffer, CodeAction, CodeLabel, Completion,
CursorShape, Diagnostic, DiagnosticSeverity, Documentation, File, IndentKind, IndentSize,
Language, LanguageServerName, OffsetRangeExt, OffsetUtf16, Point, Selection, SelectionGoal,
TransactionId,
};
use link_go_to_definition::{
hide_link_definition, show_link_definition, GoToDefinitionLink, InlayHighlight,
@ -940,12 +940,11 @@ impl ContextMenu {
fn render(
&self,
cursor_position: DisplayPoint,
editor: &Editor,
style: EditorStyle,
cx: &mut ViewContext<Editor>,
) -> (DisplayPoint, AnyElement<Editor>) {
match self {
ContextMenu::Completions(menu) => (cursor_position, menu.render(editor, style, cx)),
ContextMenu::Completions(menu) => (cursor_position, menu.render(style, cx)),
ContextMenu::CodeActions(menu) => menu.render(cursor_position, style, cx),
}
}
@ -1077,12 +1076,7 @@ impl CompletionsMenu {
!self.matches.is_empty()
}
fn render(
&self,
editor: &Editor,
style: EditorStyle,
cx: &mut ViewContext<Editor>,
) -> AnyElement<Editor> {
fn render(&self, style: EditorStyle, cx: &mut ViewContext<Editor>) -> AnyElement<Editor> {
enum CompletionTag {}
let widest_completion_ix = self
@ -1103,7 +1097,6 @@ impl CompletionsMenu {
})
.map(|(ix, _)| ix);
let project = editor.project.clone();
let completions = self.completions.clone();
let matches = self.matches.clone();
let selected_item = self.selected_item;
@ -1118,36 +1111,6 @@ impl CompletionsMenu {
let item_ix = start_ix + ix;
let candidate_id = mat.candidate_id;
let completion = &completions_guard[candidate_id];
if item_ix == selected_item && completion.documentation.is_none() {
if let Some(lsp_docs) = &completion.lsp_completion.documentation {
let project = project
.as_ref()
.expect("It is impossible have LSP servers without a project");
let lsp_docs = lsp_docs.clone();
let language_registry = project.read(cx).languages().clone();
let completions = completions.clone();
cx.spawn(|this, mut cx| async move {
let documentation = prepare_completion_documentation(
&lsp_docs,
&language_registry,
None,
)
.await;
this.update(&mut cx, |_, cx| {
let mut completions = completions.write();
completions[candidate_id].documentation = documentation;
drop(completions);
cx.notify();
})
})
.detach();
}
}
let documentation = &completion.documentation;
items.push(
@ -4201,7 +4164,7 @@ impl Editor {
) -> Option<(DisplayPoint, AnyElement<Editor>)> {
self.context_menu
.as_ref()
.map(|menu| menu.render(cursor_position, self, style, cx))
.map(|menu| menu.render(cursor_position, style, cx))
}
fn show_context_menu(&mut self, menu: ContextMenu, cx: &mut ViewContext<Self>) {

27
crates/project/src/lsp_command.rs
View file

@ -10,7 +10,7 @@ use futures::future;
use gpui::{AppContext, AsyncAppContext, ModelHandle};
use language::{
language_settings::{language_settings, InlayHintKind},
point_from_lsp, point_to_lsp,
point_from_lsp, point_to_lsp, prepare_completion_documentation,
proto::{deserialize_anchor, deserialize_version, serialize_anchor, serialize_version},
range_from_lsp, range_to_lsp, Anchor, Bias, Buffer, BufferSnapshot, CachedLspAdapter, CharKind,
CodeAction, Completion, OffsetRangeExt, PointUtf16, ToOffset, ToPointUtf16, Transaction,
@ -1341,7 +1341,7 @@ impl LspCommand for GetCompletions {
async fn response_from_lsp(
self,
completions: Option<lsp::CompletionResponse>,
_: ModelHandle<Project>,
project: ModelHandle<Project>,
buffer: ModelHandle<Buffer>,
server_id: LanguageServerId,
cx: AsyncAppContext,
@ -1361,7 +1361,8 @@ impl LspCommand for GetCompletions {
Vec::new()
};
let completions = buffer.read_with(&cx, |buffer, _| {
let completions = buffer.read_with(&cx, |buffer, cx| {
let language_registry = project.read(cx).languages().clone();
let language = buffer.language().cloned();
let snapshot = buffer.snapshot();
let clipped_position = buffer.clip_point_utf16(Unclipped(self.position), Bias::Left);
@ -1453,14 +1454,28 @@ impl LspCommand for GetCompletions {
}
};
let language = language.clone();
LineEnding::normalize(&mut new_text);
let language_registry = language_registry.clone();
let language = language.clone();
Some(async move {
let mut label = None;
if let Some(language) = language {
if let Some(language) = language.as_ref() {
language.process_completion(&mut lsp_completion).await;
label = language.label_for_completion(&lsp_completion).await;
}
let documentation = if let Some(lsp_docs) = &lsp_completion.documentation {
prepare_completion_documentation(
lsp_docs,
&language_registry,
language.clone(),
)
.await
} else {
None
};
Completion {
old_range,
new_text,
@ -1470,7 +1485,7 @@ impl LspCommand for GetCompletions {
lsp_completion.filter_text.as_deref(),
)
}),
documentation: None,
documentation,
server_id,
lsp_completion,
}