From d049a6d3ac3f56f2284107e4907ba81a3a871afc Mon Sep 17 00:00:00 2001 From: Alexander Zolotov Date: Mon, 16 Sep 2019 21:15:26 +0300 Subject: [PATCH] DevKit: restore the old vendor validation logic from IDEA-CR-52434: This method is called not only for bundled plugins, but also for custom plugins. We cannot be sure that plugin.xml for all such plugins are updated? E.g. there is JsTestDriver plugin (https://github.com/JetBrains/intellij-obsolete-plugins/blob/master/JsTestDriver/plugin/src/main/resources/META-INF/plugin.xml) that specifies "Google, JetBrains". GitOrigin-RevId: d6764300b9c9d5842cda56e0c2df862415e54110 --- .../src/com/intellij/ide/plugins/PluginManagerMain.java | 8 +++++++- 1 file changed, 7 insertions(+), 1 deletion(-) diff --git a/platform/platform-impl/src/com/intellij/ide/plugins/PluginManagerMain.java b/platform/platform-impl/src/com/intellij/ide/plugins/PluginManagerMain.java index bc939c381187..f7bbb4185cd1 100644 --- a/platform/platform-impl/src/com/intellij/ide/plugins/PluginManagerMain.java +++ b/platform/platform-impl/src/com/intellij/ide/plugins/PluginManagerMain.java @@ -60,7 +60,13 @@ public abstract class PluginManagerMain { } public static boolean isDevelopedByJetBrains(@Nullable String vendorString) { - return JETBRAINS_VENDOR.equals(vendorString); + if (vendorString == null) return false; + for (String vendor : StringUtil.split(vendorString, ",")) { + if (vendor.trim().equals(JETBRAINS_VENDOR)) { + return true; + } + } + return false; } private static String getTextPrefix() {