make variable type A<? super B&C> denotable (IDEA-57518; IDEA-57273)

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

@@ -320,6 +320,11 @@ public class GenericsUtil {
         final PsiType bound = wildcardType.getBound();
         PsiManager manager = wildcardType.getManager();
         if (bound != null) {
+
+          if (wildcardType.isSuper() && bound instanceof PsiIntersectionType) {
+            return PsiWildcardType.createUnbounded(manager);
+          }
+
           final PsiType acceptedBound = bound.accept(this);
           if (acceptedBound instanceof PsiWildcardType) {
             if (((PsiWildcardType)acceptedBound).isExtends() != wildcardType.isExtends()) return PsiWildcardType.createUnbounded(manager);

java/java-tests/testData/refactoring/introduceVariable/DenotableType1.after.java

@@ -0,0 +1,9 @@
+abstract class A<S> {
+  abstract <T> T foo(T x, T y);
+
+  {
+    A<? extends A<? super A<Object>>> a = null;
+    A<? extends A<? super A<String>>> b = null;
+      A<? extends A<?>> m = foo(a, b);
+  }
+}

java/java-tests/testData/refactoring/introduceVariable/DenotableType1.java

@@ -0,0 +1,9 @@
+abstract class A<S> {
+  abstract <T> T foo(T x, T y);
+
+  {
+    A<? extends A<? super A<Object>>> a = null;
+    A<? extends A<? super A<String>>> b = null;
+    <selection>foo(a, b)</selection>;
+  }
+}

java/java-tests/testData/refactoring/introduceVariable/DenotableType2.after.java

@@ -0,0 +1,11 @@
+interface I<T>{}
+interface A extends I<I<? super String>> {}
+interface B extends I<I<? super Integer>> {}
+abstract class X {
+
+  abstract <T> T foo(T x, T y);
+
+  void bar(A x, B y){
+      I<? extends I<?>> m = foo(x, y);
+  }
+}

java/java-tests/testData/refactoring/introduceVariable/DenotableType2.java

@@ -0,0 +1,11 @@
+interface I<T>{}
+interface A extends I<I<? super String>> {}
+interface B extends I<I<? super Integer>> {}
+abstract class X {
+
+  abstract <T> T foo(T x, T y);
+
+  void bar(A x, B y){
+    <selection>foo(x, y)</selection>;
+  }
+}

java/java-tests/testSrc/com/intellij/refactoring/IntroduceVariableTest.java

@@ -500,6 +500,14 @@ public class IntroduceVariableTest extends LightCodeInsightTestCase {
     doTest(new MockIntroduceVariableHandler("m", false, false, false, "Foo.I"));
   }
 
+  public void testDenotableType1() {
+    doTest(new MockIntroduceVariableHandler("m", false, false, false, "A<? extends A<?>>"));
+  }
+
+  public void testDenotableType2() {
+    doTest(new MockIntroduceVariableHandler("m", false, false, false, "I<? extends I<?>>"));
+  }
+
   public void testReturnNonExportedArray() {
     doTest(new MockIntroduceVariableHandler("i", false, false, false, "java.io.File[]") {
       @Override