Skip to content

Commit c0e9530

Browse files
bors[bot]matklad
bors[bot]
and
matklad
authored
Merge #7978
7978: Unify naming r=matklad a=matklad bors r+ 🤖 Co-authored-by: Aleksey Kladov <aleksey.kladov@gmail.com>
2 parents c01ef6e + 7e217a4 commit c0e9530

File tree

13 files changed

+90
-103
lines changed

13 files changed

+90
-103
lines changed

‎crates/ide_completion/src/completions/attribute.rs

Lines changed: 9 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -168,20 +168,20 @@ fn complete_derive(acc: &mut Completions, ctx: &CompletionContext, derive_input:
168168
);
169169
let lookup = components.join(", ");
170170
let label = components.iter().rev().join(", ");
171-
let mut builder =
171+
let mut item =
172172
CompletionItem::new(CompletionKind::Attribute, ctx.source_range(), label);
173-
builder.lookup_by(lookup).kind(CompletionItemKind::Attribute);
174-
builder.add_to(acc);
173+
item.lookup_by(lookup).kind(CompletionItemKind::Attribute);
174+
item.add_to(acc);
175175
}
176176

177177
for custom_derive_name in get_derive_names_in_scope(ctx).difference(&existing_derives) {
178-
let mut builder = CompletionItem::new(
178+
let mut item = CompletionItem::new(
179179
CompletionKind::Attribute,
180180
ctx.source_range(),
181181
custom_derive_name,
182182
);
183-
builder.kind(CompletionItemKind::Attribute);
184-
builder.add_to(acc);
183+
item.kind(CompletionItemKind::Attribute);
184+
item.add_to(acc);
185185
}
186186
}
187187
}
@@ -197,13 +197,13 @@ fn complete_lint(
197197
.into_iter()
198198
.filter(|completion| !existing_lints.contains(completion.label))
199199
{
200-
let mut builder = CompletionItem::new(
200+
let mut item = CompletionItem::new(
201201
CompletionKind::Attribute,
202202
ctx.source_range(),
203203
lint_completion.label,
204204
);
205-
builder.kind(CompletionItemKind::Attribute).detail(lint_completion.description);
206-
builder.add_to(acc)
205+
item.kind(CompletionItemKind::Attribute).detail(lint_completion.description);
206+
item.add_to(acc)
207207
}
208208
}
209209
}

‎crates/ide_completion/src/completions/fn_param.rs

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -54,9 +54,9 @@ pub(crate) fn complete_fn_param(acc: &mut Completions, ctx: &CompletionContext)
5454
}
5555

5656
params.into_iter().for_each(|(label, lookup)| {
57-
let mut builder = CompletionItem::new(CompletionKind::Magic, ctx.source_range(), label);
58-
builder.kind(CompletionItemKind::Binding).lookup_by(lookup);
59-
builder.add_to(acc)
57+
let mut item = CompletionItem::new(CompletionKind::Magic, ctx.source_range(), label);
58+
item.kind(CompletionItemKind::Binding).lookup_by(lookup);
59+
item.add_to(acc)
6060
});
6161
}
6262

‎crates/ide_completion/src/completions/keyword.rs

