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

restore special handling for PSI errors after stub-ast mismatches

Browse Source
This commit is contained in:
peter
2018-05-08 17:50:33 +02:00
parent d5a0bac3e8
commit 613f6bd417
2 changed files with 8 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files
platform/core-impl/src/com/intellij/psi/impl/source/FileTrees.java
+1 -1
View File
@@ -173,7 +173,7 @@ final class FileTrees {
}
catch (Throwable e) {
LOG.error(e);
myFile.onContentReload();
myFile.clearContent(PsiFileImpl.STUB_PSI_MISMATCH);
myFile.rebuildStub();
throw StubTreeLoader.getInstance().stubTreeAndIndexDoNotMatch(e.getMessage(), stubTree, myFile);
}
platform/core-impl/src/com/intellij/psi/impl/source/PsiFileImpl.java
+7 -3
View File
@@ -54,7 +54,7 @@ import static com.intellij.util.AstLoadingFilter.assertTreeLoadingEnabled;
public abstract class PsiFileImpl extends ElementBase implements PsiFileEx, PsiFileWithStubSupport, Queryable {
private static final Logger LOG = Logger.getInstance("#com.intellij.psi.impl.source.PsiFileImpl");
public static final String STUB_PSI_MISMATCH = "stub-psi mismatch";
static final String STUB_PSI_MISMATCH = "stub-psi mismatch";
private static final AtomicFieldUpdater<PsiFileImpl, FileTrees> ourTreeUpdater =
AtomicFieldUpdater.forFieldOfType(PsiFileImpl.class, FileTrees.class);
@@ -510,14 +510,18 @@ public abstract class PsiFileImpl extends ElementBase implements PsiFileEx, PsiF
public void onContentReload() {
ApplicationManager.getApplication().assertWriteAccessAllowed();
DebugUtil.performPsiModification("onContentReload", () -> {
clearContent("onContentReload");
}
final void clearContent(String reason) {
DebugUtil.performPsiModification(reason, () -> {
synchronized (myPsiLock) {
FileElement treeElement = derefTreeElement();
if (treeElement != null) {
treeElement.detachFromFile();
DebugUtil.onInvalidated(treeElement);
}
updateTrees(myTrees.clearStub("onContentReload"));
updateTrees(myTrees.clearStub(reason));
setTreeElementPointer(null);
}
});