StreamApiMigrationInspection: chained computeIfAbsent generated incorrect code

java/java-impl/src/com/intellij/codeInspection/streamMigration/StreamApiMigrationInspection.java

@@ -324,7 +324,7 @@ public class StreamApiMigrationInspection extends BaseJavaBatchLocalInspectionTo
         PsiExpression body = LambdaUtil.extractSingleExpressionFromBody(lambda.getBody());
         if (!(body instanceof PsiNewExpression)) return false;
         PsiExpressionList ctorArgs = ((PsiNewExpression)body).getArgumentList();
-        return ctorArgs != null && ctorArgs.getExpressions().length == 0;
+        return ctorArgs != null && ctorArgs.getExpressions().length == 0 && extractQualifierClass(tb, qualifierCall) != null;
       }
     }
     return false;

java/java-tests/testData/codeInsight/daemonCodeAnalyzer/quickFix/streamApiMigration/afterComputeIfAbsentChained.java

@@ -0,0 +1,11 @@
+// "Replace with forEach" "true"
+
+import java.util.*;
+
+public class Main {
+  private Map<Integer, Map<Integer, List<String>>> test(String... list) {
+    Map<Integer, Map<Integer, List<String>>> map = new HashMap<>();
+      Arrays.stream(list).filter(Objects::nonNull).forEach(s -> map.computeIfAbsent(s.length(), k -> new HashMap<>()).computeIfAbsent(s.length(), k -> new ArrayList<>()).add(s));
+    return map;
+  }
+}

java/java-tests/testData/codeInsight/daemonCodeAnalyzer/quickFix/streamApiMigration/beforeComputeIfAbsentChained.java

@@ -0,0 +1,15 @@
+// "Replace with forEach" "true"
+
+import java.util.*;
+
+public class Main {
+  private Map<Integer, Map<Integer, List<String>>> test(String... list) {
+    Map<Integer, Map<Integer, List<String>>> map = new HashMap<>();
+    for(String s : li<caret>st) {
+      if(s != null) {
+        map.computeIfAbsent(s.length(), k -> new HashMap<>()).computeIfAbsent(s.length(), k -> new ArrayList<>()).add(s);
+      }
+    }
+    return map;
+  }
+}