Lines changed: 17 additions & 19 deletions
Original file line numberDiff line numberDiff line change
@@ -12,32 +12,30 @@ pub(crate) fn complete_use_tree_keyword(acc: &mut Completions, ctx: &CompletionC
1212

1313
if ctx.use_item_syntax.is_some() {
1414
if ctx.path_qual.is_none() {
15-
let mut crate_builder =
16-
CompletionItem::new(CompletionKind::Keyword, source_range, "crate::");
17-
crate_builder.kind(CompletionItemKind::Keyword).insert_text("crate::");
18-
crate_builder.add_to(acc);
15+
let mut item = CompletionItem::new(CompletionKind::Keyword, source_range, "crate::");
16+
item.kind(CompletionItemKind::Keyword).insert_text("crate::");
17+
item.add_to(acc);
1918
}
20-
let mut self_builder = CompletionItem::new(CompletionKind::Keyword, source_range, "self");
21-
self_builder.kind(CompletionItemKind::Keyword);
22-
self_builder.add_to(acc);
19+
let mut item = CompletionItem::new(CompletionKind::Keyword, source_range, "self");
20+
item.kind(CompletionItemKind::Keyword);
21+
item.add_to(acc);
2322
if iter::successors(ctx.path_qual.clone(), |p| p.qualifier())
2423
.all(|p| p.segment().and_then(|s| s.super_token()).is_some())
2524
{
26-
let mut super_builder =
27-
CompletionItem::new(CompletionKind::Keyword, source_range, "super::");
28-
super_builder.kind(CompletionItemKind::Keyword).insert_text("super::");
29-
super_builder.add_to(acc);
25+
let mut item = CompletionItem::new(CompletionKind::Keyword, source_range, "super::");
26+
item.kind(CompletionItemKind::Keyword).insert_text("super::");
27+
item.add_to(acc);
3028
}
3129
}
3230

3331
// Suggest .await syntax for types that implement Future trait
3432
if let Some(receiver) = &ctx.dot_receiver {
3533
if let Some(ty) = ctx.sema.type_of_expr(receiver) {
3634
if ty.impls_future(ctx.db) {
37-
let mut builder =
35+
let mut item =
3836
CompletionItem::new(CompletionKind::Keyword, ctx.source_range(), "await");
39-
builder.kind(CompletionItemKind::Keyword).detail("expr.await").insert_text("await");
40-
builder.add_to(acc);
37+
item.kind(CompletionItemKind::Keyword).detail("expr.await").insert_text("await");
38+
item.add_to(acc);
4139
}
4240
};
4341
}
@@ -164,8 +162,8 @@ pub(crate) fn complete_expr_keyword(acc: &mut Completions, ctx: &CompletionConte
164162
}
165163

166164
fn add_keyword(ctx: &CompletionContext, acc: &mut Completions, kw: &str, snippet: &str) {
167-
let mut builder = CompletionItem::new(CompletionKind::Keyword, ctx.source_range(), kw);
168-
builder.kind(CompletionItemKind::Keyword);
165+
let mut item = CompletionItem::new(CompletionKind::Keyword, ctx.source_range(), kw);
166+
item.kind(CompletionItemKind::Keyword);
169167

170168
match ctx.config.snippet_cap {
171169
Some(cap) => {
@@ -177,13 +175,13 @@ fn add_keyword(ctx: &CompletionContext, acc: &mut Completions, kw: &str, snippet
177175
} else {
178176
snippet
179177
};
180-
builder.insert_snippet(cap, snippet);
178+
item.insert_snippet(cap, snippet);
181179
}
182180
None => {
183-
builder.insert_text(if snippet.contains('$') { kw } else { snippet });
181+
item.insert_text(if snippet.contains('$') { kw } else { snippet });
184182
}
185183
};
186-
acc.add(builder.build());
184+
item.add_to(acc);
187185
}
188186

189187
#[cfg(test)]

‎crates/ide_completion/src/completions/mod_.rs

Lines changed: 3 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -80,10 +80,9 @@ pub(crate) fn complete_mod(acc: &mut Completions, ctx: &CompletionContext) -> Op
8080
if mod_under_caret.semicolon_token().is_none() {
8181
label.push(';');
8282
}
83-
let mut builder =
84-
CompletionItem::new(CompletionKind::Magic, ctx.source_range(), &label);
85-
builder.kind(SymbolKind::Module);
86-
builder.add_to(acc)
83+
let mut item = CompletionItem::new(CompletionKind::Magic, ctx.source_range(), &label);
84+
item.kind(SymbolKind::Module);
85+
item.add_to(acc)
8786
});
8887

8988
Some(())

‎crates/ide_completion/src/completions/postfix.rs

Lines changed: 3 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -297,11 +297,9 @@ fn postfix_snippet(
297297
let delete_range = TextRange::new(receiver_range.start(), ctx.source_range().end());
298298
TextEdit::replace(delete_range, snippet.to_string())
299299
};
300-
CompletionItem::new(CompletionKind::Postfix, ctx.source_range(), label)
301-
.detail(detail)
302-
.kind(CompletionItemKind::Snippet)
303-
.snippet_edit(cap, edit)
304-
.clone()
300+
let mut item = CompletionItem::new(CompletionKind::Postfix, ctx.source_range(), label);
301+
item.detail(detail).kind(CompletionItemKind::Snippet).snippet_edit(cap, edit);
302+
item
305303
}
306304

307305
#[cfg(test)]

‎crates/ide_completion/src/completions/record.rs

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -22,13 +22,13 @@ pub(crate) fn complete_record(acc: &mut Completions, ctx: &CompletionContext) ->
2222
let completion_text = completion_text
2323
.strip_prefix(ctx.token.to_string().as_str())
2424
.unwrap_or(completion_text);
25-
let mut builder = CompletionItem::new(
25+
let mut item = CompletionItem::new(
2626
CompletionKind::Snippet,
2727
ctx.source_range(),
2828
"..Default::default()",
2929
);
30-
builder.insert_text(completion_text).kind(SymbolKind::Field);
31-
acc.add(builder.build());
30+
item.insert_text(completion_text).kind(SymbolKind::Field);
31+
item.add_to(acc);
3232
}
3333

