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

smart pointers for different element types should have different hash codes

Browse Source
This commit is contained in:
peter
2016-11-14 09:36:12 +01:00
parent eec4442349
commit 9629018237
12 changed files with 284 additions and 271 deletions
Download Patch File Download Diff File Expand all files Collapse all files
java/java-psi-impl/src/com/intellij/psi/impl/compiled/ClsElementImpl.java
+5 -6
View File
@@ -27,8 +27,7 @@ import com.intellij.openapi.vfs.VirtualFile;
import com.intellij.psi.*;
import com.intellij.psi.codeStyle.JavaCodeStyleSettingsFacade;
import com.intellij.psi.impl.PsiElementBase;
import com.intellij.psi.impl.smartPointers.AnchorTypeInfo;
import com.intellij.psi.impl.smartPointers.SelfElementInfo;
import com.intellij.psi.impl.smartPointers.Identikit;
import com.intellij.psi.impl.source.SourceTreeToPsiMap;
import com.intellij.psi.impl.source.tree.TreeElement;
import com.intellij.psi.tree.IElementType;
@@ -47,7 +46,7 @@ public abstract class ClsElementImpl extends PsiElementBase implements PsiCompil
private static final Logger LOG = Logger.getInstance("#com.intellij.psi.impl.compiled.ClsElementImpl");
private volatile Pair<TextRange, AnchorTypeInfo> myMirror;
private volatile Pair<TextRange, Identikit.ByType> myMirror;
@Override
@NotNull
@@ -158,8 +157,8 @@ public abstract class ClsElementImpl extends PsiElementBase implements PsiCompil
@Override
public PsiElement getMirror() {
PsiFile mirrorFile = ((ClsFileImpl)getContainingFile()).getMirror().getContainingFile();
Pair<TextRange, AnchorTypeInfo> mirror = myMirror;
return mirror == null ? null : SelfElementInfo.findElementInside(mirrorFile, mirror.first, mirror.second);
Pair<TextRange, Identikit.ByType> mirror = myMirror;
return mirror == null ? null : mirror.second.findPsiElement(mirrorFile, mirror.first.getStartOffset(), mirror.first.getEndOffset());
}
@Override
@@ -268,7 +267,7 @@ public abstract class ClsElementImpl extends PsiElementBase implements PsiCompil
PsiElement psi = element.getPsi();
psi.putUserData(COMPILED_ELEMENT, this);
myMirror = Pair.create(element.getTextRange(), AnchorTypeInfo.obtainInfo(psi, JavaLanguage.INSTANCE));
myMirror = Pair.create(element.getTextRange(), Identikit.fromPsi(psi, JavaLanguage.INSTANCE));
}
protected static <T extends PsiElement> void setMirror(@Nullable T stub, @Nullable T mirror) throws InvalidMirrorException {
java/java-tests/testSrc/com/intellij/psi/impl/smartPointers/SmartPsiElementPointersTest.java
+5
View File
@@ -926,4 +926,9 @@ public class SmartPsiElementPointersTest extends CodeInsightTestCase {
}).cpuBound().assertTiming();
}
public void testDifferentHashCodesForDifferentElementsInOneFile() throws Exception {
PsiClass clazz = ((PsiJavaFile)createFile("a.java", "class Foo { void foo(); }")).getClasses()[0];
assertFalse(createPointer(clazz).hashCode() == createPointer(clazz.getMethods()[0]).hashCode());
}
}