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

FileTrees.withExclusiveStub: more diagnostics and avoid complete reindexing (RUBY-19319)

Browse Source 
replace assertion with RuntimeException, because AssertionErrors cause index rebuild
This commit is contained in:
peter
2017-03-13 19:39:42 +01:00
parent d5a267a208
commit d3324a595e
2 changed files with 6 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files
platform/core-impl/src/com/intellij/psi/impl/source/FileTrees.java
+5 -2
View File
@@ -24,6 +24,7 @@ import org.jetbrains.annotations.NotNull;
import org.jetbrains.annotations.Nullable;
import java.lang.ref.Reference;
import java.util.Set;
/**
* @author peter
@@ -67,8 +68,10 @@ final class FileTrees {
return new FileTrees(myStub, ast, true, useStrongRefs);
}
FileTrees withExclusiveStub(@NotNull StubTree stub) {
assert derefTreeElement() == null && !useStrongRefs : this;
FileTrees withExclusiveStub(@NotNull StubTree stub, Set<PsiFileImpl> allRoots) {
if (derefTreeElement() != null || useStrongRefs) {
throw new RuntimeException(toString() + "; roots=" + allRoots);
}
return new FileTrees(new SoftReference<>(stub), null, false, false);
}
platform/core-impl/src/com/intellij/psi/impl/source/PsiFileImpl.java
+1 -1
View File
@@ -716,7 +716,7 @@ public abstract class PsiFileImpl extends ElementBase implements PsiFileEx, PsiF
// now stubs can be safely published
for (PsiFileImpl eachPsiRoot : bindings.keySet()) {
eachPsiRoot.updateTrees(eachPsiRoot.myTrees.withExclusiveStub(bindings.get(eachPsiRoot)));
eachPsiRoot.updateTrees(eachPsiRoot.myTrees.withExclusiveStub(bindings.get(eachPsiRoot), bindings.keySet()));
}
return result;
}