3434
missing_fields

‎crates/ide_completion/src/completions/snippet.rs

Lines changed: 11 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -8,8 +8,9 @@ use crate::{
88
};
99

1010
fn snippet(ctx: &CompletionContext, cap: SnippetCap, label: &str, snippet: &str) -> Builder {
11-
let mut builder = CompletionItem::new(CompletionKind::Snippet, ctx.source_range(), label);
12-
builder.insert_snippet(cap, snippet).kind(CompletionItemKind::Snippet).clone()
11+
let mut item = CompletionItem::new(CompletionKind::Snippet, ctx.source_range(), label);
12+
item.insert_snippet(cap, snippet).kind(CompletionItemKind::Snippet);
13+
item
1314
}
1415

1516
pub(crate) fn complete_expr_snippet(acc: &mut Completions, ctx: &CompletionContext) {
@@ -34,7 +35,7 @@ pub(crate) fn complete_item_snippet(acc: &mut Completions, ctx: &CompletionConte
3435
None => return,
3536
};
3637

37-
let mut test_module_builder = snippet(
38+
let mut item = snippet(
3839
ctx,
3940
cap,
4041
"tmod (Test module)",
@@ -49,10 +50,10 @@ mod tests {
4950
}
5051
}",
5152
);
52-
test_module_builder.lookup_by("tmod");
53-
test_module_builder.add_to(acc);
53+
item.lookup_by("tmod");
54+
item.add_to(acc);
5455

55-
let mut test_function_builder = snippet(
56+
let mut item = snippet(
5657
ctx,
5758
cap,
5859
"tfn (Test function)",
@@ -62,12 +63,11 @@ fn ${1:feature}() {
6263
$0
6364
}",
6465
);
65-
test_function_builder.lookup_by("tfn");
66-
test_function_builder.add_to(acc);
66+
item.lookup_by("tfn");
67+
item.add_to(acc);
6768

68-
let macro_rules_builder =
69-
snippet(ctx, cap, "macro_rules", "macro_rules! $1 {\n\t($2) => {\n\t\t$0\n\t};\n}");
70-
macro_rules_builder.add_to(acc);
69+
let item = snippet(ctx, cap, "macro_rules", "macro_rules! $1 {\n\t($2) => {\n\t\t$0\n\t};\n}");
70+
item.add_to(acc);
7171
}
7272

7373
#[cfg(test)]

‎crates/ide_completion/src/completions/trait_impl.rs

Lines changed: 12 additions & 15 deletions
Original file line numberDiff line numberDiff line change
@@ -145,8 +145,8 @@ fn add_function_impl(
145145
format!("fn {}(..)", fn_name)
146146
};
147147

148-
let mut builder = CompletionItem::new(CompletionKind::Magic, ctx.source_range(), label);
149-
builder.lookup_by(fn_name).set_documentation(func.docs(ctx.db));
148+
let mut item = CompletionItem::new(CompletionKind::Magic, ctx.source_range(), label);
149+
item.lookup_by(fn_name).set_documentation(func.docs(ctx.db));
150150

151151
let completion_kind = if func.self_param(ctx.db).is_some() {
152152
CompletionItemKind::Method
@@ -160,15 +160,15 @@ fn add_function_impl(
160160
match ctx.config.snippet_cap {
161161
Some(cap) => {
162162
let snippet = format!("{} {{\n $0\n}}", function_decl);
163-
builder.snippet_edit(cap, TextEdit::replace(range, snippet));
163+
item.snippet_edit(cap, TextEdit::replace(range, snippet));
164164
}
165165
None => {
166166
let header = format!("{} {{", function_decl);
167-
builder.text_edit(TextEdit::replace(range, header));
167+
item.text_edit(TextEdit::replace(range, header));
168168
}
169169
};
170-
builder.kind(completion_kind);
171-
builder.add_to(acc);
170+
item.kind(completion_kind);
171+
item.add_to(acc);
172172
}
173173
}
174174

@@ -184,14 +184,12 @@ fn add_type_alias_impl(
184184

185185
let range = TextRange::new(type_def_node.text_range().start(), ctx.source_range().end());
186186

187-
let mut builder =
188-
CompletionItem::new(CompletionKind::Magic, ctx.source_range(), snippet.clone());
189-
builder
190-
.text_edit(TextEdit::replace(range, snippet))
187+
let mut item = CompletionItem::new(CompletionKind::Magic, ctx.source_range(), snippet.clone());
188+
item.text_edit(TextEdit::replace(range, snippet))
191189
.lookup_by(alias_name)
192190
.kind(SymbolKind::TypeAlias)
193191
.set_documentation(type_alias.docs(ctx.db));
194-
builder.add_to(acc);
192+
item.add_to(acc);
195193
}
196194

197195
fn add_const_impl(
@@ -209,14 +207,13 @@ fn add_const_impl(
209207
let range =
210208
TextRange::new(const_def_node.text_range().start(), ctx.source_range().end());
211209

212-
let mut builder =
210+
let mut item =
213211
CompletionItem::new(CompletionKind::Magic, ctx.source_range(), snippet.clone());
214-
builder
215-
.text_edit(TextEdit::replace(range, snippet))
212+
item.text_edit(TextEdit::replace(range, snippet))
216213
.lookup_by(const_name)
217214
.kind(SymbolKind::Const)
218215
.set_documentation(const_.docs(ctx.db));
219-
builder.add_to(acc);
216+
item.add_to(acc);
220217
}
221218
}
222219
}

