Snapshot aea001abfc1b38fec3a821bcd5174cc77dc75787 from master branch of git://git.jetbrains.org/idea/community.git

Change-Id: Icdea2a2bd7ad43b4d05967b1f0479db3bda1c93c

1 files changed, 3 insertions, 2 deletions

diff --git a/java/java-psi-impl/src/com/intellij/psi/PsiDiamondTypeImpl.java b/java/java-psi-impl/src/com/intellij/psi/PsiDiamondTypeImpl.java
index b14a37dfb4f3..88440552b4ca 100644
--- a/java/java-psi-impl/src/com/intellij/psi/PsiDiamondTypeImpl.java
+++ b/java/java-psi-impl/src/com/intellij/psi/PsiDiamondTypeImpl.java
@@ -287,7 +287,7 @@ public class PsiDiamondTypeImpl extends PsiDiamondType {
   }
 
   public static boolean haveConstructorsGenericsParameters(@NotNull final PsiClass psiClass) {
-    for (PsiMethod method : psiClass.getConstructors()) {
+    for (final PsiMethod method : psiClass.getConstructors()) {
       for (PsiParameter parameter : method.getParameterList().getParameters()) {
         final PsiType type = parameter.getType();
         final Boolean accept = type.accept(new PsiTypeVisitor<Boolean>() {
@@ -304,7 +304,8 @@ public class PsiDiamondTypeImpl extends PsiDiamondType {
                 if (typaParamFound != null && typaParamFound) return true;
               }
             }
-            return PsiUtil.resolveClassInType(classType) instanceof PsiTypeParameter;
+            final PsiClass aClass = PsiUtil.resolveClassInType(classType);
+            return aClass instanceof PsiTypeParameter && ((PsiTypeParameter)aClass).getOwner() == method;
           }
 
           @Override