6 files changed, 74 insertions, 73 deletions

diff --git a/crates/ide_completion/src/completions/dot.rs b/crates/ide_completion/src/completions/dot.rs
index 5ee9a9f07..cec2d0c3a 100644
--- a/crates/ide_completion/src/completions/dot.rs
+++ b/crates/ide_completion/src/completions/dot.rs
@@ -81,7 +81,7 @@ fn foo(s: S) { s.$0 }
 "#,
             expect![[r#"
                 fd foo   u32
-                me bar() -> ()
+                me bar() fn(&self)
             "#]],
         );
     }
@@ -97,7 +97,7 @@ impl S {
 "#,
             expect![[r#"
                 fd the_field (u32,)
-                me foo()     -> ()
+                me foo()     fn(self)
             "#]],
         )
     }
@@ -113,7 +113,7 @@ impl A {
 "#,
             expect![[r#"
                 fd the_field (u32, i32)
-                me foo()     -> ()
+                me foo()     fn(&self)
             "#]],
         )
     }
@@ -163,7 +163,7 @@ mod m {
 fn foo(a: A) { a.$0 }
 "#,
             expect![[r#"
-                me the_method() -> ()
+                me the_method() fn(&self)
             "#]],
         );
     }
@@ -196,7 +196,7 @@ impl A<i32> {
 fn foo(a: A<u32>) { a.$0 }
 "#,
             expect![[r#"
-                me the_method() -> ()
+                me the_method() fn(&self)
             "#]],
         )
     }
@@ -211,7 +211,7 @@ impl Trait for A {}
 fn foo(a: A) { a.$0 }
 "#,
             expect![[r#"
-                me the_method() -> ()
+                me the_method() fn(&self)
             "#]],
         );
     }
@@ -226,7 +226,7 @@ impl<T> Trait for T {}
 fn foo(a: &A) { a.$0 }
 ",
             expect![[r#"
-                me the_method() -> ()
+                me the_method() fn(&self)
             "#]],
         );
     }
@@ -244,7 +244,7 @@ impl Trait for A {}
 fn foo(a: A) { a.$0 }
 ",
             expect![[r#"
-                me the_method() -> ()
+                me the_method() fn(&self)
             "#]],
         );
     }
@@ -298,7 +298,7 @@ impl T {
 }
 "#,
             expect![[r#"
-                me blah() -> ()
+                me blah() fn(&self)
             "#]],
         );
     }
@@ -407,7 +407,7 @@ fn foo() {
 }
 "#,
             expect![[r#"
-                me the_method() -> ()
+                me the_method() fn(&self)
             "#]],
         );
     }
@@ -422,7 +422,7 @@ macro_rules! make_s { () => { S }; }
 fn main() { make_s!().f$0; }
 "#,
             expect![[r#"
-                me foo() -> ()
+                me foo() fn(&self)
             "#]],
         )
     }
@@ -450,7 +450,7 @@ mod foo {
 }
         "#,
             expect![[r#"
-                me private() -> ()
+                me private() fn(&self)
             "#]],
         );
     }
diff --git a/crates/ide_completion/src/completions/flyimport.rs b/crates/ide_completion/src/completions/flyimport.rs
index 391a11c91..08df2df3f 100644
--- a/crates/ide_completion/src/completions/flyimport.rs
+++ b/crates/ide_completion/src/completions/flyimport.rs
@@ -402,7 +402,7 @@ fn main() {
         check(
             fixture,
             expect![[r#"
-                fn weird_function() (dep::test_mod::TestTrait) -> ()
+                fn weird_function() (dep::test_mod::TestTrait) fn()
             "#]],
         );
 
@@ -495,7 +495,7 @@ fn main() {
         check(
             fixture,
             expect![[r#"
-                me random_method() (dep::test_mod::TestTrait) -> ()
+                me random_method() (dep::test_mod::TestTrait) fn(&self)
             "#]],
         );
 
@@ -665,7 +665,7 @@ fn main() {
 }
         "#,
             expect![[r#"
-                me random_method() (dep::test_mod::TestTrait) -> () DEPRECATED
+                me random_method() (dep::test_mod::TestTrait) fn(&self) DEPRECATED
             "#]],
         );
 
@@ -696,7 +696,7 @@ fn main() {
 "#,
             expect![[r#"
                 ct SPECIAL_CONST (dep::test_mod::TestTrait) DEPRECATED
-                fn weird_function() (dep::test_mod::TestTrait) -> () DEPRECATED
+                fn weird_function() (dep::test_mod::TestTrait) fn() DEPRECATED
             "#]],
         );
     }
diff --git a/crates/ide_completion/src/completions/fn_param.rs b/crates/ide_completion/src/completions/fn_param.rs
index 0243dce56..0ea558489 100644
--- a/crates/ide_completion/src/completions/fn_param.rs
+++ b/crates/ide_completion/src/completions/fn_param.rs
@@ -33,7 +33,7 @@ pub(crate) fn complete_fn_param(acc: &mut Completions, ctx: &CompletionContext)
         });
     };
 
-    for node in ctx.token.parent().ancestors() {
+    for node in ctx.token.ancestors() {
         match_ast! {
             match node {
                 ast::SourceFile(it) => it.items().filter_map(|item| match item {
diff --git a/crates/ide_completion/src/completions/qualified_path.rs b/crates/ide_completion/src/completions/qualified_path.rs
index df74b739e..105ff6013 100644
--- a/crates/ide_completion/src/completions/qualified_path.rs
+++ b/crates/ide_completion/src/completions/qualified_path.rs
@@ -359,8 +359,8 @@ impl S {
 fn foo() { let _ = S::$0 }
 "#,
             expect![[r#"
-                fn a()  -> ()
-                me b(…) -> ()
+                fn a()  fn()
+                me b(…) fn(&self)
                 ct C    const C: i32 = 42;
                 ta T    type T = i32;
             "#]],
@@ -387,7 +387,7 @@ mod m {
 fn foo() { let _ = S::$0 }
 "#,
             expect![[r#"
-                fn public_method() -> ()
+                fn public_method() fn()
                 ct PUBLIC_CONST    pub(crate) const PUBLIC_CONST: u32 = 1;
                 ta PublicType      pub(crate) type PublicType = u32;
             "#]],
@@ -404,7 +404,7 @@ impl E { fn m() { } }
 fn foo() { let _ = E::$0 }
         "#,
             expect![[r#"
-                fn m() -> ()
+                fn m() fn()
             "#]],
         );
     }
@@ -419,7 +419,7 @@ impl U { fn m() { } }
 fn foo() { let _ = U::$0 }
 "#,
             expect![[r#"
-                fn m() -> ()
+                fn m() fn()
             "#]],
         );
     }
@@ -449,7 +449,7 @@ trait Trait { fn m(); }
 fn foo() { let _ = Trait::$0 }
 "#,
             expect![[r#"
-                fn m() -> ()
+                fn m() fn()
             "#]],
         );
     }
@@ -466,7 +466,7 @@ impl Trait for S {}
 fn foo() { let _ = S::$0 }
 "#,
             expect![[r#"
-                fn m() -> ()
+                fn m() fn()
             "#]],
         );
     }
@@ -483,7 +483,7 @@ impl Trait for S {}
 fn foo() { let _ = <S as Trait>::$0 }
 "#,
             expect![[r#"
-                fn m() -> ()
+                fn m() fn()
             "#]],
         );
     }
@@ -512,11 +512,11 @@ fn foo<T: Sub>() { T::$0 }
                 ta SubTy        type SubTy;
                 ta Ty           type Ty;
                 ct C2           const C2: ();
-                fn subfunc()    -> ()
-                me submethod(…) -> ()
+                fn subfunc()    fn()
+                me submethod(…) fn(&self)
                 ct CONST        const CONST: u8;
-                fn func()       -> ()
-                me method(…)    -> ()
+                fn func()       fn()
+                me method(…)    fn(&self)
             "#]],
         );
     }
@@ -552,11 +552,11 @@ impl<T> Sub for Wrap<T> {
                 ta SubTy        type SubTy;
                 ta Ty           type Ty;
                 ct CONST        const CONST: u8 = 0;
-                fn func()       -> ()
-                me method(…)    -> ()
+                fn func()       fn()
+                me method(…)    fn(&self)
                 ct C2           const C2: () = ();
-                fn subfunc()    -> ()
-                me submethod(…) -> ()
+                fn subfunc()    fn()
+                me submethod(…) fn(&self)
             "#]],
         );
     }
@@ -573,8 +573,8 @@ impl T { fn bar() {} }
 fn main() { T::$0; }
 "#,
             expect![[r#"
-                fn foo() -> ()
-                fn bar() -> ()
+                fn foo() fn()
+                fn bar() fn()
             "#]],
         );
     }
@@ -589,7 +589,7 @@ macro_rules! foo { () => {} }
 fn main() { let _ = crate::$0 }
         "#,
             expect![[r##"
-                fn main()  -> ()
+                fn main()  fn()
                 ma foo!(…) #[macro_export] macro_rules! foo
             "##]],
         );
@@ -633,7 +633,7 @@ mod p {
 "#,
             expect![[r#"
                 ct RIGHT_CONST
-                fn right_fn()  -> ()
+                fn right_fn()  fn()
                 st RightType
             "#]],
         );
@@ -680,8 +680,8 @@ fn main() { m!(self::f$0); }
 fn foo() {}
 "#,
             expect![[r#"
-                fn main() -> ()
-                fn foo()  -> ()
+                fn main() fn()
+                fn foo()  fn()
             "#]],
         );
     }
@@ -699,7 +699,7 @@ mod m {
 "#,
             expect![[r#"
                 md z
-                fn z() -> ()
+                fn z() fn()
             "#]],
         );
     }
@@ -719,7 +719,7 @@ fn foo() {
 }
 "#,
             expect![[r#"
-                fn new() -> HashMap<K, V, RandomState>
+                fn new() fn() -> HashMap<K, V, RandomState>
             "#]],
         );
     }
@@ -752,8 +752,8 @@ fn main() {
 }
 "#,
             expect![[r#"
-                fn main() -> ()
-                fn foo(…) -> ()
+                fn main() fn()
+                fn foo(…) fn(i32, i32)
             "#]],
         );
     }
@@ -776,7 +776,7 @@ impl Foo {
             expect![[r#"
                 ev Bar    ()
                 ev Baz    ()
-                me foo(…) -> ()
+                me foo(…) fn(self)
             "#]],
         );
     }
@@ -800,7 +800,7 @@ impl u8 {
 "#,
             expect![[r#"
                 ct MAX     pub const MAX: Self = 255;
-                me func(…) -> ()
+                me func(…) fn(self)
             "#]],
         );
     }
diff --git a/crates/ide_completion/src/completions/trait_impl.rs b/crates/ide_completion/src/completions/trait_impl.rs
index 5a7361f8e..a26fe7c6c 100644
--- a/crates/ide_completion/src/completions/trait_impl.rs
+++ b/crates/ide_completion/src/completions/trait_impl.rs
@@ -82,13 +82,14 @@ pub(crate) fn complete_trait_impl(acc: &mut Completions, ctx: &CompletionContext
 
 fn completion_match(ctx: &CompletionContext) -> Option<(ImplCompletionKind, SyntaxNode, Impl)> {
     let mut token = ctx.token.clone();
-    // For keywork without name like `impl .. { fn $0 }`, the current position is inside
+    // For keyword without name like `impl .. { fn $0 }`, the current position is inside
     // the whitespace token, which is outside `FN` syntax node.
     // We need to follow the previous token in this case.
     if token.kind() == SyntaxKind::WHITESPACE {
         token = token.prev_token()?;
     }
 
+    let parent_kind = token.parent().map_or(SyntaxKind::EOF, |it| it.kind());
     let impl_item_offset = match token.kind() {
         // `impl .. { const $0 }`
         // ERROR      0
@@ -102,14 +103,14 @@ fn completion_match(ctx: &CompletionContext) -> Option<(ImplCompletionKind, Synt
         // FN/TYPE_ALIAS/CONST  1
         //  NAME                0
         //    IDENT             <- *
-        SyntaxKind::IDENT if token.parent().kind() == SyntaxKind::NAME => 1,
+        SyntaxKind::IDENT if parent_kind == SyntaxKind::NAME => 1,
         // `impl .. { foo$0 }`
         // MACRO_CALL       3
         //  PATH            2
         //    PATH_SEGMENT  1
         //      NAME_REF    0
         //        IDENT     <- *
-        SyntaxKind::IDENT if token.parent().kind() == SyntaxKind::NAME_REF => 3,
+        SyntaxKind::IDENT if parent_kind == SyntaxKind::NAME_REF => 3,
         _ => return None,
     };
 
diff --git a/crates/ide_completion/src/completions/unqualified_path.rs b/crates/ide_completion/src/completions/unqualified_path.rs
index 5ef80f6a7..1b8b063e7 100644
--- a/crates/ide_completion/src/completions/unqualified_path.rs
+++ b/crates/ide_completion/src/completions/unqualified_path.rs
@@ -135,7 +135,7 @@ fn quux(x: i32) {
             expect![[r#"
                 lc y       i32
                 lc x       i32
-                fn quux(…) -> ()
+                fn quux(…) fn(i32)
             "#]],
         );
     }
@@ -157,7 +157,7 @@ fn quux() {
             expect![[r#"
                 lc b      i32
                 lc a
-                fn quux() -> ()
+                fn quux() fn()
             "#]],
         );
     }
@@ -172,7 +172,7 @@ fn quux() {
 "#,
             expect![[r#"
                 lc x
-                fn quux() -> ()
+                fn quux() fn()
             "#]],
         );
     }
@@ -203,14 +203,14 @@ fn main() {
             r#"fn quux<T>() { $0 }"#,
             expect![[r#"
                 tp T
-                fn quux() -> ()
+                fn quux() fn()
             "#]],
         );
         check(
             r#"fn quux<const C: usize>() { $0 }"#,
             expect![[r#"
                 cp C
-                fn quux() -> ()
+                fn quux() fn()
             "#]],
         );
     }
@@ -221,7 +221,7 @@ fn main() {
         check(
             r#"fn quux<'a>() { $0 }"#,
             expect![[r#"
-                fn quux() -> ()
+                fn quux() fn()
             "#]],
         );
     }
@@ -259,7 +259,7 @@ fn quux() { $0 }
 "#,
             expect![[r#"
                 st S
-                fn quux() -> ()
+                fn quux() fn()
                 en E
             "#]],
         );
@@ -312,7 +312,7 @@ mod m {
 }
 "#,
             expect![[r#"
-                fn quux() -> ()
+                fn quux() fn()
                 st Bar
             "#]],
         );
@@ -327,7 +327,7 @@ fn x() -> $0
 "#,
             expect![[r#"
                 st Foo
-                fn x() -> ()
+                fn x() fn()
             "#]],
         );
     }
@@ -348,7 +348,7 @@ fn foo() {
             expect![[r#"
                 lc bar   i32
                 lc bar   i32
-                fn foo() -> ()
+                fn foo() fn()
             "#]],
         );
     }
@@ -378,7 +378,7 @@ use prelude::*;
 mod prelude { struct Option; }
 "#,
             expect![[r#"
-                fn foo()  -> ()
+                fn foo()  fn()
                 md std
                 st Option
             "#]],
@@ -408,7 +408,7 @@ mod macros {
 }
 "#,
             expect![[r##"
-                fn f()        -> ()
+                fn f()        fn()
                 ma concat!(…) #[macro_export] macro_rules! concat
                 md std
             "##]],
@@ -435,7 +435,7 @@ use prelude::*;
 mod prelude { struct String; }
 "#,
             expect![[r#"
-                fn foo()  -> ()
+                fn foo()  fn()
                 md std
                 md core
                 st String
@@ -466,7 +466,7 @@ fn main() { let v = $0 }
             expect![[r##"
                 md m1
                 ma baz!(…) #[macro_export] macro_rules! baz
-                fn main()  -> ()
+                fn main()  fn()
                 md m2
                 ma bar!(…) macro_rules! bar
                 ma foo!(…) macro_rules! foo
@@ -482,7 +482,7 @@ macro_rules! foo { () => {} }
 fn foo() { $0 }
 "#,
             expect![[r#"
-                fn foo()   -> ()
+                fn foo()   fn()
                 ma foo!(…) macro_rules! foo
             "#]],
         );
@@ -496,7 +496,7 @@ macro_rules! foo { () => {} }
 fn main() { let x: $0 }
 "#,
             expect![[r#"
-                fn main()  -> ()
+                fn main()  fn()
                 ma foo!(…) macro_rules! foo
             "#]],
         );
@@ -510,7 +510,7 @@ macro_rules! foo { () => {} }
 fn main() { $0 }
 "#,
             expect![[r#"
-                fn main()  -> ()
+                fn main()  fn()
                 ma foo!(…) macro_rules! foo
             "#]],
         );
@@ -526,8 +526,8 @@ fn main() {
 }
 "#,
             expect![[r#"
-                fn frobnicate() -> ()
-                fn main()       -> ()
+                fn frobnicate() fn()
+                fn main()       fn()
             "#]],
         );
     }
@@ -545,7 +545,7 @@ fn quux(x: i32) {
             expect![[r#"
                 lc y       i32
                 lc x       i32
-                fn quux(…) -> ()
+                fn quux(…) fn(i32)
                 ma m!(…)   macro_rules! m
             "#]],
         );
@@ -564,7 +564,7 @@ fn quux(x: i32) {
             expect![[r#"
                 lc y       i32
                 lc x       i32
-                fn quux(…) -> ()
+                fn quux(…) fn(i32)
                 ma m!(…)   macro_rules! m
             "#]],
         );
@@ -583,7 +583,7 @@ fn quux(x: i32) {
             expect![[r#"
                 lc y       i32
                 lc x       i32
-                fn quux(…) -> ()
+                fn quux(…) fn(i32)
                 ma m!(…)   macro_rules! m
             "#]],
         );
@@ -598,7 +598,7 @@ use spam::Quux;
 fn main() { $0 }
 "#,
             expect![[r#"
-                fn main() -> ()
+                fn main() fn()
                 ?? Quux
             "#]],
         );
@@ -616,7 +616,7 @@ fn main() { let foo: Foo = Q$0 }
                 ev Foo::Baz  ()
                 ev Foo::Quux ()
                 en Foo
-                fn main()    -> ()
+                fn main()    fn()
             "#]],
         )
     }
@@ -631,7 +631,7 @@ fn f() -> m::E { V$0 }
             expect![[r#"
                 ev m::E::V ()
                 md m
-                fn f()     -> E
+                fn f()     fn() -> E
             "#]],
         )
     }