fix: generic with multiple args Result<T, E>

Author: mustakimali

crates/ide-completion/src/render.rs

@@ -2087,12 +2087,14 @@ fn test() {
 struct AStruct<T: Default>(T);
 struct AStructBuilder;
 struct Res<T>(T);
+struct Res2<T, E>{t: T, e: E};
 
 impl<T: Default> AStruct<T> {
     fn fn_no_ret(&self) {}
     fn fn_ctr_with_args(input: T) -> AStruct<T> { AStruct(input) }
     fn fn_direct_ctr() -> Self { AStruct(<_>::default()) }
     fn fn_ctr() -> Res<Self> { Res(Self::fn_direct_ctr()) }
+    fn fn_ctr2() -> Res2<Self, u32> { Res2 { t: <_>::default(), e: 0 } }
     fn fn_other() -> Res<u32> { Res(0) }
     fn fn_builder() -> AStructBuilder { AStructBuilder }
 }
@@ -2106,6 +2108,7 @@ fn test() {
                 fn fn_ctr_with_args(…) [type_could_unify]
                 fn fn_builder() [type_could_unify]
                 fn fn_ctr() [type_could_unify]
+                fn fn_ctr2() [type_could_unify]
                 fn fn_other() [type_could_unify]
                 me fn_no_ret(…) [type_could_unify]
             "#]],
@@ -2117,12 +2120,14 @@ fn test() {
 struct AStruct<T: Default>(T);
 struct AStructBuilder;
 struct Res<T>(T);
+struct Res2<T, E>{t: T, e: E};
 
 impl<T: Default> AStruct<T> {
     fn fn_no_ret(&self) {}
     fn fn_ctr_with_args(input: T) -> AStruct<T> { AStruct(input) }
     fn fn_direct_ctr() -> Self { AStruct(<_>::default()) }
     fn fn_ctr() -> Res<Self> { Res(Self::fn_direct_ctr()) }
+    fn fn_ctr2() -> Res2<Self, u32> { Res2 { t: <_>::default(), e: 0 } }
     fn fn_other() -> Res<u32> { Res(0) }
     fn fn_builder() -> AStructBuilder { AStructBuilder }
 }
@@ -2136,6 +2141,7 @@ fn test() {
                 fn fn_ctr_with_args(…) []
                 fn fn_builder() []
                 fn fn_ctr() []
+                fn fn_ctr2() []
                 fn fn_other() []
                 me fn_no_ret(…) []
             "#]],

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

@@ -188,7 +188,7 @@ fn compute_associated_fn(
 
             // the second checks are needed when Self has generic args
             let ret_self_only = ret_ty == self_type || ret_ty.starts_with(&format!("{self_type}<"));
-            let ret_self_wrapped = ret_ty.ends_with(&format!("<{self_type}>"))
+            let ret_self_wrapped = ret_ty.contains(&format!("<{self_type}"))
                 || ret_ty.contains(&format!("<{self_type}<"));
 
             (ret_self_only || ret_self_wrapped, ret_self_wrapped)