From d559c8261c616abebc23856f8d6e4e9afabd76b5 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Yann=20C=C3=A9bron?= <yann.cebron@jetbrains.com>
Date: Fri, 2 Aug 2019 10:58:42 +0200
Subject: [PATCH] IDEA-219724 Devkit: support <projectListeners> (2019.3+)

GitOrigin-RevId: 76bece5934ab6d42a38c0f5442a70c676e190187
---
 ...ApplicationListeners.xml => Listeners.xml} | 24 +++++++++++++++++++
 ...cy.xml => ListenersDepends-dependency.xml} |  5 ++++
 ...tenersDepends.xml => ListenersDepends.xml} |  0
 ....xml => ListenersNoPluginIdStandalone.xml} |  5 ++++
 ...nceBuild.xml => ListenersNoSinceBuild.xml} |  5 ++++
 ...istenersPre193.xml => ListenersPre193.xml} |  5 ++++
 .../PluginXmlFunctionalTest.groovy            | 20 ++++++++--------
 7 files changed, 54 insertions(+), 10 deletions(-)
 rename plugins/devkit/devkit-java-tests/testData/codeInsight/{ApplicationListeners.xml => Listeners.xml} (53%)
 rename plugins/devkit/devkit-java-tests/testData/codeInsight/{ApplicationListenersDepends-dependency.xml => ListenersDepends-dependency.xml} (52%)
 rename plugins/devkit/devkit-java-tests/testData/codeInsight/{ApplicationListenersDepends.xml => ListenersDepends.xml} (100%)
 rename plugins/devkit/devkit-java-tests/testData/codeInsight/{ApplicationListenersNoPluginIdStandalone.xml => ListenersNoPluginIdStandalone.xml} (52%)
 rename plugins/devkit/devkit-java-tests/testData/codeInsight/{ApplicationListenersNoSinceBuild.xml => ListenersNoSinceBuild.xml} (58%)
 rename plugins/devkit/devkit-java-tests/testData/codeInsight/{ApplicationListenersPre193.xml => ListenersPre193.xml} (59%)

diff --git a/plugins/devkit/devkit-java-tests/testData/codeInsight/ApplicationListeners.xml b/plugins/devkit/devkit-java-tests/testData/codeInsight/Listeners.xml
similarity index 53%
rename from plugins/devkit/devkit-java-tests/testData/codeInsight/ApplicationListeners.xml
rename to plugins/devkit/devkit-java-tests/testData/codeInsight/Listeners.xml
index 2a29e2545128..00e8fdf9ff9e 100644
--- a/plugins/devkit/devkit-java-tests/testData/codeInsight/ApplicationListeners.xml
+++ b/plugins/devkit/devkit-java-tests/testData/codeInsight/Listeners.xml
@@ -25,4 +25,28 @@
               activeInHeadlessMode="<error descr="Cannot resolve symbol 'INVALID_VALUE'">INVALID_VALUE</error>"
               activeInTestMode="<error descr="Cannot resolve symbol 'INVALID_VALUE'">INVALID_VALUE</error>"/>
   </applicationListeners>
+
+
+
+  <projectListeners>
+    <listener class="java.util.ArrayList" topic="java.util.Collection"
+              activeInHeadlessMode="true" activeInTestMode="true"/>
+  </projectListeners>
+
+  <projectListeners>
+    <<error descr="'class' attribute should be defined">listener</error> topic="java.lang.String"
+              activeInHeadlessMode="true" activeInTestMode="true"/>
+    <<error descr="'topic' attribute should be defined">listener</error> class="java.lang.String"
+              activeInHeadlessMode="true" activeInTestMode="true"/>
+
+
+    <listener class="<error descr="'java.util.Collection' does not inherit from 'java.util.Collection'"><error descr="'java.util.Collection' is not a concrete class"><error descr="Interface is not allowed">java.util.Collection</error></error></error>"
+              topic="java.util.Collection"/>
+
+
+    <listener class="java.util.ArrayList" topic="java.util.Collection"
+              activeInHeadlessMode="<error descr="Cannot resolve symbol 'INVALID_VALUE'">INVALID_VALUE</error>"
+              activeInTestMode="<error descr="Cannot resolve symbol 'INVALID_VALUE'">INVALID_VALUE</error>"/>
+  </projectListeners>
+
 </idea-plugin>
