From 89fa1264500ea3c16052b0fb20c644d3d6706567 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Yann=20C=C3=A9bron?= <yann.cebron@jetbrains.com>
Date: Mon, 17 Feb 2020 15:18:01 +0100
Subject: [PATCH] IDEA-229615 Incorrect highlighting for projectListeners and
 applicationListeners

GitOrigin-RevId: 7a97876a6f5ca1fdb5cb9c2ad5cc329b6343efe8
---
 plugins/devkit/devkit-core/src/dom/Listeners.java           | 2 +-
 .../devkit-java-tests/testData/codeInsight/Listeners.xml    | 6 ++++--
 .../idea/devkit/codeInsight/PluginXmlFunctionalTest.groovy  | 3 +++
 3 files changed, 8 insertions(+), 3 deletions(-)

diff --git a/plugins/devkit/devkit-core/src/dom/Listeners.java b/plugins/devkit/devkit-core/src/dom/Listeners.java
index 996ca95b942e..e9f8ab1537bf 100644
--- a/plugins/devkit/devkit-core/src/dom/Listeners.java
+++ b/plugins/devkit/devkit-core/src/dom/Listeners.java
@@ -20,7 +20,7 @@ public interface Listeners extends DomElement {
     @Attribute("class")
     @Required
     @Convert(PluginPsiClassConverter.class)
-    @ExtendClass(allowNonPublic = true, allowAbstract = false, allowInterface = false, allowEnum = false)
+    @ExtendClass(allowNonPublic = true, allowAbstract = false, allowInterface = false, allowEnum = false, instantiatable = false)
     GenericAttributeValue<PsiClass> getListenerClassName();
 
     @Attribute("topic")
diff --git a/plugins/devkit/devkit-java-tests/testData/codeInsight/Listeners.xml b/plugins/devkit/devkit-java-tests/testData/codeInsight/Listeners.xml
index 00e8fdf9ff9e..56aaa4808a59 100644
--- a/plugins/devkit/devkit-java-tests/testData/codeInsight/Listeners.xml
+++ b/plugins/devkit/devkit-java-tests/testData/codeInsight/Listeners.xml
@@ -17,9 +17,11 @@
               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>"
+    <listener class="<error descr="'java.util.Collection' does not inherit from 'java.util.Collection'"><error descr="Interface is not allowed">java.util.Collection</error></error>"
               topic="java.util.Collection"/>
 
+    <listener class="MyCollectionWithoutDefaultCTOR" topic="java.util.Collection"/>
+
 
     <listener class="java.util.ArrayList" topic="java.util.Collection"
               activeInHeadlessMode="<error descr="Cannot resolve symbol 'INVALID_VALUE'">INVALID_VALUE</error>"
@@ -40,7 +42,7 @@
               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>"
+    <listener class="<error descr="'java.util.Collection' does not inherit from 'java.util.Collection'"><error descr="Interface is not allowed">java.util.Collection</error></error>"
               topic="java.util.Collection"/>
 
 
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 935b54a040f1..ce23d8d38ea3 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
@@ -102,6 +102,9 @@ class PluginXmlFunctionalTest extends JavaCodeInsightFixtureTestCase {
   }
 
   void testListeners() {
+    myFixture.addClass("public class MyCollectionWithoutDefaultCTOR implements java.util.Collection {" +
+                       " public MyCollectionWithoutDefaultCTOR(String something) {}" +
+                       "}")
     doHighlightingTest("Listeners.xml")
   }