From 313492874b46f7361cd69e97e880196f9dc4fd82 Mon Sep 17 00:00:00 2001 From: Vladimir Krivosheev Date: Wed, 27 Feb 2019 08:16:16 +0100 Subject: [PATCH] PluginDescriptor implements toString, so, use it directly in error messages --- .../openapi/extensions/impl/ExtensionsAreaImpl.java | 11 +++++------ 1 file changed, 5 insertions(+), 6 deletions(-) diff --git a/platform/extensions/src/com/intellij/openapi/extensions/impl/ExtensionsAreaImpl.java b/platform/extensions/src/com/intellij/openapi/extensions/impl/ExtensionsAreaImpl.java index 227511493ce4..939d7fb2fb92 100644 --- a/platform/extensions/src/com/intellij/openapi/extensions/impl/ExtensionsAreaImpl.java +++ b/platform/extensions/src/com/intellij/openapi/extensions/impl/ExtensionsAreaImpl.java @@ -97,25 +97,24 @@ public final class ExtensionsAreaImpl implements ExtensionsArea { @Override public void registerExtensionPoint(@NotNull PluginDescriptor pluginDescriptor, @NotNull Element extensionPointElement) { - assert pluginDescriptor.getPluginId() != null; - final String pluginId = pluginDescriptor.getPluginId().getIdString(); String pointName = extensionPointElement.getAttributeValue("qualifiedName"); if (pointName == null) { final String name = extensionPointElement.getAttributeValue("name"); if (name == null) { - throw new RuntimeException("'name' attribute not specified for extension point in '" + pluginId + "' plugin"); + throw new RuntimeException("'name' attribute not specified for extension point in '" + pluginDescriptor + "' plugin"); } - pointName = pluginId + '.' + name; + assert pluginDescriptor.getPluginId() != null; + pointName = pluginDescriptor.getPluginId().getIdString() + '.' + name; } String beanClassName = extensionPointElement.getAttributeValue("beanClass"); String interfaceClassName = extensionPointElement.getAttributeValue("interface"); if (beanClassName == null && interfaceClassName == null) { - throw new RuntimeException("Neither 'beanClass' nor 'interface' attribute is specified for extension point '" + pointName + "' in '" + pluginId + "' plugin"); + throw new RuntimeException("Neither 'beanClass' nor 'interface' attribute is specified for extension point '" + pointName + "' in '" + pluginDescriptor + "' plugin"); } if (beanClassName != null && interfaceClassName != null) { - throw new RuntimeException("Both 'beanClass' and 'interface' attributes are specified for extension point '" + pointName + "' in '" + pluginId + "' plugin"); + throw new RuntimeException("Both 'beanClass' and 'interface' attributes are specified for extension point '" + pointName + "' in '" + pluginDescriptor + "' plugin"); } ExtensionPointImpl point;