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

new inference: capture nested call case fixed (~Collections)

Browse Source
This commit is contained in:
Anna Kozlova
2014-03-21 12:45:29 +01:00
parent ccd70ec219
commit 9845ef2fd8
4 changed files with 20 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

7
java/java-psi-impl/src/com/intellij/psi/impl/PsiImplUtil.java
View File

@@ -494,13 +494,6 @@ public class PsiImplUtil {
return PsiUtil.captureToplevelWildcards(type, expression);
}
final PsiElement parent = toplevel.getParent();
if (parent instanceof PsiExpressionList &&
PsiUtil.isLanguageLevel8OrHigher(parent) &&
parent.getParent() instanceof PsiCallExpression) {
return PsiUtil.captureToplevelWildcards(type, expression);
}
final PsiType normalized = doNormalizeWildcardByPosition(type, expression, toplevel);
LOG.assertTrue(normalized.isValid(), type);
if (normalized instanceof PsiClassType && !PsiUtil.isAccessedForWriting(toplevel)) {

15
java/java-tests/testData/codeInsight/daemonCodeAnalyzer/genericsHighlighting8/CaptureInsideNestedCalls.java Normal file
View File

@@ -0,0 +1,15 @@
import java.util.Iterator;
class Test<K, V> {
private final Iterator<? extends Foo<? extends K, ? extends V>> i = null;
public Foo<K, V> next() {
return new Bar<>(i.next());
}
interface Foo<T, K> {}
private static class Bar<K, V> implements Foo<K, V> {
Bar(Foo<? extends K, ? extends V> e) {}
}
}

2
java/java-tests/testData/codeInsight/daemonCodeAnalyzer/genericsHighlighting8/Variance.java
View File

@@ -142,7 +142,7 @@ class S1 {
}
void bar(List<? extends S1> k) {
f<error descr="'f(java.util.List<capture<? extends S1>>, capture<? extends S1>)' in 'S1' cannot be applied to '(java.util.List<capture<? extends S1>>, capture<? extends S1>)'">(k, k.get(0))</error>;
f<error descr="'f(java.util.List<capture<? extends S1>>, capture<? extends S1>)' in 'S1' cannot be applied to '(java.util.List<capture<? extends S1>>, S1)'">(k, k.get(0))</error>;
}
}

4
java/java-tests/testSrc/com/intellij/codeInsight/daemon/lambda/GenericsHighlighting8Test.java
View File

@@ -747,6 +747,10 @@ public class GenericsHighlighting8Test extends LightDaemonAnalyzerTestCase {
doTest();
}
public void testCaptureInsideNestedCalls() throws Exception {
doTest();
}
private void doTest() {
doTest(false);
}