From 120e8b5b69bc7664cc954d3a527cd7ce2f6433de Mon Sep 17 00:00:00 2001
From: Dmitry Jemerov <yole@jetbrains.com>
Date: Tue, 7 Sep 2010 20:49:55 +0400
Subject: [PATCH] diagnostics (IDEA-58443)

---
 .../intellij/psi/impl/meta/MetaRegistry.java  | 28 +++++++++----------
 1 file changed, 14 insertions(+), 14 deletions(-)

diff --git a/platform/lang-impl/src/com/intellij/psi/impl/meta/MetaRegistry.java b/platform/lang-impl/src/com/intellij/psi/impl/meta/MetaRegistry.java
index 4aa8843c6c4a..54e2c2ac9afc 100644
--- a/platform/lang-impl/src/com/intellij/psi/impl/meta/MetaRegistry.java
+++ b/platform/lang-impl/src/com/intellij/psi/impl/meta/MetaRegistry.java
@@ -71,23 +71,23 @@ public class MetaRegistry extends MetaDataRegistrar {
       protected CachedValue<PsiMetaData> compute(final PsiElement element, Object p) {
         return CachedValuesManager.getManager(element.getProject()).createCachedValue(new CachedValueProvider<PsiMetaData>() {
           public Result<PsiMetaData> compute() {
-            try {
-              ensureContributorsLoaded();
-              for (final MyBinding binding : ourBindings) {
-                if (binding.myFilter.isClassAcceptable(element.getClass()) && binding.myFilter.isAcceptable(element, element.getParent())) {
-                  final PsiMetaData data = binding.myDataClass.newInstance();
-                  data.init(element);
-                  return new Result<PsiMetaData>(data, data.getDependences());
+            ensureContributorsLoaded();
+            for (final MyBinding binding : ourBindings) {
+              if (binding.myFilter.isClassAcceptable(element.getClass()) && binding.myFilter.isAcceptable(element, element.getParent())) {
+                final PsiMetaData data;
+                try {
+                  data = binding.myDataClass.newInstance();
                 }
+                catch (InstantiationException e) {
+                  throw new RuntimeException("failed to instantiate " + binding.myDataClass, e);
+                }
+                catch (IllegalAccessException e) {
+                  throw new RuntimeException("failed to instantiate " + binding.myDataClass, e);
+                }
+                data.init(element);
+                return new Result<PsiMetaData>(data, data.getDependences());
               }
             }
-            catch (IllegalAccessException iae) {
-              throw new RuntimeException(iae);
-            }
-            catch (InstantiationException ie) {
-              throw new RuntimeException(ie);
-            }
-
             return new Result<PsiMetaData>(null, element);
           }
         }, false);