From 246d10ad268dd834ddd21336e03c9f4cf7bc91ac Mon Sep 17 00:00:00 2001
From: peter <peter@jetbrains.com>
Date: Fri, 3 Mar 2017 17:02:54 +0100
Subject: [PATCH] IDEA-169028 Broken auto-import completion inside lambda

---
 .../codeInsight/completion/JavaChainLookupElement.java    | 6 +++---
 .../completion/normal/ChainInLambdaBinary.java            | 6 ++++++
 .../completion/normal/ChainInLambdaBinary_after.java      | 8 ++++++++
 .../codeInsight/completion/NormalCompletionTest.groovy    | 6 ++++++
 4 files changed, 23 insertions(+), 3 deletions(-)
 create mode 100644 java/java-tests/testData/codeInsight/completion/normal/ChainInLambdaBinary.java
 create mode 100644 java/java-tests/testData/codeInsight/completion/normal/ChainInLambdaBinary_after.java

diff --git a/java/java-impl/src/com/intellij/codeInsight/completion/JavaChainLookupElement.java b/java/java-impl/src/com/intellij/codeInsight/completion/JavaChainLookupElement.java
index 42a887134edb..7f3f8a33b0af 100644
--- a/java/java-impl/src/com/intellij/codeInsight/completion/JavaChainLookupElement.java
+++ b/java/java-impl/src/com/intellij/codeInsight/completion/JavaChainLookupElement.java
@@ -125,13 +125,13 @@ public class JavaChainLookupElement extends LookupElementDecorator<LookupElement
       document.insertString(qualifierContext.getTailOffset(), space + ")");
     }
 
-    final char atTail = document.getCharsSequence().charAt(context.getTailOffset() - 1);
+    char atTail = document.getCharsSequence().charAt(qualifierContext.getTailOffset());
     if (atTail != ';') {
       return;
     }
-    document.replaceString(context.getTailOffset() - 1, context.getTailOffset(), ".");
+    document.replaceString(qualifierContext.getTailOffset(), qualifierContext.getTailOffset() + 1, ".");
 
-    CompletionUtil.emulateInsertion(getDelegate(), context.getTailOffset(), context);
+    CompletionUtil.emulateInsertion(getDelegate(), qualifierContext.getTailOffset() + 1, context);
     context.commitDocument();
 
     int formatStart = context.getOffset(oldStart);
diff --git a/java/java-tests/testData/codeInsight/completion/normal/ChainInLambdaBinary.java b/java/java-tests/testData/codeInsight/completion/normal/ChainInLambdaBinary.java
new file mode 100644
index 000000000000..c7fedf80441e
--- /dev/null
+++ b/java/java-tests/testData/codeInsight/completion/normal/ChainInLambdaBinary.java
@@ -0,0 +1,6 @@
+public class SomeClass {
+    private void b() {
+        a(i -> PathUtil.toS<caret>s + "Hello");
+    }
+}
+
diff --git a/java/java-tests/testData/codeInsight/completion/normal/ChainInLambdaBinary_after.java b/java/java-tests/testData/codeInsight/completion/normal/ChainInLambdaBinary_after.java
new file mode 100644
index 000000000000..bc3eface9d52
--- /dev/null
+++ b/java/java-tests/testData/codeInsight/completion/normal/ChainInLambdaBinary_after.java
@@ -0,0 +1,8 @@
+import pkg.PathUtil;
+
+public class SomeClass {
+    private void b() {
+        a(i -> PathUtil.toSystemDependentName()<caret> s + "Hello");
+    }
+}
+
diff --git a/java/java-tests/testSrc/com/intellij/codeInsight/completion/NormalCompletionTest.groovy b/java/java-tests/testSrc/com/intellij/codeInsight/completion/NormalCompletionTest.groovy
index 8766484401ff..4347c57af0ea 100644
--- a/java/java-tests/testSrc/com/intellij/codeInsight/completion/NormalCompletionTest.groovy
+++ b/java/java-tests/testSrc/com/intellij/codeInsight/completion/NormalCompletionTest.groovy
@@ -1763,4 +1763,10 @@ class Bar {
     checkResultByFile(getTestName(false) + ".java")
   }
 
+  void testChainInLambdaBinary() {
+    codeStyleSettings.ALIGN_MULTILINE_BINARY_OPERATION = true
+    myFixture.addClass("package pkg; public class PathUtil { public static String toSystemDependentName() {} }")
+    doTest('\n')
+  }
+
 }