From fa71ea05df79923117d51a43527e4aa959463a25 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Yann=20C=C3=A9bron?= <yann.cebron@jetbrains.com>
Date: Wed, 17 Apr 2019 11:50:15 +0200
Subject: [PATCH] IDEA-211136 Bundled plugins: highlight <change-notes> and
 <version>

---
 .../org/jetbrains/idea/devkit/DevKitBundle.properties |  2 ++
 .../src/inspections/PluginXmlDomInspection.java       | 11 +++++++++++
 .../codeInsight/pluginWithJetBrainsAndMeAsVendor.xml  |  1 -
 .../codeInsight/pluginWithJetBrainsAsVendor.xml       |  2 +-
 .../codeInsight/pluginWithThirdPartyVendor.xml        |  1 -
 .../testData/codeInsight/pluginWithoutVendor.xml      |  1 -
 6 files changed, 14 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 b42887c6057f..b344ed8a9f8f 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,6 +149,8 @@ inspections.plugin.xml.plugin.should.have.jetbrains.vendor=Plugin developed as a
 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
+inspections.plugin.xml.plugin.jetbrains.no.change.notes=Plugin developed as a part of IntelliJ IDEA project shouldn't specify change-notes
 inspections.plugin.xml.plugin.jetbrains.no.generic.plugin.url=Plugin developed as a part of IntelliJ IDEA project shouldn't specify generic plugin url
 inspections.plugin.xml.ep.doesnt.have.with=<extensionPoint> does not have <with> tags to specify the types of class fields
 inspections.plugin.xml.ep.both.beanClass.and.interface=<extensionPoint> must not specify both 'interface' and 'beanClass' attributes
diff --git a/plugins/devkit/devkit-core/src/inspections/PluginXmlDomInspection.java b/plugins/devkit/devkit-core/src/inspections/PluginXmlDomInspection.java
index 0c39bc7ae35a..86651f15f1e9 100644
--- a/plugins/devkit/devkit-core/src/inspections/PluginXmlDomInspection.java
+++ b/plugins/devkit/devkit-core/src/inspections/PluginXmlDomInspection.java
@@ -323,6 +323,17 @@ public class PluginXmlDomInspection extends BasicDomElementsInspection<IdeaPlugi
                            DevKitBundle.message("inspections.plugin.xml.plugin.jetbrains.vendor.no.email"),
                            new RemoveDomElementQuickFix(vendor.getEmail())).highlightWholeElement();
     }
+
+    if (DomUtil.hasXml(ideaPlugin.getChangeNotes())) {
+      holder.createProblem(ideaPlugin.getChangeNotes(),
+                           DevKitBundle.message("inspections.plugin.xml.plugin.jetbrains.no.change.notes"),
+                           new RemoveDomElementQuickFix(ideaPlugin.getChangeNotes())).highlightWholeElement();
+    }
+    if (DomUtil.hasXml(ideaPlugin.getVersion())) {
+      holder.createProblem(ideaPlugin.getVersion(),
+                           DevKitBundle.message("inspections.plugin.xml.plugin.jetbrains.no.version"),
+                           new RemoveDomElementQuickFix(ideaPlugin.getVersion())).highlightWholeElement();
+    }
   }
 
   private static void checkPluginIcon(IdeaPlugin ideaPlugin, DomElementAnnotationHolder holder, Module module) {
diff --git a/plugins/devkit/devkit-java-tests/testData/codeInsight/pluginWithJetBrainsAndMeAsVendor.xml b/plugins/devkit/devkit-java-tests/testData/codeInsight/pluginWithJetBrainsAndMeAsVendor.xml
index 24a99ba39071..0df3a2116bf2 100644
--- a/plugins/devkit/devkit-java-tests/testData/codeInsight/pluginWithJetBrainsAndMeAsVendor.xml
+++ b/plugins/devkit/devkit-java-tests/testData/codeInsight/pluginWithJetBrainsAndMeAsVendor.xml
@@ -1,7 +1,6 @@
 <idea-plugin>
   <id>test</id>
   <vendor>JetBrains</vendor>
-  <version>1.0</version>
 
   <vendor>JetBrains, me</vendor>
 </idea-plugin>
diff --git a/plugins/devkit/devkit-java-tests/testData/codeInsight/pluginWithJetBrainsAsVendor.xml b/plugins/devkit/devkit-java-tests/testData/codeInsight/pluginWithJetBrainsAsVendor.xml
index e0be47a09d94..d67bc636367f 100644
--- a/plugins/devkit/devkit-java-tests/testData/codeInsight/pluginWithJetBrainsAsVendor.xml
+++ b/plugins/devkit/devkit-java-tests/testData/codeInsight/pluginWithJetBrainsAsVendor.xml
@@ -1,7 +1,7 @@
 <idea-plugin
   <error descr="Plugin developed as a part of IntelliJ IDEA project shouldn't specify generic plugin url">url="https://www.jetbrains.com/idea"</error>>
   <id>test</id>
-  <version>1.0</version>
+  <error descr="Plugin developed as a part of IntelliJ IDEA project shouldn't specify version"><version>1.0</version></error>
   <vendor <error descr="Plugin developed as a part of IntelliJ IDEA project shouldn't specify 'http://www.jetbrains.com' as url">url="http://www.jetbrains.com"</error>
     <error descr="Plugin developed as a part of IntelliJ IDEA project shouldn't specify email">email="some@one.com"</error>
     >JetBrains</vendor>
diff --git a/plugins/devkit/devkit-java-tests/testData/codeInsight/pluginWithThirdPartyVendor.xml b/plugins/devkit/devkit-java-tests/testData/codeInsight/pluginWithThirdPartyVendor.xml
index 4047bd3a17bb..babf01115513 100644
--- a/plugins/devkit/devkit-java-tests/testData/codeInsight/pluginWithThirdPartyVendor.xml
+++ b/plugins/devkit/devkit-java-tests/testData/codeInsight/pluginWithThirdPartyVendor.xml
@@ -1,5 +1,4 @@
 <idea-plugin>
   <id>test</id>
-  <version>1</version>
   <vendor><error descr="Plugin developed as a part of IntelliJ IDEA project should include 'JetBrains' as one of its vendors">me</error></vendor>
 </idea-plugin>
diff --git a/plugins/devkit/devkit-java-tests/testData/codeInsight/pluginWithoutVendor.xml b/plugins/devkit/devkit-java-tests/testData/codeInsight/pluginWithoutVendor.xml
index a2d98b803311..22a7c59f47b5 100644
--- a/plugins/devkit/devkit-java-tests/testData/codeInsight/pluginWithoutVendor.xml
+++ b/plugins/devkit/devkit-java-tests/testData/codeInsight/pluginWithoutVendor.xml
@@ -1,5 +1,4 @@
 <error descr="Plugin developed as a part of IntelliJ IDEA project should specify 'JetBrains' as its vendor"><idea-plugin>
   <id>test</id>
-  <version>1</version>
 </idea-plugin>
 </error>
\ No newline at end of file