diff options
author | Aleksey Kladov <[email protected]> | 2018-12-21 22:27:07 +0000 |
---|---|---|
committer | Aleksey Kladov <[email protected]> | 2018-12-21 22:42:26 +0000 |
commit | 25dda42f3773b1d002a5809c0182c2adc6c47027 (patch) | |
tree | cbfed6abbbd620a52443ddb6c8fecf4e80abd654 /crates/ra_analysis/src/completion/complete_scope.rs | |
parent | ebb584ce669d04f109d5b21a08aca9d4e9acecc8 (diff) |
introduce ComletionItemKind
Diffstat (limited to 'crates/ra_analysis/src/completion/complete_scope.rs')
-rw-r--r-- | crates/ra_analysis/src/completion/complete_scope.rs | 14 |
1 files changed, 3 insertions, 11 deletions
diff --git a/crates/ra_analysis/src/completion/complete_scope.rs b/crates/ra_analysis/src/completion/complete_scope.rs index d07c0e46d..f39b98d62 100644 --- a/crates/ra_analysis/src/completion/complete_scope.rs +++ b/crates/ra_analysis/src/completion/complete_scope.rs | |||
@@ -29,11 +29,7 @@ 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)| CompletionItem::new(Reference, name.to_string()).add_to(acc)); |
33 | CompletionItem::new(name.to_string()) | ||
34 | .kind(Reference) | ||
35 | .add_to(acc) | ||
36 | }); | ||
37 | } | 33 | } |
38 | 34 | ||
39 | Ok(()) | 35 | Ok(()) |
@@ -45,13 +41,9 @@ fn complete_fn(acc: &mut Completions, scopes: &hir::FnScopes, offset: TextUnit) | |||
45 | .scope_chain_for_offset(offset) | 41 | .scope_chain_for_offset(offset) |
46 | .flat_map(|scope| scopes.entries(scope).iter()) | 42 | .flat_map(|scope| scopes.entries(scope).iter()) |
47 | .filter(|entry| shadowed.insert(entry.name())) | 43 | .filter(|entry| shadowed.insert(entry.name())) |
48 | .for_each(|entry| { | 44 | .for_each(|entry| CompletionItem::new(Reference, entry.name().to_string()).add_to(acc)); |
49 | CompletionItem::new(entry.name().to_string()) | ||
50 | .kind(Reference) | ||
51 | .add_to(acc) | ||
52 | }); | ||
53 | if scopes.self_param.is_some() { | 45 | if scopes.self_param.is_some() { |
54 | CompletionItem::new("self").kind(Reference).add_to(acc); | 46 | CompletionItem::new(Reference, "self").add_to(acc); |
55 | } | 47 | } |
56 | } | 48 | } |
57 | 49 | ||