mirror of
https://github.com/rust-lang/rust-analyzer
synced 2024-12-26 13:03:31 +00:00
don't add macro braces in use items
This commit is contained in:
parent
e38cdf6e56
commit
d7a7da8261
1 changed files with 54 additions and 18 deletions
|
@ -164,28 +164,33 @@ impl Completions {
|
||||||
name: Option<String>,
|
name: Option<String>,
|
||||||
macro_: hir::MacroDef,
|
macro_: hir::MacroDef,
|
||||||
) {
|
) {
|
||||||
|
let name = match name {
|
||||||
|
Some(it) => it,
|
||||||
|
None => return,
|
||||||
|
};
|
||||||
|
|
||||||
let ast_node = macro_.source(ctx.db).ast;
|
let ast_node = macro_.source(ctx.db).ast;
|
||||||
if let Some(name) = name {
|
|
||||||
let detail = macro_label(&ast_node);
|
let detail = macro_label(&ast_node);
|
||||||
|
|
||||||
let docs = macro_.docs(ctx.db);
|
let docs = macro_.docs(ctx.db);
|
||||||
|
let macro_declaration = format!("{}!", name);
|
||||||
|
|
||||||
|
let mut builder =
|
||||||
|
CompletionItem::new(CompletionKind::Reference, ctx.source_range(), ¯o_declaration)
|
||||||
|
.kind(CompletionItemKind::Macro)
|
||||||
|
.set_documentation(docs.clone())
|
||||||
|
.detail(detail);
|
||||||
|
|
||||||
|
builder = if ctx.use_item_syntax.is_some() {
|
||||||
|
builder.insert_text(name)
|
||||||
|
} else {
|
||||||
let macro_braces_to_insert =
|
let macro_braces_to_insert =
|
||||||
self.guess_macro_braces(&name, docs.as_ref().map_or("", |s| s.as_str()));
|
self.guess_macro_braces(&name, docs.as_ref().map_or("", |s| s.as_str()));
|
||||||
let macro_declaration = name + "!";
|
builder.insert_snippet(macro_declaration + macro_braces_to_insert)
|
||||||
|
};
|
||||||
let builder = CompletionItem::new(
|
|
||||||
CompletionKind::Reference,
|
|
||||||
ctx.source_range(),
|
|
||||||
¯o_declaration,
|
|
||||||
)
|
|
||||||
.kind(CompletionItemKind::Macro)
|
|
||||||
.set_documentation(docs)
|
|
||||||
.detail(detail)
|
|
||||||
.insert_snippet(macro_declaration + macro_braces_to_insert);
|
|
||||||
|
|
||||||
self.add(builder);
|
self.add(builder);
|
||||||
}
|
}
|
||||||
}
|
|
||||||
|
|
||||||
fn add_function_with_name(
|
fn add_function_with_name(
|
||||||
&mut self,
|
&mut self,
|
||||||
|
@ -281,10 +286,11 @@ fn has_non_default_type_params(def: hir::GenericDef, db: &db::RootDatabase) -> b
|
||||||
|
|
||||||
#[cfg(test)]
|
#[cfg(test)]
|
||||||
mod tests {
|
mod tests {
|
||||||
use crate::completion::{do_completion, CompletionItem, CompletionKind};
|
|
||||||
use insta::assert_debug_snapshot;
|
use insta::assert_debug_snapshot;
|
||||||
use test_utils::covers;
|
use test_utils::covers;
|
||||||
|
|
||||||
|
use crate::completion::{do_completion, CompletionItem, CompletionKind};
|
||||||
|
|
||||||
fn do_reference_completion(code: &str) -> Vec<CompletionItem> {
|
fn do_reference_completion(code: &str) -> Vec<CompletionItem> {
|
||||||
do_completion(code, CompletionKind::Reference)
|
do_completion(code, CompletionKind::Reference)
|
||||||
}
|
}
|
||||||
|
@ -576,4 +582,34 @@ mod tests {
|
||||||
"###
|
"###
|
||||||
);
|
);
|
||||||
}
|
}
|
||||||
|
|
||||||
|
#[test]
|
||||||
|
fn dont_insert_macro_call_braces_in_use() {
|
||||||
|
assert_debug_snapshot!(
|
||||||
|
do_reference_completion(
|
||||||
|
r"
|
||||||
|
//- /main.rs
|
||||||
|
use foo::<|>;
|
||||||
|
|
||||||
|
//- /foo/lib.rs
|
||||||
|
#[macro_export]
|
||||||
|
macro_rules frobnicate {
|
||||||
|
() => ()
|
||||||
|
}
|
||||||
|
"
|
||||||
|
),
|
||||||
|
@r###"
|
||||||
|
[
|
||||||
|
CompletionItem {
|
||||||
|
label: "frobnicate!",
|
||||||
|
source_range: [9; 9),
|
||||||
|
delete: [9; 9),
|
||||||
|
insert: "frobnicate",
|
||||||
|
kind: Macro,
|
||||||
|
detail: "#[macro_export]\nmacro_rules! frobnicate",
|
||||||
|
},
|
||||||
|
]
|
||||||
|
"###
|
||||||
|
)
|
||||||
|
}
|
||||||
}
|
}
|
||||||
|
|
Loading…
Reference in a new issue