From ada6cb067155dd2f8333756b3eba5de07a8d6891 Mon Sep 17 00:00:00 2001
From: Alexander Zolotov <zolotov@jetbrains.com>
Date: Mon, 16 Sep 2019 21:22:17 +0300
Subject: [PATCH] DevKit: adjust inspection error message with the new
 validation rules

GitOrigin-RevId: 86cc687747a44467e5d55ce25308fcb308d46f1f
---
 .../org/jetbrains/idea/devkit/DevKitBundle.properties         | 1 -
 .../devkit-core/src/inspections/PluginXmlDomInspection.java   | 4 ++--
 .../testData/codeInsight/pluginWithThirdPartyVendor.xml       | 2 +-
 3 files changed, 3 insertions(+), 4 deletions(-)

diff --git a/plugins/devkit/devkit-core/resources/org/jetbrains/idea/devkit/DevKitBundle.properties b/plugins/devkit/devkit-core/resources/org/jetbrains/idea/devkit/DevKitBundle.properties
index bdb222418629..3126b439e020 100644
--- a/plugins/devkit/devkit-core/resources/org/jetbrains/idea/devkit/DevKitBundle.properties
+++ b/plugins/devkit/devkit-core/resources/org/jetbrains/idea/devkit/DevKitBundle.properties
@@ -149,7 +149,6 @@ inspections.group.description.file=Description file
 inspections.group.code=Code
 inspections.plugin.xml.inner.class.must.be.separated.with.dollar=Inner class must be separated with '$'
 inspections.plugin.xml.plugin.should.have.jetbrains.vendor=Plugin developed as a part of IntelliJ IDEA project should specify 'JetBrains' as its vendor
-inspections.plugin.xml.plugin.should.include.jetbrains.vendor=Plugin developed as a part of IntelliJ IDEA project should include 'JetBrains' as one of its vendors
 inspections.plugin.xml.plugin.jetbrains.vendor.no.url=Plugin developed as a part of IntelliJ IDEA project shouldn''t specify ''{0}'' as url
 inspections.plugin.xml.plugin.jetbrains.vendor.no.email=Plugin developed as a part of IntelliJ IDEA project shouldn't specify email
 inspections.plugin.xml.plugin.jetbrains.no.version=Plugin developed as a part of IntelliJ IDEA project shouldn't specify version
diff --git a/plugins/devkit/devkit-core/src/inspections/PluginXmlDomInspection.java b/plugins/devkit/devkit-core/src/inspections/PluginXmlDomInspection.java
index 7f58b251711f..8d8f7c822eff 100644
--- a/plugins/devkit/devkit-core/src/inspections/PluginXmlDomInspection.java
+++ b/plugins/devkit/devkit-core/src/inspections/PluginXmlDomInspection.java
@@ -407,8 +407,8 @@ public class PluginXmlDomInspection extends BasicDomElementsInspection<IdeaPlugi
                            DevKitBundle.message("inspections.plugin.xml.plugin.should.have.jetbrains.vendor"),
                            new AddMissingMainTag("Specify JetBrains as vendor", vendor, PluginManagerMain.JETBRAINS_VENDOR));
     }
-    else if (!PluginManagerMain.isDevelopedByJetBrains(vendor.getValue())) {
-      holder.createProblem(vendor, DevKitBundle.message("inspections.plugin.xml.plugin.should.include.jetbrains.vendor"));
+    else if (!PluginManagerMain.JETBRAINS_VENDOR.equals(vendor.getValue())) {
+      holder.createProblem(vendor, DevKitBundle.message("inspections.plugin.xml.plugin.should.have.jetbrains.vendor"));
     }
     else {
       final String url = vendor.getUrl().getStringValue();
diff --git a/plugins/devkit/devkit-java-tests/testData/codeInsight/pluginWithThirdPartyVendor.xml b/plugins/devkit/devkit-java-tests/testData/codeInsight/pluginWithThirdPartyVendor.xml
index babf01115513..4ca06c457015 100644
--- a/plugins/devkit/devkit-java-tests/testData/codeInsight/pluginWithThirdPartyVendor.xml
+++ b/plugins/devkit/devkit-java-tests/testData/codeInsight/pluginWithThirdPartyVendor.xml
@@ -1,4 +1,4 @@
 <idea-plugin>
   <id>test</id>
-  <vendor><error descr="Plugin developed as a part of IntelliJ IDEA project should include 'JetBrains' as one of its vendors">me</error></vendor>
+  <vendor><error descr="Plugin developed as a part of IntelliJ IDEA project should specify 'JetBrains' as its vendor">me</error></vendor>
 </idea-plugin>