1 files changed, 30 insertions, 31 deletions

diff --git a/crates/completion/src/render.rs b/crates/completion/src/render.rs
index 1ba7201a1..e93c59f71 100644
--- a/crates/completion/src/render.rs
+++ b/crates/completion/src/render.rs
@@ -11,13 +11,13 @@ pub(crate) mod type_alias;
 mod builder_ext;
 
 use hir::{Documentation, HasAttrs, HirDisplay, Mutability, ScopeDef, Type};
-use ide_db::RootDatabase;
+use ide_db::{helpers::SnippetCap, RootDatabase};
 use syntax::TextRange;
 use test_utils::mark;
 
 use crate::{
-    config::SnippetCap, item::ImportEdit, CompletionContext, CompletionItem, CompletionItemKind,
-    CompletionKind, CompletionScore,
+    item::ImportEdit, CompletionContext, CompletionItem, CompletionItemKind, CompletionKind,
+    CompletionScore,
 };
 
 use crate::render::{enum_variant::render_variant, function::render_fn, macro_::render_macro};
@@ -157,8 +157,7 @@ impl<'a> Render<'a> {
 
         let kind = match resolution {
             ScopeDef::ModuleDef(Function(func)) => {
-                let item = render_fn(self.ctx, import_to_add, Some(local_name), *func);
-                return Some(item);
+                return render_fn(self.ctx, import_to_add, Some(local_name), *func);
             }
             ScopeDef::ModuleDef(Variant(_))
                 if self.ctx.completion.is_pat_binding_or_const
@@ -321,8 +320,8 @@ mod tests {
     use test_utils::mark;
 
     use crate::{
-        test_utils::{check_edit, do_completion, get_all_items},
-        CompletionConfig, CompletionKind, CompletionScore,
+        test_utils::{check_edit, do_completion, get_all_items, TEST_CONFIG},
+        CompletionKind, CompletionScore,
     };
 
     fn check(ra_fixture: &str, expect: Expect) {
@@ -339,7 +338,7 @@ mod tests {
             }
         }
 
-        let mut completions = get_all_items(CompletionConfig::default(), ra_fixture);
+        let mut completions = get_all_items(TEST_CONFIG, ra_fixture);
         completions.sort_by_key(|it| (Reverse(it.score()), it.label().to_string()));
         let actual = completions
             .into_iter()
@@ -359,7 +358,7 @@ mod tests {
             r#"
 enum Foo { Foo { x: i32, y: i32 } }
 
-fn main() { Foo::Fo<|> }
+fn main() { Foo::Fo$0 }
 "#,
             expect![[r#"
                 [
@@ -382,7 +381,7 @@ fn main() { Foo::Fo<|> }
             r#"
 enum Foo { Foo (i32, i32) }
 
-fn main() { Foo::Fo<|> }
+fn main() { Foo::Fo$0 }
 "#,
             expect![[r#"
                 [
@@ -407,7 +406,7 @@ fn main() { Foo::Fo<|> }
             r#"
 enum Foo { Foo }
 
-fn main() { Foo::Fo<|> }
+fn main() { Foo::Fo$0 }
 "#,
             expect![[r#"
                 [
@@ -431,7 +430,7 @@ fn main() { Foo::Fo<|> }
 mod m {
     pub enum Spam { Foo, Bar(i32) }
 }
-fn main() { let _: m::Spam = S<|> }
+fn main() { let _: m::Spam = S$0 }
 "#,
             expect![[r#"
                 [
@@ -484,7 +483,7 @@ fn something_deprecated() {}
 #[deprecated(since = "1.0.0")]
 fn something_else_deprecated() {}
 
-fn main() { som<|> }
+fn main() { som$0 }
 "#,
             expect![[r#"
                 [
@@ -524,7 +523,7 @@ fn main() { som<|> }
         check(
             r#"
 struct A { #[deprecated] the_field: u32 }
-fn foo() { A { the<|> } }
+fn foo() { A { the$0 } }
 "#,
             expect![[r#"
                 [
@@ -552,7 +551,7 @@ struct S {
 }
 impl S {
     /// Method docs
-    fn bar(self) { self.<|> }
+    fn bar(self) { self.$0 }
 }"#,
             expect![[r#"
                 [
@@ -585,7 +584,7 @@ impl S {
 
         check(
             r#"
-use self::my<|>;
+use self::my$0;
 
 /// mod docs
 mod my { }
@@ -644,7 +643,7 @@ impl S {
     #[inline]
     fn the_method(&self) { }
 }
-fn foo(s: S) { s.<|> }
+fn foo(s: S) { s.$0 }
 "#,
             expect![[r#"
                 [
@@ -672,7 +671,7 @@ fn foo(foo: u8, bar: u8) {}
 struct ManualVtable { f: fn(u8, u8) }
 
 fn main() -> ManualVtable {
-    ManualVtable { f: f<|> }
+    ManualVtable { f: f$0 }
 }
 "#,
             r#"
@@ -693,7 +692,7 @@ fn main() -> ManualVtable {
             "foo",
             r#"
 mod m { pub fn foo() {} }
-use crate::m::f<|>;
+use crate::m::f$0;
 "#,
             r#"
 mod m { pub fn foo() {} }
@@ -708,7 +707,7 @@ use crate::m::foo;
             "foo",
             r#"
 fn foo(x: i32) {}
-fn main() { f<|>(); }
+fn main() { f$0(); }
 "#,
             r#"
 fn foo(x: i32) {}
@@ -720,7 +719,7 @@ fn main() { foo(); }
             r#"
 struct Foo;
 impl Foo { fn foo(&self){} }
-fn f(foo: &Foo) { foo.f<|>(); }
+fn f(foo: &Foo) { foo.f$0(); }
 "#,
             r#"
 struct Foo;
@@ -737,7 +736,7 @@ fn f(foo: &Foo) { foo.foo(); }
             "Vec",
             r#"
 struct Vec<T> {}
-fn foo(xs: Ve<|>)
+fn foo(xs: Ve$0)
 "#,
             r#"
 struct Vec<T> {}
@@ -748,7 +747,7 @@ fn foo(xs: Vec<$0>)
             "Vec",
             r#"
 type Vec<T> = (T,);
-fn foo(xs: Ve<|>)
+fn foo(xs: Ve$0)
 "#,
             r#"
 type Vec<T> = (T,);
@@ -759,7 +758,7 @@ fn foo(xs: Vec<$0>)
             "Vec",
             r#"
 struct Vec<T = i128> {}
-fn foo(xs: Ve<|>)
+fn foo(xs: Ve$0)
 "#,
             r#"
 struct Vec<T = i128> {}
@@ -770,7 +769,7 @@ fn foo(xs: Vec)
             "Vec",
             r#"
 struct Vec<T> {}
-fn foo(xs: Ve<|><i128>)
+fn foo(xs: Ve$0<i128>)
 "#,
             r#"
 struct Vec<T> {}
@@ -786,7 +785,7 @@ fn foo(xs: Vec<i128>)
             r#"
 struct S { foo: i64, bar: u32, baz: u32 }
 fn test(bar: u32) { }
-fn foo(s: S) { test(s.<|>) }
+fn foo(s: S) { test(s.$0) }
 "#,
             expect![[r#"
                 fd bar [type+name]
@@ -803,7 +802,7 @@ fn foo(s: S) { test(s.<|>) }
             r#"
 struct A { foo: i64, bar: u32, baz: u32 }
 struct B { x: (), y: f32, bar: u32 }
-fn foo(a: A) { B { bar: a.<|> }; }
+fn foo(a: A) { B { bar: a.$0 }; }
 "#,
             expect![[r#"
                 fd bar [type+name]
@@ -820,7 +819,7 @@ fn foo(a: A) { B { bar: a.<|> }; }
 struct A { foo: i64, bar: u32, baz: u32 }
 struct B { x: (), y: f32, bar: u32 }
 fn f(foo: i64) {  }
-fn foo(a: A) { B { bar: f(a.<|>) }; }
+fn foo(a: A) { B { bar: f(a.$0) }; }
 "#,
             expect![[r#"
                 fd foo [type+name]
@@ -833,7 +832,7 @@ fn foo(a: A) { B { bar: f(a.<|>) }; }
 struct A { foo: i64, bar: u32, baz: u32 }
 struct B { x: (), y: f32, bar: u32 }
 fn f(foo: i64) {  }
-fn foo(a: A) { f(B { bar: a.<|> }); }
+fn foo(a: A) { f(B { bar: a.$0 }); }
 "#,
             expect![[r#"
                 fd bar [type+name]
@@ -848,7 +847,7 @@ fn foo(a: A) { f(B { bar: a.<|> }); }
         check_scores(
             r#"
 struct WorldSnapshot { _f: () };
-fn go(world: &WorldSnapshot) { go(w<|>) }
+fn go(world: &WorldSnapshot) { go(w$0) }
 "#,
             expect![[r#"
                 bn world [type+name]
@@ -863,7 +862,7 @@ fn go(world: &WorldSnapshot) { go(w<|>) }
         check_scores(
             r#"
 struct Foo;
-fn f(foo: &Foo) { f(foo, w<|>) }
+fn f(foo: &Foo) { f(foo, w$0) }
 "#,
             expect![[r#"
                 st Foo []