zed-industries/zed
1
1
Fork 0
mirror of https://github.com/zed-industries/zed.git synced 2024-09-16 17:07:14 +03:00
Code Issues Packages Projects Releases Wiki Activity

Rust: fix module names not showing in completion list (#13505)

Browse Source 
This is a regression from
https://github.com/zed-industries/zed/issues/13043

Fixes https://github.com/zed-industries/zed/issues/13494



Release Notes:

- Fix crate names not being shown in Rust completions menu.
This commit is contained in:
Piotr Osiewicz 2024-06-25 13:42:29 +02:00 committed by GitHub
parent a4cdca5141
commit 24e7b69f8f
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194
1 changed files with 21 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

31
crates/languages/src/rust.rs
View File

@ -201,11 +201,18 @@ impl LspAdapter for RustLspAdapter {
completion: &lsp::CompletionItem, completion: &lsp::CompletionItem,
language: &Arc<Language>, language: &Arc<Language>,
) -> Option<CodeLabel> { ) -> Option<CodeLabel> {
let detail = completion
.detail
.as_ref()
.or(completion
.label_details
.as_ref()
.and_then(|detail| detail.detail.as_ref()))
.map(ToOwned::to_owned);
match completion.kind { match completion.kind {
Some(lsp::CompletionItemKind::FIELD) if completion.detail.is_some() => { Some(lsp::CompletionItemKind::FIELD) if detail.is_some() => {
let detail = completion.detail.as_ref().unwrap();
let name = &completion.label; let name = &completion.label;
let text = format!("{}: {}", name, detail); let text = format!("{}: {}", name, detail.unwrap());
let source = Rope::from(format!("struct S {{ {} }}", text).as_str()); let source = Rope::from(format!("struct S {{ {} }}", text).as_str());
let runs = language.highlight_text(&source, 11..11 + text.len()); let runs = language.highlight_text(&source, 11..11 + text.len());
return Some(CodeLabel { return Some(CodeLabel {
@ -215,12 +222,11 @@ impl LspAdapter for RustLspAdapter {
}); });
} }
Some(lsp::CompletionItemKind::CONSTANT | lsp::CompletionItemKind::VARIABLE) Some(lsp::CompletionItemKind::CONSTANT | lsp::CompletionItemKind::VARIABLE)
if completion.detail.is_some() if detail.is_some()
&& completion.insert_text_format != Some(lsp::InsertTextFormat::SNIPPET) => && completion.insert_text_format != Some(lsp::InsertTextFormat::SNIPPET) =>
{ {
let detail = completion.detail.as_ref().unwrap();
let name = &completion.label; let name = &completion.label;
let text = format!("{}: {}", name, detail); let text = format!("{}: {}", name, detail.unwrap());
let source = Rope::from(format!("let {} = ();", text).as_str()); let source = Rope::from(format!("let {} = ();", text).as_str());
let runs = language.highlight_text(&source, 4..4 + text.len()); let runs = language.highlight_text(&source, 4..4 + text.len());
return Some(CodeLabel { return Some(CodeLabel {
@ -230,12 +236,12 @@ impl LspAdapter for RustLspAdapter {
}); });
} }
Some(lsp::CompletionItemKind::FUNCTION | lsp::CompletionItemKind::METHOD) Some(lsp::CompletionItemKind::FUNCTION | lsp::CompletionItemKind::METHOD)
if completion.detail.is_some() => if detail.is_some() =>
{ {
lazy_static! { lazy_static! {
static ref REGEX: Regex = Regex::new("\\(…?\\)").unwrap(); static ref REGEX: Regex = Regex::new("\\(…?\\)").unwrap();
} }
let detail = completion.detail.as_ref().unwrap(); let detail = detail.unwrap();
const FUNCTION_PREFIXES: [&'static str; 2] = ["async fn", "fn"]; const FUNCTION_PREFIXES: [&'static str; 2] = ["async fn", "fn"];
let prefix = FUNCTION_PREFIXES let prefix = FUNCTION_PREFIXES
.iter() .iter()
@ -269,9 +275,14 @@ impl LspAdapter for RustLspAdapter {
_ => None, _ => None,
}; };
let highlight_id = language.grammar()?.highlight_id_for_name(highlight_name?)?; let highlight_id = language.grammar()?.highlight_id_for_name(highlight_name?)?;
let mut label = CodeLabel::plain(completion.label.clone(), None); let mut label = completion.label.clone();
if let Some(detail) = detail.filter(|detail| detail.starts_with(" (")) {
use std::fmt::Write;
write!(label, "{detail}").ok()?;
}
let mut label = CodeLabel::plain(label, None);
label.runs.push(( label.runs.push((
0..label.text.rfind('(').unwrap_or(label.text.len()), 0..label.text.rfind('(').unwrap_or(completion.label.len()),
highlight_id, highlight_id,
)); ));
return Some(label); return Some(label);