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

make getContainingFile robust to concurrent stub-ast switch

Browse Source
This commit is contained in:
peter
2012-11-08 20:07:34 +01:00
parent 0456d4d2f2
commit d41e8927d8
1 changed files with 8 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files
platform/core-impl/src/com/intellij/extapi/psi/StubBasedPsiElementBase.java
+8 -3
View File
@@ -30,6 +30,7 @@ import com.intellij.openapi.util.text.StringUtil;
import com.intellij.psi.PsiElement;
import com.intellij.psi.PsiFile;
import com.intellij.psi.PsiInvalidElementAccessException;
import com.intellij.psi.PsiLock;
import com.intellij.psi.impl.DebugUtil;
import com.intellij.psi.impl.PsiManagerEx;
import com.intellij.psi.impl.source.PsiFileImpl;
@@ -137,10 +138,14 @@ public class StubBasedPsiElementBase<T extends StubElement> extends ASTDelegateP
stub = stub.getParentStub();
}
PsiFile psi = (PsiFile)stub.getPsi();
if (psi == null) {
throw new PsiInvalidElementAccessException(this, "no psi for file stub " + stub, null);
if (psi != null) {
return psi;
}
synchronized (PsiLock.LOCK) {
if (myStub != null) {
throw new PsiInvalidElementAccessException(this, "no psi for file stub " + stub, null);
}
}
return psi;
}
PsiFile file = super.getContainingFile();