redundant lambda code block: check void compatible lambdas for ambiguity conflicts

java/java-analysis-impl/src/com/intellij/codeInspection/RedundantLambdaCodeBlockInspection.java

@@ -77,7 +77,7 @@ public class RedundantLambdaCodeBlockInspection extends BaseJavaBatchLocalInspec
         if (body instanceof PsiCodeBlock) {
           PsiExpression psiExpression = getExpression((PsiCodeBlock)body);
           if (psiExpression != null && !findCommentsOutsideExpression(body, psiExpression)) {
-            if (!expression.isVoidCompatible() && LambdaUtil.isExpressionStatementExpression(psiExpression)) {
+            if (LambdaUtil.isExpressionStatementExpression(psiExpression)) {
               final PsiElement parent = PsiUtil.skipParenthesizedExprUp(expression.getParent());
               if (parent instanceof PsiExpressionList) {
                 final PsiElement gParent = parent.getParent();

java/java-tests/testData/codeInsight/daemonCodeAnalyzer/quickFix/lambdaCodeBlock2Expr/beforeVoidValueChangedConflict.java

@@ -0,0 +1,29 @@
+// "Replace with expression lambda" "false"
+import java.util.HashSet;
+import java.util.Set;
+
+class Test {
+  public static void main(String[] args) {
+    Set<String> strings = new HashSet<>();
+    new Test().query(pResultSet -> <caret>{
+      strings.add("Col1");
+    });
+  }
+
+  public void query(RowCallbackHandler rch){
+    System.out.println();
+  }
+
+  public Object query( final ResultSetExtractor rse) {
+    return null;
+  }
+}
+
+interface RowCallbackHandler {
+  void processRow(ResultSet var1);
+}
+
+interface ResultSetExtractor {
+  Object extractData(ResultSet var1);
+}
+class ResultSet {}