IDEA-184154 Use Comparator combinator fix produces red code

java/java-tests/testData/codeInsight/daemonCodeAnalyzer/quickFix/comparatorCombinators/afterExplicitLambdaParameters.java

@@ -0,0 +1,15 @@
+// "Replace with Comparator.comparing" "true"
+
+import java.util.Comparator;
+public class MyTest {
+  void setComparator(Comparator<?> comparator) {
+  }
+
+  String getValue() {
+    return "";
+  }
+
+  {
+    setComparator(Comparator.comparing(MyTest::getValue));
+  }
+}

java/java-tests/testData/codeInsight/daemonCodeAnalyzer/quickFix/comparatorCombinators/afterExplicitLambdaParameters2.java

@@ -0,0 +1,15 @@
+// "Replace with Comparator.comparing" "true"
+
+import java.util.Comparator;
+public class MyTest {
+  void setComparator(Comparator<?> comparator) {
+  }
+
+  String getValue(int x) {
+    return "";
+  }
+
+  {
+    setComparator(Comparator.comparing((MyTest o) -> o.getValue(0)));
+  }
+}

java/java-tests/testData/codeInsight/daemonCodeAnalyzer/quickFix/comparatorCombinators/beforeExplicitLambdaParameters.java

@@ -0,0 +1,15 @@
+// "Replace with Comparator.comparing" "true"
+
+import java.util.Comparator;
+public class MyTest {
+  void setComparator(Comparator<?> comparator) {
+  }
+
+  String getValue() {
+    return "";
+  }
+
+  {
+    setComparator((MyTest o1, <caret>MyTest o2) -> o1.getValue().compareTo(o2.getValue()));
+  }
+}

java/java-tests/testData/codeInsight/daemonCodeAnalyzer/quickFix/comparatorCombinators/beforeExplicitLambdaParameters2.java

@@ -0,0 +1,15 @@
+// "Replace with Comparator.comparing" "true"
+
+import java.util.Comparator;
+public class MyTest {
+  void setComparator(Comparator<?> comparator) {
+  }
+
+  String getValue(int x) {
+    return "";
+  }
+
+  {
+    setComparator((MyTest o1, <caret>MyTest o2) -> o1.getValue(0).compareTo(o2.getValue(0)));
+  }
+}

plugins/InspectionGadgets/src/com/intellij/codeInspection/ComparatorCombinatorsInspection.java

@@ -334,13 +334,16 @@ public class ComparatorCombinatorsInspection extends AbstractBaseJavaLocalInspec
       return null;
     }
     if (methodName == null) return null;
-    String parameterName = leftVar.getName();
     String text;
     if (!methodName.startsWith("comparing")) {
       text = "java.util.Comparator." + methodName + "()";
     }
     else {
-      text = "java.util.Comparator." + methodName + "(" + (parameterName + " -> " + left.getText()) + ")";
+      String parameterName = leftVar.getName();
+      PsiTypeElement typeElement = leftVar.getTypeElement();
+      String parameterDeclaration = typeElement == null ? parameterName : "(" + typeElement.getText() + " " + parameterName + ")";
+      text = "java.util.Comparator." + methodName + "(" +
+             (parameterDeclaration + " -> " + left.getText()) + ")";
     }
     return text;
   }