From c659eea1934aa055c6dda697919c06aed92fc603 Mon Sep 17 00:00:00 2001
From: peter <peter@jetbrains.com>
Date: Thu, 24 Dec 2015 21:16:23 +0100
Subject: [PATCH] IDEA-149428 Suggested variable name on a chain of lambdas has
 a different name to the original

---
 ...unctionalExpressionCompletionProvider.java |  2 +-
 .../lambda/Normal8CompletionTest.groovy       | 30 +++++++++++++++++--
 2 files changed, 29 insertions(+), 3 deletions(-)

diff --git a/java/java-impl/src/com/intellij/codeInsight/completion/FunctionalExpressionCompletionProvider.java b/java/java-impl/src/com/intellij/codeInsight/completion/FunctionalExpressionCompletionProvider.java
index c42b487d8940..5ad4543848c3 100644
--- a/java/java-impl/src/com/intellij/codeInsight/completion/FunctionalExpressionCompletionProvider.java
+++ b/java/java-impl/src/com/intellij/codeInsight/completion/FunctionalExpressionCompletionProvider.java
@@ -259,6 +259,6 @@ public class FunctionalExpressionCompletionProvider extends CompletionProvider<C
   }
 
   private static String getParamName(PsiParameter param, JavaCodeStyleManager javaCodeStyleManager, PsiElement originalPosition) {
-    return javaCodeStyleManager.suggestUniqueVariableName(param.getName(), originalPosition, true);
+    return javaCodeStyleManager.suggestUniqueVariableName(param.getName(), originalPosition, false);
   }
 }
diff --git a/java/java-tests/testSrc/com/intellij/codeInsight/daemon/lambda/Normal8CompletionTest.groovy b/java/java-tests/testSrc/com/intellij/codeInsight/daemon/lambda/Normal8CompletionTest.groovy
index 85bc3fd99960..b7085e17fe58 100644
--- a/java/java-tests/testSrc/com/intellij/codeInsight/daemon/lambda/Normal8CompletionTest.groovy
+++ b/java/java-tests/testSrc/com/intellij/codeInsight/daemon/lambda/Normal8CompletionTest.groovy
@@ -66,12 +66,38 @@ interface I {
 }
 
 class Test {
-  public static void main(String[] args) {
+  public static void main(int x) {
     I i = <caret>
   }
 }"""
     def items = myFixture.completeBasic()
-    assert LookupElementPresentation.renderElement(items[0]).itemText == 'x -> {}'
+    assert LookupElementPresentation.renderElement(items[0]).itemText == 'x1 -> {}'
+  }
+
+  public void "test lambda signature duplicate parameter name"() {
+    myFixture.configureByText "a.java", """
+import java.util.function.Function;
+
+public class E {
+    public static void main(String[] args) {
+        Observable.just(new InterestingClass())
+                .doOnNext(interestingClass -> doSomething())
+                .doOnNext(inter<caret>)
+    }
+}
+
+class Observable {
+     static <T> Smth<T> just(T t) { }
+}
+
+class Smth<T> {
+    Smth<T> doOnNext(Function<T, Void> fun) { }
+}
+
+class InterestingClass {}
+"""
+    def items = myFixture.completeBasic()
+    assert LookupElementPresentation.renderElement(items[0]).itemText == 'interestingClass -> {}'
   }
 
   public void "test suggest this method references"() {