From f1619e0926fd1205aef7dfb7fb39ca3caa2d8944 Mon Sep 17 00:00:00 2001 From: peter Date: Thu, 12 Oct 2017 20:23:54 +0200 Subject: [PATCH] ant: don't commit documents inside cell renderer (EA-109138 - assert: PsiDocumentManagerBase.commitAllDocuments) --- .../lang/ant/config/impl/AntConfigurationImpl.java | 7 +------ 1 file changed, 1 insertion(+), 6 deletions(-) diff --git a/plugins/ant/src/com/intellij/lang/ant/config/impl/AntConfigurationImpl.java b/plugins/ant/src/com/intellij/lang/ant/config/impl/AntConfigurationImpl.java index c8084a54138a..95be80bb5f89 100644 --- a/plugins/ant/src/com/intellij/lang/ant/config/impl/AntConfigurationImpl.java +++ b/plugins/ant/src/com/intellij/lang/ant/config/impl/AntConfigurationImpl.java @@ -47,7 +47,6 @@ import com.intellij.openapi.vfs.VirtualFile; import com.intellij.openapi.vfs.VirtualFileEvent; import com.intellij.openapi.vfs.VirtualFileListener; import com.intellij.openapi.vfs.VirtualFileManager; -import com.intellij.psi.PsiDocumentManager; import com.intellij.psi.PsiElement; import com.intellij.psi.PsiFile; import com.intellij.psi.PsiManager; @@ -592,7 +591,7 @@ public class AntConfigurationImpl extends AntConfigurationBase implements Persis public AntBuildModelBase getModel(@NotNull AntBuildFile buildFile) { AntBuildModelBase model = myModelToBuildFileMap.get(buildFile); if (model == null) { - model = createModel(buildFile); + model = new AntBuildModelImpl(buildFile); myModelToBuildFileMap.put(buildFile, model); } return model; @@ -612,10 +611,6 @@ public class AntConfigurationImpl extends AntConfigurationBase implements Persis } private AntBuildModelBase createModel(final AntBuildFile buildFile) { - if (ApplicationManager.getApplication().isDispatchThread()) { - // otherwise commitAllDocuments() must have been called before the whole process was started - PsiDocumentManager.getInstance(getProject()).commitAllDocuments(); - } return new AntBuildModelImpl(buildFile); }