From 729cd8530bc256a64aa09435d3fc7b632d79cff3 Mon Sep 17 00:00:00 2001
From: iDawer <ilnur.iskhakov.oss@outlook.com>
Date: Tue, 26 Apr 2022 11:50:28 +0500
Subject: [PATCH] `signature_help`: use corresponding param list for methods

---
 crates/ide/src/signature_help.rs | 24 +++++++++++++++++++++++-
 1 file changed, 23 insertions(+), 1 deletion(-)

diff --git a/crates/ide/src/signature_help.rs b/crates/ide/src/signature_help.rs
index 4eca69033a..50187c933d 100644
--- a/crates/ide/src/signature_help.rs
+++ b/crates/ide/src/signature_help.rs
@@ -115,7 +115,10 @@ fn signature_help_for_call(
         hir::CallableKind::Function(func) => {
             res.doc = func.docs(db).map(|it| it.into());
             format_to!(res.signature, "fn {}", func.name(db));
-            fn_params = Some(func.assoc_fn_params(db));
+            fn_params = Some(match func.self_param(db) {
+                Some(_self) => func.params_without_self(db),
+                None => func.assoc_fn_params(db),
+            });
         }
         hir::CallableKind::TupleStruct(strukt) => {
             res.doc = strukt.docs(db).map(|it| it.into());
@@ -1036,6 +1039,25 @@ fn f() {
         );
     }
 
+    #[test]
+    fn test_generic_param_in_method_call() {
+        check(
+            r#"
+struct Foo;
+impl Foo {
+    fn test<V>(&mut self, val: V) {}
+}
+fn sup() {
+    Foo.test($0)
+}
+"#,
+            expect![[r#"
+                fn test(&mut self, val: V)
+                                   ^^^^^^
+            "#]],
+        );
+    }
+
     #[test]
     fn test_generic_kinds() {
         check(