\ No newline at end of file
diff --git a/plugins/devkit/devkit-java-tests/testData/codeInsight/ApplicationListenersDepends-dependency.xml b/plugins/devkit/devkit-java-tests/testData/codeInsight/ListenersDepends-dependency.xml
similarity index 52%
rename from plugins/devkit/devkit-java-tests/testData/codeInsight/ApplicationListenersDepends-dependency.xml
rename to plugins/devkit/devkit-java-tests/testData/codeInsight/ListenersDepends-dependency.xml
index 352338d5ec5a..53265f6f7eb3 100644
--- a/plugins/devkit/devkit-java-tests/testData/codeInsight/ApplicationListenersDepends-dependency.xml
+++ b/plugins/devkit/devkit-java-tests/testData/codeInsight/ListenersDepends-dependency.xml
@@ -5,4 +5,9 @@
               activeInHeadlessMode="true" activeInTestMode="true"/>
   </applicationListeners></error>
 
+  <error descr="Feature available in platform version 193 or later only, but specified 'since-build' platform is '192'"><projectListeners>
+    <listener class="java.util.ArrayList" topic="java.util.Collection"
+              activeInHeadlessMode="true" activeInTestMode="true"/>
+  </projectListeners></error>
+
 </idea-plugin>
\ No newline at end of file
diff --git a/plugins/devkit/devkit-java-tests/testData/codeInsight/ApplicationListenersDepends.xml b/plugins/devkit/devkit-java-tests/testData/codeInsight/ListenersDepends.xml
similarity index 100%
rename from plugins/devkit/devkit-java-tests/testData/codeInsight/ApplicationListenersDepends.xml
rename to plugins/devkit/devkit-java-tests/testData/codeInsight/ListenersDepends.xml
diff --git a/plugins/devkit/devkit-java-tests/testData/codeInsight/ApplicationListenersNoPluginIdStandalone.xml b/plugins/devkit/devkit-java-tests/testData/codeInsight/ListenersNoPluginIdStandalone.xml
similarity index 52%
rename from plugins/devkit/devkit-java-tests/testData/codeInsight/ApplicationListenersNoPluginIdStandalone.xml
rename to plugins/devkit/devkit-java-tests/testData/codeInsight/ListenersNoPluginIdStandalone.xml
index 15912eab7c96..33e61bdbbd72 100644
--- a/plugins/devkit/devkit-java-tests/testData/codeInsight/ApplicationListenersNoPluginIdStandalone.xml
+++ b/plugins/devkit/devkit-java-tests/testData/codeInsight/ListenersNoPluginIdStandalone.xml
@@ -5,4 +5,9 @@
               activeInHeadlessMode="true" activeInTestMode="true"/>
   </applicationListeners></error>
 
+  <error descr="Could not locate main plugin.xml file to determine required <idea-version> 'since-build'"><projectListeners>
+    <listener class="java.util.ArrayList" topic="java.util.Collection"
+              activeInHeadlessMode="true" activeInTestMode="true"/>
+  </projectListeners></error>
+
 </idea-plugin>
\ No newline at end of file
diff --git a/plugins/devkit/devkit-java-tests/testData/codeInsight/ApplicationListenersNoSinceBuild.xml b/plugins/devkit/devkit-java-tests/testData/codeInsight/ListenersNoSinceBuild.xml
similarity index 58%
rename from plugins/devkit/devkit-java-tests/testData/codeInsight/ApplicationListenersNoSinceBuild.xml
rename to plugins/devkit/devkit-java-tests/testData/codeInsight/ListenersNoSinceBuild.xml
index f602be9707ee..430f2814be45 100644
--- a/plugins/devkit/devkit-java-tests/testData/codeInsight/ApplicationListenersNoSinceBuild.xml
+++ b/plugins/devkit/devkit-java-tests/testData/codeInsight/ListenersNoSinceBuild.xml
@@ -9,4 +9,9 @@
               activeInHeadlessMode="true" activeInTestMode="true"/>
   </applicationListeners></error>
 
