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

inference: cleanup

Browse Source 
GitOrigin-RevId: ae8713b005dde291b1178157e884b0d304443bf9
This commit is contained in:
Anna Kozlova
2019-07-02 06:52:16 +03:00
committed by intellij-monorepo-bot
parent 330055310d
commit 715448dd8b
1 changed files with 6 additions and 14 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/InferenceIncorporationPhase.java
+6 -14
View File
@@ -352,15 +352,15 @@ public class InferenceIncorporationPhase {
* there exists a supertype (4.10) of S of the form G<S1, ..., Sn> and a supertype of T of the form G<T1, ..., Tn>,
* then for all i, 1 <= i <= n, if Si and Ti are types (not wildcards), the constraint (Si = Ti) is implied.
*/
private boolean upUp(List<? extends PsiType> upperBounds) {
return InferenceSession.findParameterizationOfTheSameGenericClass(upperBounds, pair -> {
private void upUp(List<? extends PsiType> upperBounds) {
InferenceSession.findParameterizationOfTheSameGenericClass(upperBounds, pair -> {
final PsiType sType = pair.first;
final PsiType tType = pair.second;
if (!(sType instanceof PsiWildcardType) && !(tType instanceof PsiWildcardType) && sType != null && tType != null) {
addConstraint(new TypeEqualityConstraint(sType, tType));
}
return false;
}) != null;
});
}
private void addConstraint(ConstraintFormula constraint) {
@@ -368,16 +368,8 @@ public class InferenceIncorporationPhase {
}
public void addBound(InferenceVariable variable, PsiType type, InferenceBound bound) {
Map<InferenceBound, Set<PsiType>> bounds = myCurrentBounds.get(variable);
if (bounds == null) {
bounds = new HashMap<>();
myCurrentBounds.put(variable, bounds);
}
Set<PsiType> types = bounds.get(bound);
if (types == null) {
types = new LinkedHashSet<>();
bounds.put(bound, types);
}
types.add(type);
myCurrentBounds.computeIfAbsent(variable, k1 -> new HashMap<>())
.computeIfAbsent(bound, k -> new LinkedHashSet<>())
.add(type);
}
}