intersection type presentable name with & (IDEA-115802)

java/java-psi-api/src/com/intellij/psi/PsiIntersectionType.java

@@ -15,8 +15,10 @@
  */
 package com.intellij.psi;
 
+import com.intellij.openapi.util.text.StringUtil;
 import com.intellij.psi.search.GlobalSearchScope;
 import com.intellij.psi.util.TypeConversionUtil;
+import com.intellij.util.Function;
 import gnu.trove.THashSet;
 import org.jetbrains.annotations.NotNull;
 
@@ -97,7 +99,12 @@ public class PsiIntersectionType extends PsiType {
 
   @Override
   public String getPresentableText() {
-    return myConjuncts[0].getPresentableText();
+    return StringUtil.join(myConjuncts, new Function<PsiType, String>() {
+      @Override
+      public String fun(PsiType psiType) {
+        return psiType.getPresentableText();
+      }
+    }, " & ");
   }
 
   @Override

java/java-tests/testData/codeInsight/daemonCodeAnalyzer/quickFix/changeTypeArgs/afterSuperType.java

@@ -1,6 +1,6 @@
 import java.io.Serializable;
 
-// "Change type arguments to <Serializable>" "true"
+// "Change type arguments to <Serializable & Comparable<? extends Serializable & Comparable<? extends Comparable<?>>>>" "true"
 class Generic<E> {
   Generic(E arg, E arg1) {
   }

java/java-tests/testData/codeInsight/daemonCodeAnalyzer/quickFix/changeTypeArgs/beforeSuperType.java

@@ -1,4 +1,4 @@
-// "Change type arguments to <Serializable>" "true"
+// "Change type arguments to <Serializable & Comparable<? extends Serializable & Comparable<? extends Comparable<?>>>>" "true"
 class Generic<E> {
   Generic(E arg, E arg1) {
   }