highlighting: don't add warning for nested lambda when problem is inside upper level (IDEA-155192)

java/java-psi-api/src/com/intellij/psi/infos/MethodCandidateInfo.java

@@ -456,7 +456,7 @@ public class MethodCandidateInfo extends CandidateInfo{
   public String getParentInferenceErrorMessage(PsiExpressionList list) {
     String errorMessage = getInferenceErrorMessage();
     while (errorMessage == null) {
-      list = PsiTreeUtil.getParentOfType(list, PsiExpressionList.class, true);
+      list = PsiTreeUtil.getParentOfType(list, PsiExpressionList.class, true, PsiCodeBlock.class);
       if (list == null) {
         break;
       }

java/java-tests/testData/codeInsight/daemonCodeAnalyzer/lambda/newLambda/DontWarnAboutNestedLambdaForAProblemInOuter.java

@@ -0,0 +1,11 @@
+import java.util.Set;
+
+class Test {
+  void foo(Set<String> outer, Set<String> inner) {
+    outer.stream().map((String f)-> {
+      inner.stream().filter(
+        (String s)->{return true;}
+      );
+    <error descr="Missing return statement">}</error>);
+  }
+}

java/java-tests/testSrc/com/intellij/codeInsight/daemon/lambda/NewLambdaHighlightingTest.java

@@ -312,6 +312,10 @@ public class NewLambdaHighlightingTest extends LightDaemonAnalyzerTestCase {
     doTest();
   }
 
+  public void testDontWarnAboutNestedLambdaForAProblemInOuter() throws Exception {
+    doTest();
+  }
+
   private void doTest() {
     doTest(false);
   }