From d940fea5668d511da93d4826c89e64f85624aa60 Mon Sep 17 00:00:00 2001 From: Dmitry Batkovich Date: Sat, 25 Mar 2017 21:30:00 +0300 Subject: [PATCH] do not report missed intention description error to our EA if an intention is a part of non-JB plugin --- .../impl/config/IntentionActionMetaData.java | 12 ++++++++++-- 1 file changed, 10 insertions(+), 2 deletions(-) diff --git a/platform/lang-impl/src/com/intellij/codeInsight/intention/impl/config/IntentionActionMetaData.java b/platform/lang-impl/src/com/intellij/codeInsight/intention/impl/config/IntentionActionMetaData.java index 2d2e23a8aeb1..6b6c351d04c5 100644 --- a/platform/lang-impl/src/com/intellij/codeInsight/intention/impl/config/IntentionActionMetaData.java +++ b/platform/lang-impl/src/com/intellij/codeInsight/intention/impl/config/IntentionActionMetaData.java @@ -17,6 +17,7 @@ package com.intellij.codeInsight.intention.impl.config; import com.intellij.codeInsight.intention.IntentionAction; +import com.intellij.diagnostic.PluginException; import com.intellij.ide.plugins.cl.PluginClassLoader; import com.intellij.openapi.diagnostic.Logger; import com.intellij.openapi.extensions.PluginId; @@ -106,8 +107,15 @@ public final class IntentionActionMetaData extends BeforeAfterActionMetaData { if (myDirURL == null) { //plugin compatibility myDirURL = getIntentionDescriptionDirURL(myLoader, getFamily()); } - LOG.assertTrue(myDirURL != null, "Intention Description Dir URL is null: " + - getFamily() + "; " + myDescriptionDirectoryName + ", " + myLoader); + if (myDirURL == null) { + PluginId pluginId = getPluginId(); + String errorMessage = "Intention Description Dir URL is null: " + getFamily() + "; " + myDescriptionDirectoryName; + if (pluginId != null) { + throw new PluginException(errorMessage, pluginId); + } else { + throw new RuntimeException(errorMessage); + } + } return myDirURL; } }