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

new inference: postpone resolution of independent vars (IDEA-125674)

Browse Source
This commit is contained in:
Anna Kozlova
2014-08-08 19:49:14 +04:00
parent a69062dc3b
commit ead13681e1
3 changed files with 12 additions and 18 deletions
Download Patch File Download Diff File Expand all files Collapse all files
java/java-psi-impl/src/com/intellij/psi/impl/source/resolve/graphInference/InferenceSession.java
+1 -18
View File
@@ -830,24 +830,7 @@ public class InferenceSession {
}
private boolean proceedWithAdditionalConstraints(Set<ConstraintFormula> additionalConstraints) {
final Set<InferenceVariable> mentionedVars = new HashSet<InferenceVariable>();
for (ConstraintFormula constraint : additionalConstraints) {
if (constraint instanceof InputOutputConstraintFormula) {
final Set<InferenceVariable> inputVariables = ((InputOutputConstraintFormula)constraint).getInputVariables(this);
if (inputVariables != null) {
mentionedVars.addAll(inputVariables);
}
final Set<InferenceVariable> outputVariables = ((InputOutputConstraintFormula)constraint).getOutputVariables(inputVariables, this);
if (outputVariables != null) {
mentionedVars.addAll(outputVariables);
}
}
}
final Set<InferenceVariable> readyVariables = new LinkedHashSet<InferenceVariable>(myInferenceVariables.values());
readyVariables.removeAll(mentionedVars);
final PsiSubstitutor siteSubstitutor = resolveBounds(readyVariables, mySiteSubstitutor);
final PsiSubstitutor siteSubstitutor = mySiteSubstitutor;
while (!additionalConstraints.isEmpty()) {
//extract subset of constraints
java/java-tests/testData/codeInsight/daemonCodeAnalyzer/lambda/newLambda/IDEA125674.java
+8
View File
@@ -0,0 +1,8 @@
import java.util.stream.Collectors;
import java.util.stream.Stream;
class Test {
void foo(final Stream<String> stream){
stream.collect(Collectors.toMap(s -> s, s -> s, (a, b) -> a.length() > b. length() ? a : b));
}
}
java/java-tests/testSrc/com/intellij/codeInsight/daemon/lambda/NewLambdaHighlightingTest.java
+3
View File
@@ -62,7 +62,10 @@ public class NewLambdaHighlightingTest extends LightDaemonAnalyzerTestCase {
public void testIDEA120992() { doTest(); }
public void testTargetTypeConflictResolverShouldNotTryToEvaluateCurrentArgumentType() { doTest(); }
public void testIDEA119535() { doTest(); }
@Bombed(day = 20, month = Calendar.AUGUST)
public void testIDEA119003() { doTest(); }
public void testIDEA125674() { doTest(); }
public void testIDEA117124() { doTest(); }
public void testWildcardParameterization() { doTest(); }
public void testDiamondInLambdaReturn() { doTest(); }