Java: Implemented sorting the candidates pop-up and added icons in that pup-up for "MethodHandle/VarHandle type mismatch" (IDEA-167318), refactored upon review feedback (IDEA-CR-19455)

java/java-tests/testData/codeInsight/daemonCodeAnalyzer/quickFix/methodHandle/afterConstructor.java

@@ -1,3 +1,5 @@
+// Test()
+// Test(int)
 import java.lang.invoke.*;
 
 class Main {
@@ -8,6 +10,6 @@ class Main {
 }
 
 class Test {
-  public Test() {}
   public Test(int a) {}
+  public Test() {}
 }

java/java-tests/testData/codeInsight/daemonCodeAnalyzer/quickFix/methodHandle/afterConstructor2.java

@@ -1,3 +1,4 @@
+// Test(int)
 import java.lang.invoke.*;
 
 class Main {

java/java-tests/testData/codeInsight/daemonCodeAnalyzer/quickFix/methodHandle/afterConstructor3.java

@@ -1,3 +1,4 @@
+// Test()
 import java.lang.invoke.*;
 
 class Main {

java/java-tests/testData/codeInsight/daemonCodeAnalyzer/quickFix/methodHandle/afterConstructor4.java

@@ -1,3 +1,5 @@
+// Test()
+// Test(int)
 import java.lang.invoke.*;
 
 class Main {

java/java-tests/testData/codeInsight/daemonCodeAnalyzer/quickFix/methodHandle/afterGenericMethod.java

@@ -1,3 +1,6 @@
+// Object method(Object)
+// Object method(Object, Object[])
+// Object method(Object, String)
 import java.lang.invoke.*;
 
 class Main {

java/java-tests/testData/codeInsight/daemonCodeAnalyzer/quickFix/methodHandle/afterGenericMethod2.java

@@ -1,3 +1,6 @@
+// Object method(Object)
+// Object method(Object, Object[])
+// Object method(Object, String)
 import java.lang.invoke.*;
 
 class Main {
@@ -9,6 +12,6 @@ class Main {
 
 class Test {
   public <T> T method(T a) {return null;}
-  public <T> T method(T a, T... b) {return null;}
   public <T> T method(T a, String b) {return null;}
+  public <T> T method(T a, T... b) {return null;}
 }

java/java-tests/testData/codeInsight/daemonCodeAnalyzer/quickFix/methodHandle/afterGenericMethod3.java

@@ -1,3 +1,6 @@
+// Object method(Object)
+// Object method(Object, Object[])
+// Object method(Object, String)
 import java.lang.invoke.*;
 
 class Main {

java/java-tests/testData/codeInsight/daemonCodeAnalyzer/quickFix/methodHandle/afterGenericMethod4.java

@@ -1,3 +1,6 @@
+// Object method(Object)
+// Object method(Object, Object[])
+// Object method(Object, String)
 import java.lang.invoke.*;
 
 class Main {

java/java-tests/testData/codeInsight/daemonCodeAnalyzer/quickFix/methodHandle/afterStaticMethod.java

@@ -1,3 +1,6 @@
+// void method()
+// String method(String)
+// String method(String, String[])
 import java.lang.invoke.*;
 
 class Main {

java/java-tests/testData/codeInsight/daemonCodeAnalyzer/quickFix/methodHandle/afterStaticMethod2.java

@@ -1,3 +1,6 @@
+// void method()
+// String method(String)
+// String method(String, String[])
 import java.lang.invoke.*;
 
 class Main {

java/java-tests/testData/codeInsight/daemonCodeAnalyzer/quickFix/methodHandle/afterStaticMethod3.java

@@ -1,3 +1,6 @@
+// void method()
+// String method(String)
+// String method(String, String[])
 import java.lang.invoke.*;
 
 class Main {

java/java-tests/testData/codeInsight/daemonCodeAnalyzer/quickFix/methodHandle/afterVirtualMethod.java

@@ -1,3 +1,6 @@
+// void method()
+// String method(String)
+// String method(String, String[])
 import java.lang.invoke.*;
 
 public class Main {

java/java-tests/testData/codeInsight/daemonCodeAnalyzer/quickFix/methodHandle/afterVirtualMethod2.java

@@ -1,3 +1,6 @@
+// void method()
+// String method(String)
+// String method(String, String[])
 import java.lang.invoke.*;
 
 class Main {
@@ -9,6 +12,6 @@ class Main {
 
 class Test {
   public void method() {}
-  public String method(String a) {return a;}
   public String method(String a, String... b) {return a;}
+  public String method(String a) {return a;}
 }

java/java-tests/testData/codeInsight/daemonCodeAnalyzer/quickFix/methodHandle/afterVirtualMethod3.java

@@ -1,3 +1,6 @@
+// void method()
+// String method(String)
+// String method(String, String[])
 import java.lang.invoke.*;
 
 class Main {
@@ -8,7 +11,7 @@ class Main {
 }
 
 class Test {
+  public String method(String a, String... b) {return a;}
   public void method() {}
   public String method(String a) {return a;}
-  public String method(String a, String... b) {return a;}
 }

java/java-tests/testData/codeInsight/daemonCodeAnalyzer/quickFix/methodHandle/beforeConstructor.java

@@ -1,3 +1,5 @@
+// Test()
+// Test(int)
 import java.lang.invoke.*;
 
 class Main {
@@ -8,6 +10,6 @@ class Main {
 }
 
 class Test {
-  public Test() {}
   public Test(int a) {}
+  public Test() {}
 }

java/java-tests/testData/codeInsight/daemonCodeAnalyzer/quickFix/methodHandle/beforeConstructor2.java

@@ -1,3 +1,4 @@
+// Test(int)
 import java.lang.invoke.*;
 
 class Main {

java/java-tests/testData/codeInsight/daemonCodeAnalyzer/quickFix/methodHandle/beforeConstructor3.java

@@ -1,3 +1,4 @@
+// Test()
 import java.lang.invoke.*;
 
 class Main {

java/java-tests/testData/codeInsight/daemonCodeAnalyzer/quickFix/methodHandle/beforeConstructor4.java

@@ -1,3 +1,5 @@
+// Test()
+// Test(int)
 import java.lang.invoke.*;
 
 class Main {

java/java-tests/testData/codeInsight/daemonCodeAnalyzer/quickFix/methodHandle/beforeGenericMethod.java

@@ -1,3 +1,6 @@
+// Object method(Object)
+// Object method(Object, Object[])
+// Object method(Object, String)
 import java.lang.invoke.*;
 
 class Main {

java/java-tests/testData/codeInsight/daemonCodeAnalyzer/quickFix/methodHandle/beforeGenericMethod2.java

@@ -1,3 +1,6 @@
+// Object method(Object)
+// Object method(Object, Object[])
+// Object method(Object, String)
 import java.lang.invoke.*;
 
 class Main {
@@ -9,6 +12,6 @@ class Main {
 
 class Test {
   public <T> T method(T a) {return null;}
-  public <T> T method(T a, T... b) {return null;}
   public <T> T method(T a, String b) {return null;}
+  public <T> T method(T a, T... b) {return null;}
 }

java/java-tests/testData/codeInsight/daemonCodeAnalyzer/quickFix/methodHandle/beforeGenericMethod3.java

@@ -1,3 +1,6 @@
+// Object method(Object)
+// Object method(Object, Object[])
+// Object method(Object, String)
 import java.lang.invoke.*;
 
 class Main {

java/java-tests/testData/codeInsight/daemonCodeAnalyzer/quickFix/methodHandle/beforeGenericMethod4.java

@@ -1,3 +1,6 @@
+// Object method(Object)
+// Object method(Object, Object[])
+// Object method(Object, String)
 import java.lang.invoke.*;
 
 class Main {

java/java-tests/testData/codeInsight/daemonCodeAnalyzer/quickFix/methodHandle/beforeStaticMethod.java

@@ -1,3 +1,6 @@
+// void method()
+// String method(String)
+// String method(String, String[])
 import java.lang.invoke.*;
 
 class Main {

java/java-tests/testData/codeInsight/daemonCodeAnalyzer/quickFix/methodHandle/beforeStaticMethod2.java

@@ -1,3 +1,6 @@
+// void method()
+// String method(String)
+// String method(String, String[])
 import java.lang.invoke.*;
 
 class Main {

java/java-tests/testData/codeInsight/daemonCodeAnalyzer/quickFix/methodHandle/beforeStaticMethod3.java

@@ -1,3 +1,6 @@
+// void method()
+// String method(String)
+// String method(String, String[])
 import java.lang.invoke.*;
 
 class Main {

java/java-tests/testData/codeInsight/daemonCodeAnalyzer/quickFix/methodHandle/beforeVirtualMethod.java

@@ -1,3 +1,6 @@
+// void method()
+// String method(String)
+// String method(String, String[])
 import java.lang.invoke.*;
 
 public class Main {

java/java-tests/testData/codeInsight/daemonCodeAnalyzer/quickFix/methodHandle/beforeVirtualMethod2.java

@@ -1,3 +1,6 @@
+// void method()
+// String method(String)
+// String method(String, String[])
 import java.lang.invoke.*;
 
 class Main {
@@ -9,6 +12,6 @@ class Main {
 
 class Test {
   public void method() {}
-  public String method(String a) {return a;}
   public String method(String a, String... b) {return a;}
+  public String method(String a) {return a;}
 }

java/java-tests/testData/codeInsight/daemonCodeAnalyzer/quickFix/methodHandle/beforeVirtualMethod3.java

@@ -1,3 +1,6 @@
+// void method()
+// String method(String)
+// String method(String, String[])
 import java.lang.invoke.*;
 
 class Main {
@@ -8,7 +11,7 @@ class Main {
 }
 
 class Test {
+  public String method(String a, String... b) {return a;}
   public void method() {}
   public String method(String a) {return a;}
-  public String method(String a, String... b) {return a;}
 }