From 1ab2ebfbc958f27743a30bfa1429e7f8ee4f344e Mon Sep 17 00:00:00 2001
From: Aleksey Pivovarov <AMPivovarov@gmail.com>
Date: Thu, 21 Jan 2016 17:06:13 +0300
Subject: [PATCH] diff: do not fail completely on error in extention point

---
 .../src/com/intellij/diff/impl/DiffRequestProcessor.java   | 7 ++++++-
 1 file changed, 6 insertions(+), 1 deletion(-)

diff --git a/platform/diff-impl/src/com/intellij/diff/impl/DiffRequestProcessor.java b/platform/diff-impl/src/com/intellij/diff/impl/DiffRequestProcessor.java
index f2aaa1f83876..d2294c03b55c 100644
--- a/platform/diff-impl/src/com/intellij/diff/impl/DiffRequestProcessor.java
+++ b/platform/diff-impl/src/com/intellij/diff/impl/DiffRequestProcessor.java
@@ -221,7 +221,12 @@ public abstract class DiffRequestProcessor implements Disposable {
     DiffViewer viewer = frameTool.createComponent(myContext, myActiveRequest);
 
     for (DiffExtension extension : DiffExtension.EP_NAME.getExtensions()) {
-      extension.onViewerCreated(viewer, myContext, myActiveRequest);
+      try {
+        extension.onViewerCreated(viewer, myContext, myActiveRequest);
+      }
+      catch (Throwable e) {
+        LOG.error(e);
+      }
     }
 
     DiffViewerWrapper wrapper = myActiveRequest.getUserData(DiffViewerWrapper.KEY);