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

EA-102311 - PIEAE: PsiUtilCore.ensureValid - fix for exception

Browse Source
This commit is contained in:
Egor.Ushakov
2017-06-16 17:40:27 +03:00
parent b8d0952333
commit 080b7c4f76
1 changed files with 4 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files
java/debugger/openapi/src/com/intellij/debugger/SourcePosition.java
+4 -3
View File
@@ -55,7 +55,7 @@ public abstract class SourcePosition implements Navigatable{
private abstract static class SourcePositionCache extends SourcePosition {
@NotNull private final PsiFile myFile;
@NotNull private final SmartPsiElementPointer<PsiFile> myFilePointer;
@Nullable private final SmartPsiElementPointer<PsiFile> myFilePointer;
private long myModificationStamp = -1L;
private WeakReference<PsiElement> myPsiElementRef;
@@ -64,14 +64,15 @@ public abstract class SourcePosition implements Navigatable{
public SourcePositionCache(@NotNull PsiFile file) {
myFile = file;
myFilePointer = SmartPointerManager.getInstance(file.getProject()).createSmartPsiElementPointer(file);
myFilePointer = ReadAction.compute(
() -> file.isValid() ? SmartPointerManager.getInstance(file.getProject()).createSmartPsiElementPointer(file) : null);
updateData();
}
@Override
@NotNull
public PsiFile getFile() {
PsiFile file = myFilePointer.getElement();
PsiFile file = myFilePointer != null ? myFilePointer.getElement() : null;
return file != null ? file : myFile; // in case of full invalidation, rollback to the original psiFile
}