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 PsiFileImpl myLoadingAst volatile (IDEA-CR-33043)

Browse Source
This commit is contained in:
peter
2018-06-04 12:41:56 +02:00
parent 385470f54d
commit bcb6a0ede7
1 changed files with 4 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files
platform/core-impl/src/com/intellij/psi/impl/source/PsiFileImpl.java
+4 -6
View File
@@ -69,7 +69,7 @@ public abstract class PsiFileImpl extends ElementBase implements PsiFileEx, PsiF
protected final PsiManagerEx myManager;
public static final Key<Boolean> BUILDING_STUB = new Key<>("Don't use stubs mark!");
private final PsiLock myPsiLock;
private final ThreadLocal<Boolean> myLoadingAst = new ThreadLocal<>();
private volatile boolean myLoadingAst;
protected PsiFileImpl(@NotNull IElementType elementType, IElementType contentElementType, @NotNull FileViewProvider provider) {
this(provider);
@@ -209,12 +209,12 @@ public abstract class PsiFileImpl extends ElementBase implements PsiFileEx, PsiF
treeElement = createFileElement(viewProvider.getContents());
treeElement.setPsi(this);
myLoadingAst.set(true);
myLoadingAst = true;
try {
updateTrees(myTrees.withAst(createTreeElementPointer(treeElement)));
}
finally {
myLoadingAst.remove();
myLoadingAst = false;
}
if (LOG.isDebugEnabled() && viewProvider.isPhysical()) {
@@ -593,9 +593,7 @@ public abstract class PsiFileImpl extends ElementBase implements PsiFileEx, PsiF
final StubTree derefd = derefStub();
if (derefd != null) return derefd;
if (Boolean.TRUE.equals(getUserData(BUILDING_STUB)) ||
Boolean.TRUE.equals(myLoadingAst.get()) ||
getElementTypeForStubBuilder() == null) {
if (Boolean.TRUE.equals(getUserData(BUILDING_STUB)) || myLoadingAst || getElementTypeForStubBuilder() == null) {
return null;
}