MDS/openide
1
0
Fork 0
mirror of https://gitflic.ru/project/openide/openide.git synced 2026-05-06 05:10:22 +07:00
Code Issues Packages Projects Releases Wiki Activity

accept intersection types in foreach stmts (IDEA-125800)

Browse Source
This commit is contained in:
Anna Kozlova
2014-06-02 20:13:55 +04:00
parent f1d927b6ea
commit b1b3b1db37
3 changed files with 19 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
java/java-analysis-impl/src/com/intellij/codeInsight/daemon/impl/analysis/JavaGenericsUtil.java
View File

@@ -286,6 +286,14 @@ public class JavaGenericsUtil {
PsiType itemType = superClassSubstitutor.substitute(typeParameter);
return itemType == null ? PsiType.getJavaLangObject(manager, aClass.getResolveScope()) : itemType;
}
if (type instanceof PsiIntersectionType) {
for (PsiType conjunct : ((PsiIntersectionType)type).getConjuncts()) {
final PsiType itemType = getCollectionItemType(conjunct, scope);
if (itemType != null) {
return itemType;
}
}
}
return null;
}

10
java/java-tests/testData/codeInsight/daemonCodeAnalyzer/genericsHighlighting/IDEA125800.java Normal file
View File

@@ -0,0 +1,10 @@
import java.util.List;
abstract class Test {
abstract <T extends List<String> & Runnable> T list();
public void test()
{
for (String s : list()) {}
}
}

1
java/java-tests/testSrc/com/intellij/codeInsight/daemon/GenericsHighlightingTest.java
View File

@@ -364,6 +364,7 @@ public class GenericsHighlightingTest extends LightDaemonAnalyzerTestCase {
public void testIDEA119757() { doTest(LanguageLevel.JDK_1_7, JavaSdkVersion.JDK_1_7, false); }
public void testIDEA67578() { doTest(LanguageLevel.JDK_1_7, JavaSdkVersion.JDK_1_7, false); }
public void testIDEA57388() { doTest(LanguageLevel.JDK_1_7, JavaSdkVersion.JDK_1_7, false); }
public void testIDEA125800() { doTest(LanguageLevel.JDK_1_7, JavaSdkVersion.JDK_1_7, false); }
//jdk should propagate LL 1.4 but actually it provides LL 1.7?!
public void testCastObjectToIntJdk14() { doTest(LanguageLevel.JDK_1_7, JavaSdkVersion.JDK_1_4, false); }