language-servers/rust-analyzer
1
0
Fork 0
mirror of https://github.com/rust-lang/rust-analyzer.git synced 2025-09-29 21:35:20 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions 4

Propose custom derives in completion

Browse source
This commit is contained in:
Kirill Bulatov 2020-05-02 22:24:27 +03:00
parent 767bff89ed
commit fee74851b0
2 changed files with 39 additions and 16 deletions
Download patch file Download diff file Expand all files Collapse all files

15
crates/ra_hir/src/code_model.rs
View file

@ -19,7 +19,7 @@ use hir_def::{
use hir_expand::{ use hir_expand::{
diagnostics::DiagnosticSink, diagnostics::DiagnosticSink,
name::{name, AsName}, name::{name, AsName},
MacroDefId, MacroDefId, MacroDefKind,
}; };
use hir_ty::{ use hir_ty::{
autoderef, display::HirFormatter, expr::ExprValidator, method_resolution, ApplicationTy, autoderef, display::HirFormatter, expr::ExprValidator, method_resolution, ApplicationTy,
@ -762,13 +762,12 @@ impl MacroDef {
/// Indicate it is a proc-macro /// Indicate it is a proc-macro
pub fn is_proc_macro(&self) -> bool { pub fn is_proc_macro(&self) -> bool {
match self.id.kind { matches!(self.id.kind, MacroDefKind::CustomDerive(_))
hir_expand::MacroDefKind::Declarative => false, }
hir_expand::MacroDefKind::BuiltIn(_) => false,
hir_expand::MacroDefKind::BuiltInDerive(_) => false, /// Indicate it is a derive macro
hir_expand::MacroDefKind::BuiltInEager(_) => false, pub fn is_derive_macro(&self) -> bool {
hir_expand::MacroDefKind::CustomDerive(_) => true, matches!(self.id.kind, MacroDefKind::CustomDerive(_) | MacroDefKind::BuiltInDerive(_))
}
} }
} }

40
crates/ra_ide/src/completion/complete_attribute.rs
View file

@ -130,11 +130,8 @@ const ATTRIBUTES: &[AttrCompletion] = &[
]; ];
fn complete_derive(acc: &mut Completions, ctx: &CompletionContext, derive_input: ast::TokenTree) { fn complete_derive(acc: &mut Completions, ctx: &CompletionContext, derive_input: ast::TokenTree) {
// TODO kb autodetect derive macros
// https://rust-lang.zulipchat.com/#narrow/stream/185405-t-compiler.2Fwg-rls-2.2E0/topic/Find.20all.20possible.20derive.20macro.20values.3F/near/195955580
if let Ok(existing_derives) = parse_derive_input(derive_input) { if let Ok(existing_derives) = parse_derive_input(derive_input) {
for derive_completion in DERIVE_COMPLETIONS for derive_completion in DEFAULT_DERIVE_COMPLETIONS
.into_iter() .into_iter()
.filter(|completion| !existing_derives.contains(completion.label)) .filter(|completion| !existing_derives.contains(completion.label))
{ {
@ -147,9 +144,21 @@ fn complete_derive(acc: &mut Completions, ctx: &CompletionContext, derive_input:
label.push_str(", "); label.push_str(", ");
label.push_str(dependency); label.push_str(dependency);
} }
let item = CompletionItem::new(CompletionKind::Attribute, ctx.source_range(), label) acc.add(
.kind(CompletionItemKind::Attribute); CompletionItem::new(CompletionKind::Attribute, ctx.source_range(), label)
acc.add(item); .kind(CompletionItemKind::Attribute),
);
}
for custom_derive_name in get_derive_names_in_scope(ctx).difference(&existing_derives) {
acc.add(
CompletionItem::new(
CompletionKind::Attribute,
ctx.source_range(),
custom_derive_name,
)
.kind(CompletionItemKind::Attribute),
);
} }
} }
} }
@ -174,12 +183,27 @@ fn parse_derive_input(derive_input: ast::TokenTree) -> Result<FxHashSet<String>,
} }
} }
fn get_derive_names_in_scope(ctx: &CompletionContext) -> FxHashSet<String> {
let mut result = FxHashSet::default();
ctx.scope().process_all_names(&mut |name, scope_def| {
if let hir::ScopeDef::MacroDef(mac) = scope_def {
if mac.is_derive_macro() {
let name_string = name.to_string();
result.insert(name_string);
}
}
});
result
}
struct DeriveCompletion { struct DeriveCompletion {
label: &'static str, label: &'static str,
dependencies: &'static [&'static str], dependencies: &'static [&'static str],
} }
const DERIVE_COMPLETIONS: &[DeriveCompletion] = &[ /// Standard Rust derives and the information about their dependencies
/// (the dependencies are needed so that the main derive don't break the compilation when added)
const DEFAULT_DERIVE_COMPLETIONS: &[DeriveCompletion] = &[
DeriveCompletion { label: "Clone", dependencies: &[] }, DeriveCompletion { label: "Clone", dependencies: &[] },
DeriveCompletion { label: "Copy", dependencies: &["Clone"] }, DeriveCompletion { label: "Copy", dependencies: &["Clone"] },
DeriveCompletion { label: "Debug", dependencies: &[] }, DeriveCompletion { label: "Debug", dependencies: &[] },