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

diag for EA-89765 - CCE: DocumentCommitThread$.fun

Browse Source
This commit is contained in:
Alexey Kudravtsev
2016-10-13 12:48:34 +03:00
parent 6cc7a5ae33
commit 7ae9e9fdab
1 changed files with 7 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files
platform/core-impl/src/com/intellij/psi/impl/DocumentCommitThread.java
+7 -10
View File
@@ -163,10 +163,6 @@ public class DocumentCommitThread implements Runnable, Disposable, DocumentCommi
if (!project.isInitialized()) return;
PsiFile psiFile = PsiDocumentManager.getInstance(project).getCachedPsiFile(document);
if (psiFile == null) return;
if (psiFile instanceof PsiCompiledFile) {
throw new IllegalArgumentException("Can't commit ClsFile: "+psiFile);
}
doQueue(project, document, getAllFileNodes(psiFile), reason, currentModalityState);
}
@@ -429,9 +425,6 @@ public class DocumentCommitThread implements Runnable, Disposable, DocumentCommi
@Override
public List<Pair<PsiFileImpl, FileASTNode>> compute() {
PsiFile file = finalProject.isDisposed() ? null : documentManager.getPsiFile(finalDocument);
if (file != null && !file.isValid()) {
throw new PsiInvalidElementAccessException(file, "documentManager.getPsiFile(" + finalDocument + ") is invalid");
}
return file == null ? null : getAllFileNodes(file);
}
});
@@ -461,9 +454,6 @@ public class DocumentCommitThread implements Runnable, Disposable, DocumentCommi
throw new RuntimeException(s);
}
if (!psiFile.isValid()) {
throw new PsiInvalidElementAccessException(psiFile, "File " + psiFile + " is invalid, can't commit");
}
List<Pair<PsiFileImpl, FileASTNode>> allFileNodes = getAllFileNodes(psiFile);
Lock documentLock = getDocumentLock(document);
@@ -493,6 +483,13 @@ public class DocumentCommitThread implements Runnable, Disposable, DocumentCommi
@NotNull
private static List<Pair<PsiFileImpl, FileASTNode>> getAllFileNodes(@NotNull PsiFile file) {
if (!file.isValid()) {
throw new PsiInvalidElementAccessException(file, "File " + file + " is invalid, can't commit");
}
if (file instanceof PsiCompiledFile) {
throw new IllegalArgumentException("Can't commit ClsFile: "+file);
}
return ContainerUtil.map(file.getViewProvider().getAllFiles(), new Function<PsiFile, Pair<PsiFileImpl, FileASTNode>>() {
@Override
public Pair<PsiFileImpl, FileASTNode> fun(PsiFile root) {