lambda -> anonym: qualify without making expressions invalid (IDEA-157725)

plugins/InspectionGadgets/src/com/siyeh/ig/style/ReplaceLambdaWithAnonymousInspection.java

@@ -37,8 +37,7 @@ import org.jetbrains.annotations.Nls;
 import org.jetbrains.annotations.NotNull;
 import org.jetbrains.annotations.Nullable;
 
-import java.util.List;
-import java.util.Map;
+import java.util.*;
 
 public class ReplaceLambdaWithAnonymousInspection extends BaseInspection {
   private static final Logger LOG = Logger.getInstance("#" + ReplaceLambdaWithAnonymousInspection.class.getName());
@@ -123,7 +122,7 @@ public class ReplaceLambdaWithAnonymousInspection extends BaseInspection {
       final PsiThisExpression thisAccessExpr = thisClass instanceof PsiAnonymousClass ? null : RefactoringChangeUtil
         .createThisExpression(lambdaExpression.getManager(), thisClass);
       ChangeContextUtil.decodeContextInfo(blockFromText, thisClass, thisAccessExpr);
-      final Map<PsiElement, PsiElement> replacements = new HashMap<PsiElement, PsiElement>();
+      final Set<PsiExpression> replacements = new HashSet<>();
       blockFromText.accept(new JavaRecursiveElementWalkingVisitor() {
         @Override
         public void visitClass(PsiClass aClass) {}
@@ -132,7 +131,7 @@ public class ReplaceLambdaWithAnonymousInspection extends BaseInspection {
         public void visitSuperExpression(PsiSuperExpression expression) {
           super.visitSuperExpression(expression);
           if (expression.getQualifier() == null) {
-            replacements.put(expression, psiElementFactory.createExpressionFromText(thisClassName + "." + expression.getText(), expression));
+            replacements.add(expression);
           }
         }
 
@@ -141,14 +140,23 @@ public class ReplaceLambdaWithAnonymousInspection extends BaseInspection {
           super.visitMethodCallExpression(expression);
           if (thisAccessExpr != null) {
             final PsiMethod psiMethod = expression.resolveMethod();
-            if (psiMethod != null && !psiMethod.hasModifierProperty(PsiModifier.STATIC) && expression.getMethodExpression().getQualifierExpression() == null) {
-              replacements.put(expression, psiElementFactory.createExpressionFromText(thisAccessExpr.getText() + "." + expression.getText(), expression));
+            final PsiReferenceExpression methodExpression = expression.getMethodExpression();
+            if (psiMethod != null && !psiMethod.hasModifierProperty(PsiModifier.STATIC) && methodExpression.getQualifierExpression() == null) {
+              replacements.add(expression);
             }
           }
         }
       });
-      for (PsiElement psiElement : replacements.keySet()) {
-        psiElement.replace(replacements.get(psiElement));
+      for (PsiExpression expression : replacements) {
+        if (expression instanceof PsiSuperExpression) {
+          expression.replace(psiElementFactory.createExpressionFromText(thisClassName + "." + expression.getText(), expression));
+        }
+        else if (expression instanceof PsiMethodCallExpression) {
+          ((PsiMethodCallExpression)expression).getMethodExpression().setQualifierExpression(thisAccessExpr);
+        }
+        else {
+          LOG.error("Unexpected expression");
+        }
       }
     }
   }

plugins/InspectionGadgets/test/com/siyeh/igfixes/style/lambda2anonymous/QualifyThisAndSuperInside.after.java

@@ -0,0 +1,33 @@
+class T {
+  static class A {
+    final String n;
+
+    A(String n) {
+      this.n = n;
+    }
+
+    void f(String s) {
+      System.out.println(s + " " + n);
+    }
+  }
+
+  static class B extends A {
+    B(String n) {
+      super(n);
+    }
+
+    void f2(String s) {
+      new Thread(new Runnable() {
+          @Override
+          public void run() {
+              B.this.f(s + " " + B.super.n);
+          }
+      }).start();
+    }
+  }
+
+  public static void main(String[] args) {
+    new A("a").f("run");
+    new B("b").f2("run");
+  }
+}

plugins/InspectionGadgets/test/com/siyeh/igfixes/style/lambda2anonymous/QualifyThisAndSuperInside.java

@@ -0,0 +1,28 @@
+class T {
+  static class A {
+    final String n;
+
+    A(String n) {
+      this.n = n;
+    }
+
+    void f(String s) {
+      System.out.println(s + " " + n);
+    }
+  }
+
+  static class B extends A {
+    B(String n) {
+      super(n);
+    }
+
+    void f2(String s) {
+      new Thread(() <caret>-> f(s + " " + super.n)).start();
+    }
+  }
+
+  public static void main(String[] args) {
+    new A("a").f("run");
+    new B("b").f2("run");
+  }
+}

plugins/InspectionGadgets/testsrc/com/siyeh/ig/fixes/style/ReplaceLambdaWithAnonymousFixTest.java

@@ -87,6 +87,10 @@ public class ReplaceLambdaWithAnonymousFixTest extends IGQuickFixesTestCase {
     doTest();
   }
 
+  public void testQualifyThisAndSuperInside() throws Exception {
+    doTest();
+  }
+
   public void testStaticCalls() {
     doTest();
   }