From b59ffe20e43926797c3bad8e7034c2323749982d Mon Sep 17 00:00:00 2001
From: "Anna.Kozlova" <anna.kozlova@jetbrains.com>
Date: Tue, 18 Jul 2017 18:52:43 +0200
Subject: [PATCH] type arguments in bounds check: ensure capture conversion
 (IDEA-175899)

---
 .../src/com/intellij/psi/GenericsUtil.java    |  6 +++++-
 .../CaptureForBoundCheck.java                 | 20 +++++++++++++++++++
 .../daemon/GenericsHighlightingTest.java      |  1 +
 3 files changed, 26 insertions(+), 1 deletion(-)
 create mode 100644 java/java-tests/testData/codeInsight/daemonCodeAnalyzer/genericsHighlighting/CaptureForBoundCheck.java

diff --git a/java/java-psi-api/src/com/intellij/psi/GenericsUtil.java b/java/java-psi-api/src/com/intellij/psi/GenericsUtil.java
index 8b1c254dfe5e..9744fb85ba78 100644
--- a/java/java-psi-api/src/com/intellij/psi/GenericsUtil.java
+++ b/java/java-psi-api/src/com/intellij/psi/GenericsUtil.java
@@ -462,8 +462,12 @@ public class GenericsUtil {
   }
 
   public static boolean checkNotInBounds(PsiType type, PsiType bound, PsiReferenceParameterList referenceParameterList) {
+    //4.10.2
+    //Given a generic type declaration C<F1,...,Fn> (n > 0), the direct supertypes of the parameterized type C<R1,...,Rn> where at least one of the Ri is a wildcard
+    //type argument, are the direct supertypes of the parameterized type C<X1,...,Xn> which is the result of applying capture conversion to C<R1,...,Rn>.
+    PsiType capturedType = PsiUtil.captureToplevelWildcards(type, referenceParameterList);
     //allow unchecked conversions in method calls but not in type declaration
-    return checkNotInBounds(type, bound, PsiTreeUtil.getParentOfType(referenceParameterList, PsiCallExpression.class) != null);
+    return checkNotInBounds(capturedType, bound, PsiTreeUtil.getParentOfType(referenceParameterList, PsiCallExpression.class) != null);
   }
 
   public static boolean checkNotInBounds(PsiType type, PsiType bound, boolean uncheckedConversionByDefault) {
diff --git a/java/java-tests/testData/codeInsight/daemonCodeAnalyzer/genericsHighlighting/CaptureForBoundCheck.java b/java/java-tests/testData/codeInsight/daemonCodeAnalyzer/genericsHighlighting/CaptureForBoundCheck.java
new file mode 100644
index 000000000000..323840286822
--- /dev/null
+++ b/java/java-tests/testData/codeInsight/daemonCodeAnalyzer/genericsHighlighting/CaptureForBoundCheck.java
@@ -0,0 +1,20 @@
+
+class EnumBug {
+  static class Enum<E extends Enum<E>> {
+  }
+
+  static class Option<T> extends Enum<Option<T>> {
+  }
+
+  static class EnumSet<E extends Enum<E>> {
+    static <E extends Enum<E>> EnumSet<E> noneOf(Class<E> elementType) {
+      return null;
+    }
+  }
+
+  public static void main(String[] args) {
+    EnumSet<<error descr="Type parameter 'EnumBug.Option' is not within its bound; should extend 'EnumBug.Enum<EnumBug.Option<?>>'">Option<?></error>> enumSet = EnumSet.<<error descr="Type parameter 'EnumBug.Option' is not within its bound; should extend 'EnumBug.Enum<EnumBug.Option<?>>'">Option<?></error>>noneOf(Option.class);
+    EnumSet<<error descr="Type parameter 'EnumBug.Option' is not within its bound; should extend 'EnumBug.Enum<EnumBug.Option>'">Option</error>> enumSetRaw = EnumSet.<Option>noneOf(Option.class);
+  }
+
+}
\ No newline at end of file
diff --git a/java/java-tests/testSrc/com/intellij/java/codeInsight/daemon/GenericsHighlightingTest.java b/java/java-tests/testSrc/com/intellij/java/codeInsight/daemon/GenericsHighlightingTest.java
index c69bf2b82fdf..3ca0d76f1398 100644
--- a/java/java-tests/testSrc/com/intellij/java/codeInsight/daemon/GenericsHighlightingTest.java
+++ b/java/java-tests/testSrc/com/intellij/java/codeInsight/daemon/GenericsHighlightingTest.java
@@ -426,4 +426,5 @@ public class GenericsHighlightingTest extends LightDaemonAnalyzerTestCase {
   public void testEnclosingRefInTopLevelClassExtendingInnerWhichExtendsItsOuter() { doTest8Incompatibility(true); }
   public void testGenericThrowTypes() { doTest5(false); }
   public void testRecursiveParamBoundsWhenSuperSubstitution() { doTest6(false); }
+  public void testCaptureForBoundCheck() { doTest6(false); }
 }
\ No newline at end of file