‎crates/ide_completion/src/render.rs

Lines changed: 7 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -145,34 +145,33 @@ impl<'a> Render<'a> {
145145
fn add_field(&mut self, field: hir::Field, ty: &Type) -> CompletionItem {
146146
let is_deprecated = self.ctx.is_deprecated(field);
147147
let name = field.name(self.ctx.db());
148-
let mut builder = CompletionItem::new(
148+
let mut item = CompletionItem::new(
149149
CompletionKind::Reference,
150150
self.ctx.source_range(),
151151
name.to_string(),
152152
);
153-
builder
154-
.kind(SymbolKind::Field)
153+
item.kind(SymbolKind::Field)
155154
.detail(ty.display(self.ctx.db()).to_string())
156155
.set_documentation(field.docs(self.ctx.db()))
157156
.set_deprecated(is_deprecated);
158157

159158
if let Some(relevance) = compute_relevance(&self.ctx, &ty, &name.to_string()) {
160-
builder.set_relevance(relevance);
159+
item.set_relevance(relevance);
161160
}
162161

163-
builder.build()
162+
item.build()
164163
}
165164

166165
fn add_tuple_field(&mut self, field: usize, ty: &Type) -> CompletionItem {
167-
let mut builder = CompletionItem::new(
166+
let mut item = CompletionItem::new(
168167
CompletionKind::Reference,
169168
self.ctx.source_range(),
170169
field.to_string(),
171170
);
172171

173-
builder.kind(SymbolKind::Field).detail(ty.display(self.ctx.db()).to_string());
172+
item.kind(SymbolKind::Field).detail(ty.display(self.ctx.db()).to_string());
174173

175-
builder.build()
174+
item.build()
176175
}
177176

178177
fn render_resolution(

‎crates/ide_completion/src/render/enum_variant.rs

Lines changed: 5 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -55,13 +55,12 @@ impl<'a> EnumRender<'a> {
5555
}
5656

5757
fn render(self, import_to_add: Option<ImportEdit>) -> CompletionItem {
58-
let mut builder = CompletionItem::new(
58+
let mut item = CompletionItem::new(
5959
CompletionKind::Reference,
6060
self.ctx.source_range(),
6161
self.qualified_name.clone(),
6262
);
63-
builder
64-
.kind(SymbolKind::Variant)
63+
item.kind(SymbolKind::Variant)
6564
.set_documentation(self.variant.docs(self.ctx.db()))
6665
.set_deprecated(self.ctx.is_deprecated(self.variant))
6766
.add_import(import_to_add)
@@ -70,12 +69,12 @@ impl<'a> EnumRender<'a> {
7069
if self.variant_kind == StructKind::Tuple {
7170
cov_mark::hit!(inserts_parens_for_tuple_enums);
7271
let params = Params::Anonymous(self.variant.fields(self.ctx.db()).len());
73-
builder.add_call_parens(self.ctx.completion, self.short_qualified_name, params);
72+
item.add_call_parens(self.ctx.completion, self.short_qualified_name, params);
7473
} else if self.path.is_some() {
75-
builder.lookup_by(self.short_qualified_name);
74+
item.lookup_by(self.short_qualified_name);
7675
}
7776

78-
builder.build()
77+
item.build()
7978
}
8079

8180
fn detail(&self) -> String {

0 commit comments

Comments
 (0)