From f0264dbb16827bfe0396f4bebade81e3320d8670 Mon Sep 17 00:00:00 2001 From: peter Date: Wed, 15 Feb 2017 21:52:11 +0100 Subject: [PATCH] handle PCE in CompositeInputFilter (EA-93838 - PCE: StringUtil$.checkCanceled) --- .../com/intellij/execution/filters/CompositeInputFilter.java | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/platform/lang-api/src/com/intellij/execution/filters/CompositeInputFilter.java b/platform/lang-api/src/com/intellij/execution/filters/CompositeInputFilter.java index 0f7469dfc6a6..420a328c1b0b 100644 --- a/platform/lang-api/src/com/intellij/execution/filters/CompositeInputFilter.java +++ b/platform/lang-api/src/com/intellij/execution/filters/CompositeInputFilter.java @@ -18,6 +18,8 @@ package com.intellij.execution.filters; import com.intellij.execution.ui.ConsoleViewContentType; import com.intellij.openapi.diagnostic.Logger; +import com.intellij.openapi.progress.ProcessCanceledException; +import com.intellij.openapi.progress.ProgressManager; import com.intellij.openapi.project.DumbService; import com.intellij.openapi.project.Project; import com.intellij.openapi.util.Pair; @@ -69,6 +71,9 @@ public class CompositeInputFilter implements InputFilter { try { return filter.applyFilter(text, contentType); } + catch (ProcessCanceledException ignored) { + ProgressManager.checkCanceled(); + } catch (Throwable e) { isBroken = true; LOG.error(e);