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

inference: don't merge inference variables based on same type parameter

Browse Source 
EA-82843 - IAE: TObjectHash.throwObjectContractViolation
This commit is contained in:
Anna.Kozlova
2017-02-09 10:14:07 +01:00
parent 2fc0560169
commit fe4595889c
1 changed files with 1 additions and 7 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/InferenceVariable.java
+1 -7
View File
@@ -18,7 +18,6 @@ package com.intellij.psi.impl.source.resolve.graphInference;
import com.intellij.psi.*;
import com.intellij.psi.augment.TypeAnnotationModifier;
import com.intellij.psi.impl.light.LightTypeParameter;
import com.intellij.psi.util.PsiTreeUtil;
import com.intellij.psi.util.PsiUtil;
import com.intellij.psi.util.TypeConversionUtil;
import org.jetbrains.annotations.NotNull;
@@ -192,12 +191,7 @@ public class InferenceVariable extends LightTypeParameter {
@Override
public boolean isEquivalentTo(PsiElement another) {
if (this == another) return true;
if (getDelegate() == another && myContext != null && !PsiTreeUtil.isAncestor(((PsiTypeParameter)another).getOwner(), myContext, false)) {
return true;
}
return false;
return this == another;
}
@Override