lambda -> anonym: additionally process method calls as they may clash with resulted class methods (IDEA-120469)

plugins/IntentionPowerPak/src/com/siyeh/ipp/types/ReplaceLambdaWithAnonymousIntention.java

@@ -83,6 +83,13 @@ public class ReplaceLambdaWithAnonymousIntention extends Intention {
           }
         }
 
+        @Override
+        public void visitMethodCallExpression(PsiMethodCallExpression expression) {
+          super.visitMethodCallExpression(expression);
+          if (thisAccessExpr != null && expression.getMethodExpression().getQualifierExpression() == null) {
+            replacements.put(expression, psiElementFactory.createExpressionFromText(thisAccessExpr.getText() + "." + expression.getText(), expression));
+          }
+        }
       });
       for (PsiElement psiElement : replacements.keySet()) {
         psiElement.replace(replacements.get(psiElement));

plugins/IntentionPowerPak/test/com/siyeh/ipp/types/lambda2anonymous/QualifyThis1.java

@@ -0,0 +1,12 @@
+import java.util.function.Consumer;
+import java.util.function.Function;
+
+public interface Observable<T> {
+  void subscribe(Consumer<T> consumer);
+
+  default  <R> Observable<R> map(Function<T, R> f) {
+    return cons<caret>umer -> subscribe(null);
+  }
+
+
+}

plugins/IntentionPowerPak/test/com/siyeh/ipp/types/lambda2anonymous/QualifyThis1_after.java

@@ -0,0 +1,17 @@
+import java.util.function.Consumer;
+import java.util.function.Function;
+
+public interface Observable<T> {
+  void subscribe(Consumer<T> consumer);
+
+  default  <R> Observable<R> map(Function<T, R> f) {
+    return new Observable<R>() {
+        @Override
+        public void subscribe(Consumer<T> consumer) {
+            Observable.this.subscribe(null);
+        }
+    };
+  }
+
+
+}

plugins/IntentionPowerPak/testSrc/com/siyeh/ipp/types/ReplaceLambdaWithAnonymousIntentionTest.java

@@ -71,6 +71,10 @@ public class ReplaceLambdaWithAnonymousIntentionTest extends IPPTestCase {
     doTest();
   }
 
+  public void testQualifyThis1() {
+    doTest();
+  }
+
   @Override
   protected String getIntentionName() {
     return IntentionPowerPackBundle.message("replace.lambda.with.anonymous.intention.name");