IDEA-70214 (forward lookup for type parameters)

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

@@ -1,5 +1,5 @@
 /*
- * Copyright 2000-2009 JetBrains s.r.o.
+ * Copyright 2000-2011 JetBrains s.r.o.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -263,7 +263,7 @@ public class PsiResolveHelperImpl implements PsiResolveHelper {
                                            @NotNull PsiElement parent,
                                            ParameterTypeInferencePolicy policy) {
     PsiType[] substitutions = new PsiType[typeParameters.length];
-    //noinspection unchecked
+    @SuppressWarnings("unchecked")
     Pair<PsiType, ConstraintType>[] constraints = new Pair[typeParameters.length];
     for (int i = 0; i < typeParameters.length; i++) {
       final Pair<PsiType, ConstraintType> constraint =
@@ -318,21 +318,31 @@ public class PsiResolveHelperImpl implements PsiResolveHelper {
     for (int i = 0; i < typeParameters.length; i++) {
       PsiTypeParameter typeParameter = typeParameters[i];
       PsiType substitution = substitutions[i];
+      if (substitution != PsiType.NULL) {
+        partialSubstitutor = partialSubstitutor.put(typeParameter, substitution);
+      }
+    }
+
+    for (int i = 0; i < typeParameters.length; i++) {
+      PsiTypeParameter typeParameter = typeParameters[i];
+      PsiType substitution = substitutions[i];
+      if (substitution != null) continue;
+
       Pair<PsiType, ConstraintType> constraint = constraints[i];
-      if (substitution == null) {
-        if (constraint == null) {
-          constraint = inferMethodTypeParameterFromParent(typeParameter, partialSubstitutor, parent, policy);
-        } else if (constraint.getSecond() == ConstraintType.SUBTYPE) {
-          Pair<PsiType, ConstraintType> otherConstraint =
-            inferMethodTypeParameterFromParent(typeParameter, partialSubstitutor, parent, policy);
-          if (otherConstraint != null) {
-            if (otherConstraint.getSecond() == ConstraintType.EQUALS || otherConstraint.getSecond() == ConstraintType.SUPERTYPE) constraint = otherConstraint;
+      if (constraint == null) {
+        constraint = inferMethodTypeParameterFromParent(typeParameter, partialSubstitutor, parent, policy);
+      }
+      else if (constraint.getSecond() == ConstraintType.SUBTYPE) {
+        Pair<PsiType, ConstraintType> otherConstraint = inferMethodTypeParameterFromParent(typeParameter, partialSubstitutor, parent, policy);
+        if (otherConstraint != null) {
+          if (otherConstraint.getSecond() == ConstraintType.EQUALS || otherConstraint.getSecond() == ConstraintType.SUPERTYPE) {
+            constraint = otherConstraint;
           }
         }
+      }
 
-        if (constraint != null) {
-          substitution = constraint.getFirst();
-        }
+      if (constraint != null) {
+        substitution = constraint.getFirst();
       }
 
       if (substitution == null) {

java/java-tests/testData/codeInsight/daemonCodeAnalyzer/advHighlighting7/ExtendsBound.java

@@ -0,0 +1,32 @@
+/*
+ * Copyright 2000-2011 JetBrains s.r.o.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+class ExtendsBound {
+  static class Entity<T, P> { }
+  static class Wrapper<E extends Entity<T, ?>, T> { }
+
+  static <T, E extends Entity<T, ?>> Wrapper<E, T> create1(T t) {
+    return new Wrapper<E, T>();
+  }
+
+  static <E extends Entity<T, ?>, T> Wrapper<E, T> create2(T t) {
+    return new Wrapper<E, T>();
+  }
+
+  static void test(Object o) {
+    create1(o);
+    create2(o);
+  }
+}

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

@@ -59,6 +59,22 @@ class User {
         System.out.println(test.some().i2());
     }
 }
+/*
+ * Copyright 2000-2011 JetBrains s.r.o.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
 //end of IDEADEV4200
 
 //IDEADEV-4214
@@ -144,7 +160,7 @@ Boolean.class, Boolean.TYPE /*,String[].class */ /*,BigDecimal.class*/);</error>
 ///////////////////////
 class Axx {
   <T extends Runnable> T a() {
-    <error descr="Incompatible types. Found: 'T', required: 'java.lang.String'">String s = a();</error>
+    <error descr="Incompatible types. Found: 'java.lang.Runnable', required: 'java.lang.String'">String s = a();</error>
     s.hashCode();
     return null;
   }

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

@@ -294,4 +294,8 @@ public class LightAdvHighlightingJdk7Test extends LightDaemonAnalyzerTestCase {
   public void testSuperBound() throws Exception {
     doTest(false, false);
   }
+
+  public void testExtendsBound() throws Exception {
+    doTest(false, false);
+  }
 }