+  <error descr="Must specify <idea-version> 'since-build'"><projectListeners>
+    <listener class="java.util.ArrayList" topic="java.util.Collection"
+              activeInHeadlessMode="true" activeInTestMode="true"/>
+  </projectListeners></error>
+
 </idea-plugin>
\ No newline at end of file
diff --git a/plugins/devkit/devkit-java-tests/testData/codeInsight/ApplicationListenersPre193.xml b/plugins/devkit/devkit-java-tests/testData/codeInsight/ListenersPre193.xml
similarity index 59%
rename from plugins/devkit/devkit-java-tests/testData/codeInsight/ApplicationListenersPre193.xml
rename to plugins/devkit/devkit-java-tests/testData/codeInsight/ListenersPre193.xml
index 1003d33c9ad5..3da8ae750853 100644
--- a/plugins/devkit/devkit-java-tests/testData/codeInsight/ApplicationListenersPre193.xml
+++ b/plugins/devkit/devkit-java-tests/testData/codeInsight/ListenersPre193.xml
@@ -10,4 +10,9 @@
               activeInHeadlessMode="true" activeInTestMode="true"/>
   </applicationListeners></error>
 
+  <error descr="Feature available in platform version 193 or later only, but specified 'since-build' platform is '192'"><projectListeners>
+    <listener class="java.util.ArrayList" topic="java.util.Collection"
+              activeInHeadlessMode="true" activeInTestMode="true"/>
+  </projectListeners></error>
+
 </idea-plugin>
\ No newline at end of file
diff --git a/plugins/devkit/devkit-java-tests/testSrc/org/jetbrains/idea/devkit/codeInsight/PluginXmlFunctionalTest.groovy b/plugins/devkit/devkit-java-tests/testSrc/org/jetbrains/idea/devkit/codeInsight/PluginXmlFunctionalTest.groovy
index 2323e37b9522..468e970a62db 100644
--- a/plugins/devkit/devkit-java-tests/testSrc/org/jetbrains/idea/devkit/codeInsight/PluginXmlFunctionalTest.groovy
+++ b/plugins/devkit/devkit-java-tests/testSrc/org/jetbrains/idea/devkit/codeInsight/PluginXmlFunctionalTest.groovy
@@ -97,25 +97,25 @@ class PluginXmlFunctionalTest extends JavaCodeInsightFixtureTestCase {
     moduleBuilder.addLibrary("coreImpl", coreImpl)
   }
 
-  void testApplicationListeners() {
-    doHighlightingTest("ApplicationListeners.xml")
+  void testListeners() {
+    doHighlightingTest("Listeners.xml")
   }
 
-  void testApplicationListenersNoSinceBuild() {
-    doHighlightingTest("ApplicationListenersNoSinceBuild.xml")
+  void testListenersNoSinceBuild() {
+    doHighlightingTest("ListenersNoSinceBuild.xml")
   }
 
-  void testApplicationListenersPre193() {
-    doHighlightingTest("ApplicationListenersPre193.xml")
+  void testListenersPre193() {
+    doHighlightingTest("ListenersPre193.xml")
   }
 
-  void testApplicationListenersDepends() {
+  void testListenersDepends() {
     myFixture.copyFileToProject(getTestName(false) + ".xml", "META-INF/plugin.xml")
-    doHighlightingTest("ApplicationListenersDepends-dependency.xml")
+    doHighlightingTest("ListenersDepends-dependency.xml")
   }
 
-  void testApplicationListenersNoPluginIdStandalone() {
-    doHighlightingTest("ApplicationListenersNoPluginIdStandalone.xml")
+  void testListenersNoPluginIdStandalone() {
+    doHighlightingTest("ListenersNoPluginIdStandalone.xml")
   }
 
   void testExtensionI18n() {