diff --git a/java/java-tests/testData/codeInsight/daemonCodeAnalyzer/genericsHighlighting/IDEA60836.java b/java/java-tests/testData/codeInsight/daemonCodeAnalyzer/genericsHighlighting/IDEA60836.java new file mode 100644 index 000000000000..1902e1b5b277 --- /dev/null +++ b/java/java-tests/testData/codeInsight/daemonCodeAnalyzer/genericsHighlighting/IDEA60836.java @@ -0,0 +1,29 @@ +import java.util.*; +public class IdeaGenericsTest { + interface Animal> { + List getFriends(); + } + + class Dog implements Animal { + public List getFriends() { + return null; + } + } + + class Cat implements Animal { + public List getFriends() { + return null; + } + } + + void mixAnimals() { + ArrayList dogs = null; + ArrayList cats = null; + + makeFriends(cats, dogs); + } + + private, V extends ArrayList> void makeFriends(ArrayList someAnimals, V otherAnimals) { + someAnimals.add(otherAnimals.get(0)); + } +} \ No newline at end of file diff --git a/java/java-tests/testSrc/com/intellij/codeInsight/daemon/GenericsHighlightingTest.java b/java/java-tests/testSrc/com/intellij/codeInsight/daemon/GenericsHighlightingTest.java index 78079281c9fe..04a688be61b6 100644 --- a/java/java-tests/testSrc/com/intellij/codeInsight/daemon/GenericsHighlightingTest.java +++ b/java/java-tests/testSrc/com/intellij/codeInsight/daemon/GenericsHighlightingTest.java @@ -326,6 +326,7 @@ public class GenericsHighlightingTest extends LightDaemonAnalyzerTestCase { public void testIDEA114894() { doTest5(false); } public void testIDEA60818() { doTest5(false); } public void testIDEA63331() { doTest5(false); } + public void testIDEA60836() { doTest5(false); } public void testJavaUtilCollections_NoVerify() throws Exception { PsiClass collectionsClass = getJavaFacade().findClass("java.util.Collections", GlobalSearchScope.moduleWithLibrariesScope(getModule()));