type inference: super bounds promotion corrected (IDEA-55718)

java/java-impl/src/com/intellij/psi/impl/source/resolve/PsiResolveHelperImpl.java

@@ -185,6 +185,9 @@ public class PsiResolveHelperImpl implements PsiResolveHelper {
     if (wildcardToCapture != null) {
       if (lowerBound != PsiType.NULL) {
         if (!wildcardToCapture.isAssignableFrom(lowerBound)) return getFailedInferenceConstraint(typeParameter);
+        if (wildcardToCapture.isSuper()) {
+          return new Pair<PsiType, ConstraintType>(wildcardToCapture, ConstraintType.SUPERTYPE);
+        }
         lowerBound = GenericsUtil.getLeastUpperBound(lowerBound, wildcardToCapture, typeParameter.getManager());
       }
       else {

java/java-tests/testData/codeInsight/daemonCodeAnalyzer/genericsHighlighting/InferenceWithSuperBounds.java

@@ -0,0 +1,16 @@
+public class ExampleProblem {
+    <T> void asserting(T t, Simple<T> l){
+    }
+
+    <K> Simple<? super K> comp(K k){
+        return null;
+    }
+
+    public void main(String[] args) {
+        asserting(0, comp(0));
+    }
+}
+
+class Simple<SST>{
+
+}

java/java-tests/testSrc/com/intellij/codeInsight/daemon/GenericsHighlightingTest.java

@@ -49,6 +49,7 @@ public class GenericsHighlightingTest extends LightDaemonAnalyzerTestCase {
   public void testExplicitMethodParameters() throws Exception { doTest(false); }
   public void testExplicitMethodParameters1() throws Exception { doTest(false); }
   public void testInferenceWithBounds() throws Exception {doTest(false);}
+  public void testInferenceWithSuperBounds() throws Exception {doTest(false);}
   public void testVariance() throws Exception {doTest(false);}
   public void testForeachTypes() throws Exception {doTest(false);}
   public void testRawOverridingMethods() throws Exception {doTest(false);}