aboutsummaryrefslogtreecommitdiff
path: root/crates/ra_analysis/src/completion/complete_scope.rs
diff options
context:
space:
mode:
Diffstat (limited to 'crates/ra_analysis/src/completion/complete_scope.rs')
-rw-r--r--crates/ra_analysis/src/completion/complete_scope.rs14
1 files changed, 7 insertions, 7 deletions
diff --git a/crates/ra_analysis/src/completion/complete_scope.rs b/crates/ra_analysis/src/completion/complete_scope.rs
index d07c0e46d..82610d63f 100644
--- a/crates/ra_analysis/src/completion/complete_scope.rs
+++ b/crates/ra_analysis/src/completion/complete_scope.rs
@@ -3,7 +3,7 @@ use ra_syntax::TextUnit;
3 3
4use crate::{ 4use crate::{
5 Cancelable, 5 Cancelable,
6 completion::{CompletionItem, Completions, CompletionKind::*, CompletionContext}, 6 completion::{CompletionItem, CompletionItemKind, Completions, CompletionKind, CompletionContext},
7}; 7};
8 8
9pub(super) fn complete_scope(acc: &mut Completions, ctx: &CompletionContext) -> Cancelable<()> { 9pub(super) fn complete_scope(acc: &mut Completions, ctx: &CompletionContext) -> Cancelable<()> {
@@ -29,9 +29,9 @@ pub(super) fn complete_scope(acc: &mut Completions, ctx: &CompletionContext) ->
29 } 29 }
30 } 30 }
31 }) 31 })
32 .for_each(|(name, _res)| { 32 .for_each(|(name, res)| {
33 CompletionItem::new(name.to_string()) 33 CompletionItem::new(CompletionKind::Reference, name.to_string())
34 .kind(Reference) 34 .from_resolution(ctx.db, res)
35 .add_to(acc) 35 .add_to(acc)
36 }); 36 });
37 } 37 }
@@ -46,12 +46,12 @@ fn complete_fn(acc: &mut Completions, scopes: &hir::FnScopes, offset: TextUnit)
46 .flat_map(|scope| scopes.entries(scope).iter()) 46 .flat_map(|scope| scopes.entries(scope).iter())
47 .filter(|entry| shadowed.insert(entry.name())) 47 .filter(|entry| shadowed.insert(entry.name()))
48 .for_each(|entry| { 48 .for_each(|entry| {
49 CompletionItem::new(entry.name().to_string()) 49 CompletionItem::new(CompletionKind::Reference, entry.name().to_string())
50 .kind(Reference) 50 .kind(CompletionItemKind::Binding)
51 .add_to(acc) 51 .add_to(acc)
52 }); 52 });
53 if scopes.self_param.is_some() { 53 if scopes.self_param.is_some() {
54 CompletionItem::new("self").kind(Reference).add_to(acc); 54 CompletionItem::new(CompletionKind::Reference, "self").add_to(acc);
55 } 55 }
56} 56}
57 57