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

diff: do not log PCE

Browse Source 
EA-134007 - PCE: AbstractProgressIndicatorBase.throwIfCanceled
This commit is contained in:
Aleksey Pivovarov
2019-01-23 16:06:18 +03:00
parent eb0b5ff158
commit 3750b34a85
1 changed files with 7 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files
platform/diff-impl/src/com/intellij/diff/impl/DiffRequestProcessor.java
+7
View File
@@ -45,6 +45,7 @@ import com.intellij.openapi.diff.DiffBundle;
import com.intellij.openapi.diff.impl.DiffUsageTriggerCollector;
import com.intellij.openapi.editor.Editor;
import com.intellij.openapi.editor.LogicalPosition;
import com.intellij.openapi.progress.ProcessCanceledException;
import com.intellij.openapi.project.DumbAware;
import com.intellij.openapi.project.DumbAwareAction;
import com.intellij.openapi.project.Project;
@@ -229,6 +230,9 @@ public abstract class DiffRequestProcessor implements Disposable {
}
}
}
catch (ProcessCanceledException e) {
throw e;
}
catch (Throwable e) {
LOG.error(e);
}
@@ -575,6 +579,9 @@ public abstract class DiffRequestProcessor implements Disposable {
try {
ExternalDiffTool.showRequest(e.getProject(), myActiveRequest);
}
catch (ProcessCanceledException ex) {
throw ex;
}
catch (Throwable ex) {
Messages.showErrorDialog(e.getProject(), ex.getMessage(), "Can't Show Diff In External Tool");
}