From b0326abca2d56a3805bf1012a7ed0a1a4ac6c91a Mon Sep 17 00:00:00 2001
From: Pavel Dolgov <pavel.dolgov@jetbrains.com>
Date: Mon, 21 Mar 2016 21:20:37 +0300
Subject: [PATCH] Javafx: Handle wildcard event type in the quick fix that
 creates event handler method. Add test for that. (IDEA-151694)

---
 .../javaFX/fxml/JavaFxEventHandlerInspectionTest.java      | 4 ++++
 .../javaFX/fxml/refs/JavaFxEventHandlerReference.java      | 5 ++++-
 .../testData/inspections/eventHandler/QuickfixSuper.java   | 1 +
 .../inspections/eventHandler/QuickfixSuper_after.java      | 7 +++++++
 .../testData/inspections/eventHandler/quickfixSuper.fxml   | 5 +++++
 5 files changed, 21 insertions(+), 1 deletion(-)
 create mode 100644 plugins/javaFX/testData/inspections/eventHandler/QuickfixSuper.java
 create mode 100644 plugins/javaFX/testData/inspections/eventHandler/QuickfixSuper_after.java
 create mode 100644 plugins/javaFX/testData/inspections/eventHandler/quickfixSuper.fxml

diff --git a/plugins/javaFX/javaFX-CE/testSrc/org/jetbrains/plugins/javaFX/fxml/JavaFxEventHandlerInspectionTest.java b/plugins/javaFX/javaFX-CE/testSrc/org/jetbrains/plugins/javaFX/fxml/JavaFxEventHandlerInspectionTest.java
index b16ff99fff5b..80d507164041 100644
--- a/plugins/javaFX/javaFX-CE/testSrc/org/jetbrains/plugins/javaFX/fxml/JavaFxEventHandlerInspectionTest.java
+++ b/plugins/javaFX/javaFX-CE/testSrc/org/jetbrains/plugins/javaFX/fxml/JavaFxEventHandlerInspectionTest.java
@@ -64,6 +64,10 @@ public class JavaFxEventHandlerInspectionTest extends AbstractJavaFXTestCase {
     doQuickfixTest("Create method 'void onSort(SortEvent)'");
   }
 
+  public void testQuickfixSuper() throws Exception {
+    doQuickfixTest("Create method 'void click(MouseEvent)'");
+  }
+
   private void doHighlightingTest() throws Exception {
     myFixture.configureByFiles(getTestName(true) + ".fxml", getTestName(false) + ".java");
     myFixture.checkHighlighting();
diff --git a/plugins/javaFX/src/org/jetbrains/plugins/javaFX/fxml/refs/JavaFxEventHandlerReference.java b/plugins/javaFX/src/org/jetbrains/plugins/javaFX/fxml/refs/JavaFxEventHandlerReference.java
index 28b92236fd79..b23d38455079 100644
--- a/plugins/javaFX/src/org/jetbrains/plugins/javaFX/fxml/refs/JavaFxEventHandlerReference.java
+++ b/plugins/javaFX/src/org/jetbrains/plugins/javaFX/fxml/refs/JavaFxEventHandlerReference.java
@@ -112,7 +112,10 @@ public class JavaFxEventHandlerReference extends PsiReferenceBase<XmlAttributeVa
           final PsiType handlerType =
             tagClassSubstitutor != null ? tagClassSubstitutor.substitute(eventHandlerPropertyType) : eventHandlerPropertyType;
           if (handlerType instanceof PsiClassType) {
-            final PsiType eventType = JavaFxPsiUtil.substituteEventType((PsiClassType)handlerType, element.getProject());
+            PsiType eventType = JavaFxPsiUtil.substituteEventType((PsiClassType)handlerType, element.getProject());
+            if (eventType instanceof PsiWildcardType && ((PsiWildcardType)eventType).isSuper()) {
+              eventType = ((PsiWildcardType)eventType).getBound();
+            }
             if (eventType != null) {
               if (eventType instanceof PsiClassType && JavaFxPsiUtil.isNotFullyResolvedGeneric((PsiClassType)eventType)) {
                 canonicalText = ((PsiClassType)eventType).rawType().getCanonicalText();
diff --git a/plugins/javaFX/testData/inspections/eventHandler/QuickfixSuper.java b/plugins/javaFX/testData/inspections/eventHandler/QuickfixSuper.java
new file mode 100644
index 000000000000..e9cf4d0eee16
--- /dev/null
+++ b/plugins/javaFX/testData/inspections/eventHandler/QuickfixSuper.java
@@ -0,0 +1 @@
+public class QuickfixSuper{}
\ No newline at end of file
diff --git a/plugins/javaFX/testData/inspections/eventHandler/QuickfixSuper_after.java b/plugins/javaFX/testData/inspections/eventHandler/QuickfixSuper_after.java
new file mode 100644
index 000000000000..02ba66adbea2
--- /dev/null
+++ b/plugins/javaFX/testData/inspections/eventHandler/QuickfixSuper_after.java
@@ -0,0 +1,7 @@
+import javafx.scene.input.MouseEvent;
+
+public class QuickfixSuper{
+    public void click(MouseEvent mouseEvent) {
+
+    }
+}
\ No newline at end of file
diff --git a/plugins/javaFX/testData/inspections/eventHandler/quickfixSuper.fxml b/plugins/javaFX/testData/inspections/eventHandler/quickfixSuper.fxml
new file mode 100644
index 000000000000..f802d4acb593
--- /dev/null
+++ b/plugins/javaFX/testData/inspections/eventHandler/quickfixSuper.fxml
@@ -0,0 +1,5 @@
+<?import javafx.scene.control.Label?>
+<?import javafx.scene.layout.GridPane?>
+<GridPane xmlns:fx="http://javafx.com/fxml" fx:controller="QuickfixSuper">
+  <Label onMouseClicked="#cl<caret>ick"/>
+</GridPane>