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

take read action in smart pointer comparison (EA-77398 - assert: PsiFileImpl.getStubTree)

Browse Source
This commit is contained in:
peter
2016-02-09 17:38:27 +01:00
parent 040255a82e
commit ff08d03138
1 changed files with 11 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files
platform/core-impl/src/com/intellij/psi/impl/smartPointers/SelfElementInfo.java
+11 -7
View File
@@ -227,15 +227,19 @@ public class SelfElementInfo extends SmartPointerElementInfo {
@Override
public boolean pointsToTheSameElementAs(@NotNull final SmartPointerElementInfo other) {
if (other instanceof SelfElementInfo) {
SelfElementInfo otherInfo = (SelfElementInfo)other;
final SelfElementInfo otherInfo = (SelfElementInfo)other;
if (!getVirtualFile().equals(other.getVirtualFile()) || myType != otherInfo.myType) return false;
Segment range1 = getPsiRange();
Segment range2 = otherInfo.getPsiRange();
return range1 != null && range2 != null
&& range1.getStartOffset() == range2.getStartOffset()
&& range1.getEndOffset() == range2.getEndOffset()
;
return ApplicationManager.getApplication().runReadAction(new Computable<Boolean>() {
@Override
public Boolean compute() {
Segment range1 = getPsiRange();
Segment range2 = otherInfo.getPsiRange();
return range1 != null && range2 != null
&& range1.getStartOffset() == range2.getStartOffset()
&& range1.getEndOffset() == range2.getEndOffset();
}
});
}
return areRestoredElementsEqual(other);
}