IDEA-161250 Semicolon added in the middle of code

java/java-impl/src/com/intellij/codeInsight/completion/JavaCompletionUtil.java

@@ -802,12 +802,12 @@ public class JavaCompletionUtil {
         }
 
         boolean insertAdditionalSemicolon = true;
-        final PsiReferenceExpression referenceExpression = PsiTreeUtil.getTopmostParentOfType(context.getFile().findElementAt(context.getStartOffset()), PsiReferenceExpression.class);
-        if (referenceExpression instanceof PsiMethodReferenceExpression && LambdaHighlightingUtil
-          .insertSemicolon(referenceExpression.getParent())) {
+        PsiElement leaf = context.getFile().findElementAt(context.getStartOffset());
+        PsiElement composite = leaf == null ? null : leaf.getParent();
+        if (composite instanceof PsiMethodReferenceExpression && LambdaHighlightingUtil.insertSemicolon(composite.getParent())) {
           insertAdditionalSemicolon = false;
-        } else if (referenceExpression != null) {
-          PsiElement parent = referenceExpression.getParent();
+        } else if (composite instanceof PsiReferenceExpression) {
+          PsiElement parent = composite.getParent();
           if (parent instanceof PsiMethodCallExpression) {
             parent = parent.getParent();
           }

java/java-tests/testData/codeInsight/daemonCodeAnalyzer/lambda/completion/normal/NoSemicolonAfterVoidMethodInLambda.java

@@ -0,0 +1,5 @@
+public class Util {
+  {
+      foo(() -> System.out.print<caret>).bar();
+  }
+}

java/java-tests/testData/codeInsight/daemonCodeAnalyzer/lambda/completion/normal/NoSemicolonAfterVoidMethodInLambda_after.java

@@ -0,0 +1,5 @@
+public class Util {
+  {
+      foo(() -> System.out.println()<caret>).bar();
+  }
+}

java/java-tests/testSrc/com/intellij/codeInsight/completion/Normal8CompletionTest.groovy

@@ -259,4 +259,10 @@ class Test88 {
   void testNoCollectorsInComment() { doAntiTest() }
 
   void testNoContinueInsideLambdaInLoop() { doAntiTest(); }
+
+  void testNoSemicolonAfterVoidMethodInLambda() {
+    configureByTestName()
+    myFixture.type('l\t')
+    checkResultByFile(getTestName(false) + "_after.java")
+  }
 }