Skip to content

Commit 6da07eb

Browse files
BenjaminBrienenBenjaminBrienen
committed
fixup variable names
1 parent e41df8d commit 6da07eb

15 files changed

Lines changed: 42 additions & 41 deletions

File tree

‎crates/ide-completion/src/completions.rs‎

Lines changed: 4 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -191,9 +191,10 @@ impl Completions {
191191
let mut item =
192192
CompletionItem::new(CompletionItemKind::Keyword, ctx.source_range(), kw, ctx.edition);
193193

194-
match ctx.config.completion_snippet_cap {
195-
Some(workspace_snippet_cap) => item.insert_snippet(workspace_snippet_cap, snippet),
196-
None => item.insert_text(if snippet.contains('$') { kw } else { snippet }),
194+
if let Some(completion_snippet_cap) = ctx.config.completion_snippet_cap {
195+
item.insert_snippet(completion_snippet_cap, snippet)
196+
} else {
197+
item.insert_text(if snippet.contains('$') { kw } else { snippet })
197198
};
198199
item.add_to(self, ctx.db);
199200
}

‎crates/ide-completion/src/completions/attribute.rs‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -179,9 +179,9 @@ pub(crate) fn complete_attribute_path(
179179
}
180180

181181
if let Some(snippet) = snippet
182-
&& let Some(workspace_snippet_cap) = ctx.config.completion_snippet_cap
182+
&& let Some(completion_snippet_cap) = ctx.config.completion_snippet_cap
183183
{
184-
item.insert_snippet(workspace_snippet_cap, snippet);
184+
item.insert_snippet(completion_snippet_cap, snippet);
185185
}
186186

187187
if is_inner || !attr_completion.prefer_inner {

‎crates/ide-completion/src/completions/attribute/cfg.rs‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -77,10 +77,10 @@ pub(crate) fn complete_cfg(acc: &mut Completions, ctx: &CompletionContext<'_>) {
7777
s,
7878
ctx.edition,
7979
);
80-
if let Some(workspace_snippet_cap) = ctx.config.completion_snippet_cap
80+
if let Some(completion_snippet_cap) = ctx.config.completion_snippet_cap
8181
&& !snippet.is_empty()
8282
{
83-
item.insert_snippet(workspace_snippet_cap, snippet);
83+
item.insert_snippet(completion_snippet_cap, snippet);
8484
}
8585
acc.add(item.build(ctx.db));
8686
}),

‎crates/ide-completion/src/completions/attribute/diagnostic.rs‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -46,9 +46,9 @@ pub(super) fn complete_on_unimplemented(
4646
item.lookup_by(lookup);
4747
}
4848
if let Some(snippet) = attr.snippet
49-
&& let Some(workspace_snippet_cap) = ctx.config.completion_snippet_cap
49+
&& let Some(completion_snippet_cap) = ctx.config.completion_snippet_cap
5050
{
51-
item.insert_snippet(workspace_snippet_cap, snippet);
51+
item.insert_snippet(completion_snippet_cap, snippet);
5252
}
5353
item.add_to(acc, ctx.db);
5454
}

‎crates/ide-completion/src/completions/attribute/repr.rs‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -40,9 +40,9 @@ pub(super) fn complete_repr(
4040
item.lookup_by(lookup);
4141
}
4242
if let Some(snippet) = snippet
43-
&& let Some(workspace_snippet_cap) = ctx.config.completion_snippet_cap
43+
&& let Some(completion_snippet_cap) = ctx.config.completion_snippet_cap
4444
{
45-
item.insert_snippet(workspace_snippet_cap, snippet);
45+
item.insert_snippet(completion_snippet_cap, snippet);
4646
}
4747
item.add_to(acc, ctx.db);
4848
}

‎crates/ide-completion/src/completions/item_list/trait_impl.rs‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -427,10 +427,10 @@ fn add_type_alias_impl(
427427
})
428428
.unwrap_or_default();
429429

