suspicious call should ignore captured wildcard types assignments (IDEADEV-39955)

inspections/tests/com/intellij/codeInspection/SuspiciousCollectionMethodCallsTest.java

@@ -21,6 +21,7 @@ public class SuspiciousCollectionMethodCallsTest extends InspectionTestCase {
   }
 
   public void testWildcardCapture() throws Exception { doTest(); }
+  public void testWildcard() throws Exception { doTest(); }
   public void testIgnoreConvertible() throws Exception {
     myTool.REPORT_CONVERTIBLE_METHOD_CALLS = false;
     doTest();

java/java-impl/src/com/intellij/codeInspection/miscGenerics/SuspiciousCollectionsMethodCallsInspection.java

@@ -143,6 +143,9 @@ public class SuspiciousCollectionsMethodCallsInspection extends BaseLocalInspect
           PsiType typeParamMapping = substitutor.substitute(typeParameter);
           if (typeParamMapping == null) return;
           String message = null;
+          if (typeParamMapping instanceof PsiCapturedWildcardType) {
+            typeParamMapping = ((PsiCapturedWildcardType)typeParamMapping).getWildcard();
+          }
           if (!typeParamMapping.isAssignableFrom(argType)) {
             if (typeParamMapping.isConvertibleFrom(argType)) {
               if (REPORT_CONVERTIBLE_METHOD_CALLS) {

testData/inspection/suspiciousCalls/IgnoreConvertible/expected.xml

@@ -1,4 +1,9 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <problems>
+  <problem>
+    <file>Test.java</file>
+    <line>13</line>
+    <description>'List&lt;? extends Number&gt;' may not contain objects of type 'String'</description>
+  </problem>
 </problems>
 

testData/inspection/suspiciousCalls/IgnoreConvertible/src/Test.java

@@ -8,4 +8,8 @@ class Clazz {
       return;
     }
   }
+
+  void foo(List<? extends Number> c) {
+    c.contains("");
+  }
 }

testData/inspection/suspiciousCalls/Wildcard/expected.xml

@@ -0,0 +1,9 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<problems>
+  <problem>
+    <file>Test.java</file>
+  <line>6</line>
+  <description>'List&lt;? extends Number&gt;' may not contain objects of type 'String'</description>
+  </problem>
+</problems>
+

testData/inspection/suspiciousCalls/Wildcard/src/Test.java

@@ -0,0 +1,8 @@
+import java.util.List;
+import java.util.ArrayList;
+
+class Clazz {
+    void foo(List<? extends Number> l) {
+      boolean b = l.contains("");
+    }
+}

testData/inspection/suspiciousCalls/WildcardCapture/expected.xml

@@ -1,9 +1,4 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <problems>
-<problem>
-  <file>Test.java</file>
-  <line>7</line>
-  <description>Suspicious call to 'List.indexOf'</description>
-</problem>
 </problems>