aboutsummaryrefslogtreecommitdiff
path: root/crates/ide_completion/src/completions/keyword.rs
diff options
context:
space:
mode:
authorAleksey Kladov <[email protected]>2021-03-12 09:12:32 +0000
committerAleksey Kladov <[email protected]>2021-03-12 09:22:45 +0000
commit7e217a42e1c2dfd26defb9f448d8b0c57c7fc1a4 (patch)
tree9bb8c4b78a4525ecf758a2106254bf135d8a68f3 /crates/ide_completion/src/completions/keyword.rs
parentc01ef6eabab1fa70d3fdfed9c565fadec9f0a5ed (diff)
Unify naming
Diffstat (limited to 'crates/ide_completion/src/completions/keyword.rs')
-rw-r--r--crates/ide_completion/src/completions/keyword.rs36
1 files changed, 17 insertions, 19 deletions
diff --git a/crates/ide_completion/src/completions/keyword.rs b/crates/ide_completion/src/completions/keyword.rs
index aa3be712d..b635e0ca3 100644
--- a/crates/ide_completion/src/completions/keyword.rs
+++ b/crates/ide_completion/src/completions/keyword.rs
@@ -12,21 +12,19 @@ pub(crate) fn complete_use_tree_keyword(acc: &mut Completions, ctx: &CompletionC
12 12
13 if ctx.use_item_syntax.is_some() { 13 if ctx.use_item_syntax.is_some() {
14 if ctx.path_qual.is_none() { 14 if ctx.path_qual.is_none() {
15 let mut crate_builder = 15 let mut item = CompletionItem::new(CompletionKind::Keyword, source_range, "crate::");
16 CompletionItem::new(CompletionKind::Keyword, source_range, "crate::"); 16 item.kind(CompletionItemKind::Keyword).insert_text("crate::");
17 crate_builder.kind(CompletionItemKind::Keyword).insert_text("crate::"); 17 item.add_to(acc);
18 crate_builder.add_to(acc);
19 } 18 }
20 let mut self_builder = CompletionItem::new(CompletionKind::Keyword, source_range, "self"); 19 let mut item = CompletionItem::new(CompletionKind::Keyword, source_range, "self");
21 self_builder.kind(CompletionItemKind::Keyword); 20 item.kind(CompletionItemKind::Keyword);
22 self_builder.add_to(acc); 21 item.add_to(acc);
23 if iter::successors(ctx.path_qual.clone(), |p| p.qualifier()) 22 if iter::successors(ctx.path_qual.clone(), |p| p.qualifier())
24 .all(|p| p.segment().and_then(|s| s.super_token()).is_some()) 23 .all(|p| p.segment().and_then(|s| s.super_token()).is_some())
25 { 24 {
26 let mut super_builder = 25 let mut item = CompletionItem::new(CompletionKind::Keyword, source_range, "super::");
27 CompletionItem::new(CompletionKind::Keyword, source_range, "super::"); 26 item.kind(CompletionItemKind::Keyword).insert_text("super::");
28 super_builder.kind(CompletionItemKind::Keyword).insert_text("super::"); 27 item.add_to(acc);
29 super_builder.add_to(acc);
30 } 28 }
31 } 29 }
32 30
@@ -34,10 +32,10 @@ pub(crate) fn complete_use_tree_keyword(acc: &mut Completions, ctx: &CompletionC
34 if let Some(receiver) = &ctx.dot_receiver { 32 if let Some(receiver) = &ctx.dot_receiver {
35 if let Some(ty) = ctx.sema.type_of_expr(receiver) { 33 if let Some(ty) = ctx.sema.type_of_expr(receiver) {
36 if ty.impls_future(ctx.db) { 34 if ty.impls_future(ctx.db) {
37 let mut builder = 35 let mut item =
38 CompletionItem::new(CompletionKind::Keyword, ctx.source_range(), "await"); 36 CompletionItem::new(CompletionKind::Keyword, ctx.source_range(), "await");
39 builder.kind(CompletionItemKind::Keyword).detail("expr.await").insert_text("await"); 37 item.kind(CompletionItemKind::Keyword).detail("expr.await").insert_text("await");
40 builder.add_to(acc); 38 item.add_to(acc);
41 } 39 }
42 }; 40 };
43 } 41 }
@@ -164,8 +162,8 @@ pub(crate) fn complete_expr_keyword(acc: &mut Completions, ctx: &CompletionConte
164} 162}
165 163
166fn add_keyword(ctx: &CompletionContext, acc: &mut Completions, kw: &str, snippet: &str) { 164fn add_keyword(ctx: &CompletionContext, acc: &mut Completions, kw: &str, snippet: &str) {
167 let mut builder = CompletionItem::new(CompletionKind::Keyword, ctx.source_range(), kw); 165 let mut item = CompletionItem::new(CompletionKind::Keyword, ctx.source_range(), kw);
168 builder.kind(CompletionItemKind::Keyword); 166 item.kind(CompletionItemKind::Keyword);
169 167
170 match ctx.config.snippet_cap { 168 match ctx.config.snippet_cap {
171 Some(cap) => { 169 Some(cap) => {
@@ -177,13 +175,13 @@ fn add_keyword(ctx: &CompletionContext, acc: &mut Completions, kw: &str, snippet
177 } else { 175 } else {
178 snippet 176 snippet
179 }; 177 };
180 builder.insert_snippet(cap, snippet); 178 item.insert_snippet(cap, snippet);
181 } 179 }
182 None => { 180 None => {
183 builder.insert_text(if snippet.contains('$') { kw } else { snippet }); 181 item.insert_text(if snippet.contains('$') { kw } else { snippet });
184 } 182 }
185 }; 183 };
186 acc.add(builder.build()); 184 item.add_to(acc);
187} 185}
188 186
189#[cfg(test)] 187#[cfg(test)]