From 6b6794585aca58e280b04f6fe10684af616dbd8c Mon Sep 17 00:00:00 2001 From: "Maxim.Mossienko" Date: Mon, 3 Jun 2019 11:22:45 +0200 Subject: [PATCH] review feedback - use getChildTextTrim instead of getChild / getTextTrim - use "name" tag value if "id" tag is missing GitOrigin-RevId: 9f84eba563450dd1a0ef44f8481d164c362ae10e --- .../com/intellij/ide/plugins/IdeaPluginDescriptorImpl.java | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) diff --git a/platform/core-impl/src/com/intellij/ide/plugins/IdeaPluginDescriptorImpl.java b/platform/core-impl/src/com/intellij/ide/plugins/IdeaPluginDescriptorImpl.java index b528f0fc2792..c0d361009e41 100644 --- a/platform/core-impl/src/com/intellij/ide/plugins/IdeaPluginDescriptorImpl.java +++ b/platform/core-impl/src/com/intellij/ide/plugins/IdeaPluginDescriptorImpl.java @@ -139,11 +139,12 @@ public class IdeaPluginDescriptorImpl implements IdeaPluginDescriptor { return; } - Element id = element.getChild("id"); - if (id == null || !PluginManagerCore.disabledPlugins().contains(id.getTextTrim())) { + String pluginId = element.getChildTextTrim("id"); + if (pluginId == null) pluginId = element.getChildTextTrim("name"); + if (pluginId == null || !PluginManagerCore.disabledPlugins().contains(pluginId)) { JDOMXIncluder.resolveNonXIncludeElement(element, url, ignoreMissingInclude, pathResolver); } else { - if (LOG.isDebugEnabled()) LOG.debug("Skipping resolving of " + id.getTextTrim() + " from " + url); + if (LOG.isDebugEnabled()) LOG.debug("Skipping resolving of " + pluginId + " from " + url); } readExternal(element, stringInterner); }