old inference (IDEA-157398)

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

@@ -455,6 +455,10 @@ public class PsiOldInferenceHelper implements PsiInferenceHelper {
       if (arg == null) return null;
     }
 
+    if (arg instanceof PsiCapturedWildcardType) {
+      arg = ((PsiCapturedWildcardType)arg).getUpperBound();
+    }
+
     JavaResolveResult paramResult = ((PsiClassType)param).resolveGenerics();
     PsiClass paramClass = (PsiClass)paramResult.getElement();
     if (typeParam == paramClass) {
@@ -473,10 +477,6 @@ public class PsiOldInferenceHelper implements PsiInferenceHelper {
     }
     if (paramClass == null) return null;
 
-    if (arg instanceof PsiCapturedWildcardType) {
-      arg = ((PsiCapturedWildcardType)arg).getUpperBound();
-    }
-
     if (!(arg instanceof PsiClassType)) return null;
 
     JavaResolveResult argResult = ((PsiClassType)arg).resolveGenerics();

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

@@ -0,0 +1,12 @@
+import java.util.Collection;
+import java.util.Collections;
+import java.util.Map;
+
+class Test {
+  private void foo(Map<String, ? extends Collection<?>> map, String severity) {
+    firstNonNull(map.get(severity), Collections.emptyList());
+  }
+  private static <T> T firstNonNull(T first, T second) {
+    return first;
+  }
+}

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

@@ -609,4 +609,8 @@ public class GenericsHighlightingTest extends LightDaemonAnalyzerTestCase {
   public void testIntersectTypeParameterBounds() throws Exception {
     doTest(LanguageLevel.JDK_1_7, JavaSdkVersion.JDK_1_7, false);
   }
+
+  public void testTopLevelCaptureConversion() throws Exception {
+    doTest(LanguageLevel.JDK_1_7, JavaSdkVersion.JDK_1_7, false);
+  }
 }