Merge #5752

5752: display correctly 'impl Trait<T> + Trait<T>' #4814 r=flodiebold a=bnjjj

close #4814 

Co-authored-by: Benjamin Coenen <[email protected]>

2 files changed, 20 insertions, 0 deletions

diff --git a/crates/hir_ty/src/display.rs b/crates/hir_ty/src/display.rs
index 19770e609..64b68014d 100644
--- a/crates/hir_ty/src/display.rs
+++ b/crates/hir_ty/src/display.rs
@@ -511,6 +511,7 @@ fn write_bounds_like_dyn_trait(
             GenericPredicate::Implemented(trait_ref) => {
                 if angle_open {
                     write!(f, ">")?;
+                    angle_open = false;
                 }
                 if !first {
                     write!(f, " + ")?;
diff --git a/crates/ide/src/hover.rs b/crates/ide/src/hover.rs
index 331aa4db0..300c00edc 100644
--- a/crates/ide/src/hover.rs
+++ b/crates/ide/src/hover.rs
@@ -767,6 +767,25 @@ fn main() {
     }
 
     #[test]
+    fn hover_for_param_with_multiple_traits() {
+        check(
+            r#"trait Deref {
+                type Target: ?Sized;
+            }
+            trait DerefMut {
+                type Target: ?Sized;
+            }
+            fn f(_x<|>: impl Deref<Target=u8> + DerefMut<Target=u8>) {}"#,
+            expect![[r#"
+                *_x*
+                ```rust
+                impl Deref<Target = u8> + DerefMut<Target = u8>
+                ```
+            "#]],
+        )
+    }
+
+    #[test]
     fn test_hover_infer_associated_method_result() {
         check(
             r#"