MDS/openide
1
0
Fork 0
mirror of https://gitflic.ru/project/openide/openide.git synced 2026-04-19 13:02:30 +07:00
Code Issues Packages Projects Releases Wiki Activity

static imports: don't compare with expected type when it depends on unresolved reference (IDEA-163072)

Browse Source
This commit is contained in:
Anna.Kozlova
2017-03-31 18:00:13 +02:00
parent c3a6faa9df
commit 51d4e9936a
6 changed files with 43 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
java/java-impl/src/com/intellij/codeInsight/ExpectedTypesProvider.java
View File

@@ -988,7 +988,7 @@ public class ExpectedTypesProvider {
final MethodCandidateInfo info = (MethodCandidateInfo)candidateInfo;
substitutor = MethodCandidateInfo.ourOverloadGuard.doPreventingRecursion(argumentList, false,
() -> info.inferSubstitutorFromArgs(policy, args));
if (!info.isStaticsScopeCorrect() && !method.hasModifierProperty(PsiModifier.STATIC)) continue;
if (!info.isStaticsScopeCorrect() && !method.hasModifierProperty(PsiModifier.STATIC) || info.getInferenceErrorMessage() != null) continue;
}
else {
substitutor = MethodCandidateInfo.ourOverloadGuard.doPreventingRecursion(argumentList, false, candidateInfo::getSubstitutor);

6
java/java-psi-impl/src/com/intellij/psi/impl/source/resolve/graphInference/constraints/ExpressionCompatibilityConstraint.java
View File

@@ -184,8 +184,12 @@ public class ExpressionCompatibilityConstraint extends InputOutputConstraintForm
session.registerIncompatibleErrorMessage(message);
}
}
return null;
}
else {
session.registerIncompatibleErrorMessage("Failed to resolve argument");
return null;
}
return null;
}
return session;
}

4
java/java-tests/testData/codeInsight/daemonCodeAnalyzer/lambda/graphInference/ChainedInference.java
View File

@@ -3,8 +3,8 @@ import java.util.*;
class Main {
void foo(List<Integer> list) {
bar(list, i -> i.intValue(), i -> i.<error descr="Cannot resolve method 'unknown()'">unknown</error>());
bar1(list, i -> i.intValue(), i -> i.<error descr="Cannot resolve method 'unknown()'">unknown</error>());
bar(list, <error descr="Failed to resolve argument">i -> i.intValue()</error>, i -> i.<error descr="Cannot resolve method 'unknown()'">unknown</error>());
bar1(list, <error descr="Failed to resolve argument">i -> i.intValue()</error>, i -> i.<error descr="Cannot resolve method 'unknown()'">unknown</error>());
}
<U, S_IN, S_OUT, R> R bar(List<S_IN> list,

2
java/java-tests/testData/codeInsight/daemonCodeAnalyzer/lambda/graphInference/UncheckedConversionDuringProperTypeExpressionConstraintResolution.java
View File

@@ -48,7 +48,7 @@ class Test2 {
{
Class c = D.class;
D<String> d = new D<>(s -> s.<error descr="Cannot resolve method 'isEmpty()'">isEmpty</error>(), c);
D<String> d = new D<error descr="Cannot infer arguments"><></error>(s -> s.<error descr="Cannot resolve method 'isEmpty()'">isEmpty</error>(), c);
D<String> d1 = D.create(s -> s.<error descr="Cannot resolve method 'isEmpty()'">isEmpty</error>(), c);
}
}

18
java/java-tests/testData/codeInsight/daemonCodeAnalyzer/quickFix/staticImportMethod8/afterOneCorrectUsage.java Normal file
View File

@@ -0,0 +1,18 @@
// "Import static method 'java.util.stream.Collectors.toList'" "true"
import java.util.stream.Stream;
import static java.util.stream.Collectors.toList;
public class X {
{
System.out.println(Stream.of(123, 456)
.map(i -> i + 1)
.collect(toList()));
}
}
class Y {
private static void toList() {}
}

16
java/java-tests/testData/codeInsight/daemonCodeAnalyzer/quickFix/staticImportMethod8/beforeOneCorrectUsage.java Normal file
View File

@@ -0,0 +1,16 @@
// "Import static method 'java.util.stream.Collectors.toList'" "true"
import java.util.stream.Stream;
public class X {
{
System.out.println(Stream.of(123, 456)
.map(i -> i + 1)
.collect(toLi<caret>st()));
}
}
class Y {
private static void toList() {}
}