430-
if let Some(workspace_snippet_cap) = ctx.config.completion_snippet_cap {
430+
if let Some(completion_snippet_cap) = ctx.config.completion_snippet_cap {
431431
let snippet = format!("{decl}$0{wc};");
432432
item.snippet_edit(
433-
workspace_snippet_cap,
433+
completion_snippet_cap,
434434
TextEdit::replace(replacement_range, snippet),
435435
);
436436
} else {
@@ -473,9 +473,9 @@ fn add_const_impl(
473473
exact_name_match: true,
474474
..Default::default()
475475
});
476-
if let Some(workspace_snippet_cap) = ctx.config.completion_snippet_cap {
476+
if let Some(completion_snippet_cap) = ctx.config.completion_snippet_cap {
477477
item.snippet_edit(
478-
workspace_snippet_cap,
478+
completion_snippet_cap,
479479
TextEdit::replace(replacement_range, format!("{replacement}$0;")),
480480
)
481481
} else {

‎crates/ide-completion/src/completions/snippet.rs‎

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -63,19 +63,19 @@ pub(crate) fn complete_item_snippet(
6363
if !ctx.qualifier_ctx.none() {
6464
return;
6565
}
66-
let Some(workspace_snippet_cap) = ctx.config.completion_snippet_cap else {
66+
let Some(completion_snippet_cap) = ctx.config.completion_snippet_cap else {
6767
return;
6868
};
6969

7070
if !ctx.config.snippets.is_empty() {
71-
add_custom_completions(acc, ctx, workspace_snippet_cap, SnippetScope::Item);
71+
add_custom_completions(acc, ctx, completion_snippet_cap, SnippetScope::Item);
7272
}
7373

7474
// Test-related snippets shouldn't be shown in blocks.
7575
if let ItemListKind::SourceFile | ItemListKind::Module = kind {
7676
let mut item = snippet(
7777
ctx,
78-
workspace_snippet_cap,
78+
completion_snippet_cap,
7979
"tmod (Test module)",
8080
"\
8181
#[cfg(test)]
@@ -93,7 +93,7 @@ mod tests {
9393

9494
let mut item = snippet(
9595
ctx,
96-
workspace_snippet_cap,
96+
completion_snippet_cap,
9797
"tfn (Test function)",
9898
"\
9999
#[test]
@@ -106,7 +106,7 @@ fn ${1:feature}() {
106106

107107
let item = snippet(
108108
ctx,
109-
workspace_snippet_cap,
109+
completion_snippet_cap,
110110
"macro_rules",
111111
"\
112112
macro_rules! $1 {

‎crates/ide-completion/src/render.rs‎

Lines changed: 7 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -327,8 +327,8 @@ pub(crate) fn render_expr(
327327
expr.gen_source_code(&ctx.scope, &mut snippet_formatter, cfg, ctx.display_target).ok()?
328328
);
329329
let edit = TextEdit::replace(source_range, snippet);
330-
if let Some(workspace_snippet_cap) = ctx.config.completion_snippet_cap {
331-
item.snippet_edit(workspace_snippet_cap, edit);
330+
if let Some(completion_snippet_cap) = ctx.config.completion_snippet_cap {
331+
item.snippet_edit(completion_snippet_cap, edit);
332332
}
333333
item.documentation(Documentation::new_owned(String::from(
334334
"Autogenerated expression by term search",
@@ -432,7 +432,7 @@ fn render_resolution_path(
432432

433433
let completion = ctx.completion;
434434
let module = completion.module;
435-
let workspace_snippet_cap = ctx.completion_snippet_cap();
435+
let completion_snippet_cap = ctx.completion_snippet_cap();
436436
let db = completion.db;
437437
let config = completion.config;
438438
let requires_import = import_to_add.is_some();
@@ -446,7 +446,7 @@ fn render_resolution_path(
446446
path_ctx,
447447
PathCompletionCtx { kind: PathKind::Type { .. }, has_type_args: false, .. }
448448
) && config.callable.is_some();
449-
if type_path_no_ty_args && let Some(workspace_snippet_cap) = workspace_snippet_cap {
449+
if type_path_no_ty_args && let Some(completion_snippet_cap) = completion_snippet_cap {
450450
let has_non_default_type_params = match resolution {
451451
ScopeDef::ModuleDef(hir::ModuleDef::Adt(it)) => it.has_non_default_type_params(db),
452452
ScopeDef::ModuleDef(hir::ModuleDef::TypeAlias(it)) => {
@@ -461,7 +461,7 @@ fn render_resolution_path(
461461
item.lookup_by(name.clone())
462462
.label(SmolStr::from_iter([&name, "<…>"]))
463463
.trigger_call_info()
464-
.insert_snippet(workspace_snippet_cap, ""); // set is snippet
464+
.insert_snippet(completion_snippet_cap, ""); // set is snippet
465465
}
466466
}
467467
adds_ret_type_arrow(completion, path_ctx, &mut item, insert_text.into());
@@ -609,8 +609,8 @@ pub(crate) fn render_type_keyword_snippet(
609609
let insert_text = if !snippet.contains('$') {
610610
item.insert_text(snippet);
611611
snippet
612-
} else if let Some(workspace_snippet_cap) = ctx.config.completion_snippet_cap {
613-
item.insert_snippet(workspace_snippet_cap, snippet);
612+
} else if let Some(completion_snippet_cap) = ctx.config.completion_snippet_cap {
613+
item.insert_snippet(completion_snippet_cap, snippet);
614614
snippet
615615
} else {
616616
label

‎crates/ide-completion/src/render/function.rs‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -87,7 +87,7 @@ fn render(
8787
}
8888
});
8989

90-
let (has_dot_receiver, has_call_parens, workspace_snippet_cap) = match func_kind {
90+
let (has_dot_receiver, has_call_parens, completion_snippet_cap) = match func_kind {
9191
FuncKind::Function(&PathCompletionCtx {
9292
kind: PathKind::Expr { .. },
9393
has_call_parens,
@@ -101,7 +101,7 @@ fn render(
101101
}
102102
_ => (false, false, None),
103103
};
104-
let complete_call_parens = workspace_snippet_cap
104+
let complete_call_parens = completion_snippet_cap
105105
.filter(|_| !has_call_parens)
106106
.and_then(|cap| Some((cap, params(ctx.completion, func, &func_kind, has_dot_receiver)?)));
107107

‎crates/ide-completion/src/render/literal.rs‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -92,7 +92,7 @@ fn render(
9292
},
9393
};
9494

95-
if let Some(_workspace_snippet_cap) = completion_snippet_cap {
95+
if completion_snippet_cap.is_some() {
9696
rendered.literal.push_str("$0");
9797
}
9898

@@ -120,8 +120,8 @@ fn render(
120120
item.lookup_by(lookup);
121121
item.detail(rendered.detail);
122122

123-
if let Some(workspace_snippet_cap) = completion_snippet_cap {
124-
item.insert_snippet(workspace_snippet_cap, rendered.literal).trigger_call_info();
123+
if let Some(completion_snippet_cap) = completion_snippet_cap {
124+
item.insert_snippet(completion_snippet_cap, rendered.literal).trigger_call_info();
125125
} else {
126126
item.insert_text(rendered.literal);
127127
}

0 commit comments

Comments
 (0)