From 8b87739f9c4394442633fbb5b0af017e6ad2f2c1 Mon Sep 17 00:00:00 2001 From: Alexey Kudravtsev Date: Wed, 20 Jul 2016 14:14:17 +0300 Subject: [PATCH] ignore PCE thrown from document commit callback --- .../src/com/intellij/psi/impl/PsiDocumentManagerBase.java | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/platform/core-impl/src/com/intellij/psi/impl/PsiDocumentManagerBase.java b/platform/core-impl/src/com/intellij/psi/impl/PsiDocumentManagerBase.java index 4a54b8d643d6..f745bb7bafee 100644 --- a/platform/core-impl/src/com/intellij/psi/impl/PsiDocumentManagerBase.java +++ b/platform/core-impl/src/com/intellij/psi/impl/PsiDocumentManagerBase.java @@ -36,6 +36,7 @@ import com.intellij.openapi.editor.impl.EditorDocumentPriorities; import com.intellij.openapi.editor.impl.FrozenDocument; import com.intellij.openapi.editor.impl.event.RetargetRangeMarkers; import com.intellij.openapi.fileEditor.FileDocumentManager; +import com.intellij.openapi.progress.ProcessCanceledException; import com.intellij.openapi.project.Project; import com.intellij.openapi.roots.FileIndexFacade; import com.intellij.openapi.util.*; @@ -618,6 +619,10 @@ public abstract class PsiDocumentManagerBase extends PsiDocumentManager implemen try { action.run(); } + catch (ProcessCanceledException e) { + // some actions are that crazy to use PCE for their own control flow. + // swallow and ignore to not disrupt completely unrelated control flow. + } catch (Throwable e) { LOG.error("During running " + action, e); }