move instance method should qualify field access if there is a parameter with the same name (IDEA-43009)

java/java-impl/src/com/intellij/refactoring/move/moveInstanceMethod/MoveInstanceMethodProcessor.java

@@ -388,12 +388,20 @@ public class MoveInstanceMethodProcessor extends BaseRefactoringProcessor{
           @Override public void visitReferenceExpression(PsiReferenceExpression expression) {
             try {
               final PsiExpression qualifier = expression.getQualifierExpression();
+              final PsiElement resolved = expression.resolve();
               if (qualifier instanceof PsiReferenceExpression && ((PsiReferenceExpression)qualifier).isReferenceTo(myTargetVariable)) {
+                if (resolved instanceof PsiField) {
+                  for (PsiParameter parameter : myMethod.getParameterList().getParameters()) {
+                    if (Comparing.strEqual(parameter.getName(), ((PsiField)resolved).getName())) {
+                      qualifier.replace(factory.createExpressionFromText("this", null));
+                      return;
+                    }
+                  }
+                }
                 //Target is a field, replace target.m -> m
                 qualifier.delete();
                 return;
               }
-              final PsiElement resolved = expression.resolve();
               if (myTargetVariable.equals(resolved)) {
                 PsiThisExpression thisExpression = (PsiThisExpression)factory.createExpressionFromText("this", null);
                 expression.replace(thisExpression);

java/java-tests/testData/refactoring/moveInstanceMethod/QualifyFieldAccess.java

@@ -0,0 +1,12 @@
+public class Test {
+
+    private Bar bar = new Bar();
+
+    public void <caret>foo(int x) {
+        bar.x = x;
+    }
+
+    private static class Bar {
+        private int x;
+    }
+}

java/java-tests/testData/refactoring/moveInstanceMethod/QualifyFieldAccess.java.after

@@ -0,0 +1,12 @@
+public class Test {
+
+    private Bar bar = new Bar();
+
+    private static class Bar {
+        private int x;
+
+        public void foo(int x) {
+            this.x = x;
+        }
+    }
+}

java/java-tests/testData/refactoring/moveInstanceMethod/StripFieldQualifier.java

@@ -0,0 +1,12 @@
+public class Test {
+
+    private Bar bar = new Bar();
+
+    public void <caret>foo(int y) {
+        bar.x = y;
+    }
+
+    private static class Bar {
+        private int x;
+    }
+}

java/java-tests/testData/refactoring/moveInstanceMethod/StripFieldQualifier.java.after

@@ -0,0 +1,12 @@
+public class Test {
+
+    private Bar bar = new Bar();
+
+    private static class Bar {
+        private int x;
+
+        public void foo(int y) {
+            x = y;
+        }
+    }
+}

java/java-tests/testSrc/com/intellij/refactoring/moveMethod/MoveInstanceMethodTest.java

@@ -57,6 +57,14 @@ public class MoveInstanceMethodTest extends LightCodeInsightTestCase {
     doTest(true, 0);
   }
 
+  public void testQualifyFieldAccess() throws Exception {
+    doTest(false, 0);
+  }
+
+  public void testStripFieldQualifier() throws Exception {
+    doTest(false, 0);
+  }
+
   private void doTest(boolean isTargetParameter, final int targetIndex) throws Exception {
     doTest(isTargetParameter, targetIndex, null);
   }