move instance method: correct this refs inside local classes

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

@@ -415,7 +415,7 @@ public class MoveInstanceMethodProcessor extends BaseRefactoringProcessor{
                 return;
               }
               if (myTargetVariable.equals(resolved)) {
-                PsiThisExpression thisExpression = (PsiThisExpression)factory.createExpressionFromText("this", null);
+                PsiThisExpression thisExpression = RefactoringUtil.createThisExpression(manager, PsiTreeUtil.isAncestor(myMethod, PsiTreeUtil.getParentOfType(expression, PsiClass.class), true) ? myTargetClass : null);
                 replaceMap.put(expression, thisExpression);
                 return;
               }

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

@@ -0,0 +1,14 @@
+class A {
+  void ba<caret>r(B b) {
+    new Runnable() {
+      @Override
+      public void run() {
+        System.out.println(b);
+      }
+    }.run();
+  }
+}
+
+class B {
+
+}

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

@@ -0,0 +1,14 @@
+class A {
+}
+
+class B {
+
+    void bar() {
+      new Runnable() {
+        @Override
+        public void run() {
+          System.out.println(B.this);
+        }
+      }.run();
+    }
+}

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

@@ -65,7 +65,10 @@ public class MoveInstanceMethodTest extends LightRefactoringTestCase {
   public void testSameNames() throws Exception {
     doTest(true, 0);
   }
-  
+  public void testCorrectThisRefs() throws Exception {
+    doTest(true, 0);
+  }
+   
   public void testSameNamesRecursion() throws Exception {
     doTest(true, 0);
   }