language-servers/rust-analyzer
1
0
Fork 0
mirror of https://github.com/rust-lang/rust-analyzer.git synced 2025-10-02 22:54:58 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions 4

Separate macros completion from other

Browse source
This commit is contained in:
Kirill Bulatov 2020-05-02 22:33:23 +03:00
parent fee74851b0
commit 9f0ed7ed92
1 changed files with 17 additions and 15 deletions
Download patch file Download diff file Expand all files Collapse all files

6
crates/ra_ide/src/completion.rs
View file

@ -65,7 +65,9 @@ pub(crate) fn completions(
let ctx = CompletionContext::new(db, position, config)?; let ctx = CompletionContext::new(db, position, config)?;
let mut acc = Completions::default(); let mut acc = Completions::default();
if ctx.attribute_under_caret.is_some() {
complete_attribute::complete_attribute(&mut acc, &ctx);
} else {
complete_fn_param::complete_fn_param(&mut acc, &ctx); complete_fn_param::complete_fn_param(&mut acc, &ctx);
complete_keyword::complete_expr_keyword(&mut acc, &ctx); complete_keyword::complete_expr_keyword(&mut acc, &ctx);
complete_keyword::complete_use_tree_keyword(&mut acc, &ctx); complete_keyword::complete_use_tree_keyword(&mut acc, &ctx);
@ -79,7 +81,7 @@ pub(crate) fn completions(
complete_postfix::complete_postfix(&mut acc, &ctx); complete_postfix::complete_postfix(&mut acc, &ctx);
complete_macro_in_item_position::complete_macro_in_item_position(&mut acc, &ctx); complete_macro_in_item_position::complete_macro_in_item_position(&mut acc, &ctx);
complete_trait_impl::complete_trait_impl(&mut acc, &ctx); complete_trait_impl::complete_trait_impl(&mut acc, &ctx);
complete_attribute::complete_attribute(&mut acc, &ctx); }
Some(acc) Some(acc)
} }