From b06e29417226cedf8a2be6f2370623c5c08c44c6 Mon Sep 17 00:00:00 2001
From: anna <anna.kozlova@jetbrains.com>
Date: Mon, 18 Jan 2010 17:34:23 +0300
Subject: [PATCH] move method: remove qualifier after calls corrections

---
 .../MoveInstanceMethodProcessor.java            |  2 +-
 .../moveInstanceMethod/SameNames.java           | 13 +++++++++++++
 .../moveInstanceMethod/SameNames.java.after     | 14 ++++++++++++++
 .../moveInstanceMethod/SameNamesRecursion.java  | 16 ++++++++++++++++
 .../SameNamesRecursion.java.after               | 17 +++++++++++++++++
 .../moveMethod/MoveInstanceMethodTest.java      |  8 ++++++++
 6 files changed, 69 insertions(+), 1 deletion(-)
 create mode 100644 java/java-tests/testData/refactoring/moveInstanceMethod/SameNames.java
 create mode 100644 java/java-tests/testData/refactoring/moveInstanceMethod/SameNames.java.after
 create mode 100644 java/java-tests/testData/refactoring/moveInstanceMethod/SameNamesRecursion.java
 create mode 100644 java/java-tests/testData/refactoring/moveInstanceMethod/SameNamesRecursion.java.after

diff --git a/java/java-impl/src/com/intellij/refactoring/move/moveInstanceMethod/MoveInstanceMethodProcessor.java b/java/java-impl/src/com/intellij/refactoring/move/moveInstanceMethod/MoveInstanceMethodProcessor.java
index f1df59f881c3..aa9cb6ee38dc 100644
--- a/java/java-impl/src/com/intellij/refactoring/move/moveInstanceMethod/MoveInstanceMethodProcessor.java
+++ b/java/java-impl/src/com/intellij/refactoring/move/moveInstanceMethod/MoveInstanceMethodProcessor.java
@@ -440,8 +440,8 @@ public class MoveInstanceMethodProcessor extends BaseRefactoringProcessor{
           }
 
           @Override public void visitMethodCallExpression(PsiMethodCallExpression expression) {
-            super.visitMethodCallExpression(expression);
             correctMethodCall(expression, true);
+            super.visitMethodCallExpression(expression);
           }
         });
       }
diff --git a/java/java-tests/testData/refactoring/moveInstanceMethod/SameNames.java b/java/java-tests/testData/refactoring/moveInstanceMethod/SameNames.java
new file mode 100644
index 000000000000..8e4f612f69c6
--- /dev/null
+++ b/java/java-tests/testData/refactoring/moveInstanceMethod/SameNames.java
@@ -0,0 +1,13 @@
+public class A {
+    void f<caret>oo(B b) {
+      b.foo("");
+    }
+}
+
+class B {
+  void foo(String s) {
+    System.out.println(s);
+  }
+}
+
+
diff --git a/java/java-tests/testData/refactoring/moveInstanceMethod/SameNames.java.after b/java/java-tests/testData/refactoring/moveInstanceMethod/SameNames.java.after
new file mode 100644
index 000000000000..4f43b5a55947
--- /dev/null
+++ b/java/java-tests/testData/refactoring/moveInstanceMethod/SameNames.java.after
@@ -0,0 +1,14 @@
+public class A {
+}
+
+class B {
+  void foo(String s) {
+    System.out.println(s);
+  }
+
+    void foo() {
+      foo("");
+    }
+}
+
+
diff --git a/java/java-tests/testData/refactoring/moveInstanceMethod/SameNamesRecursion.java b/java/java-tests/testData/refactoring/moveInstanceMethod/SameNamesRecursion.java
new file mode 100644
index 000000000000..432d05cc8181
--- /dev/null
+++ b/java/java-tests/testData/refactoring/moveInstanceMethod/SameNamesRecursion.java
@@ -0,0 +1,16 @@
+public class A {
+    void f<caret>oo(B b) {
+      b.foo("");
+      if (false) {
+        foo(b);
+      }
+  }
+}
+
+class B {
+  void foo(String s) {
+    System.out.println(s);
+  }
+}
+
+
diff --git a/java/java-tests/testData/refactoring/moveInstanceMethod/SameNamesRecursion.java.after b/java/java-tests/testData/refactoring/moveInstanceMethod/SameNamesRecursion.java.after
new file mode 100644
index 000000000000..645c95c4c533
--- /dev/null
+++ b/java/java-tests/testData/refactoring/moveInstanceMethod/SameNamesRecursion.java.after
@@ -0,0 +1,17 @@
+public class A {
+}
+
+class B {
+  void foo(String s) {
+    System.out.println(s);
+  }
+
+    void foo() {
+      foo("");
+      if (false) {
+        foo();
+      }
+  }
+}
+
+
diff --git a/java/java-tests/testSrc/com/intellij/refactoring/moveMethod/MoveInstanceMethodTest.java b/java/java-tests/testSrc/com/intellij/refactoring/moveMethod/MoveInstanceMethodTest.java
index 10306747e235..83fbac9585fd 100644
--- a/java/java-tests/testSrc/com/intellij/refactoring/moveMethod/MoveInstanceMethodTest.java
+++ b/java/java-tests/testSrc/com/intellij/refactoring/moveMethod/MoveInstanceMethodTest.java
@@ -49,6 +49,14 @@ public class MoveInstanceMethodTest extends LightCodeInsightTestCase {
     doTest(true, 0, VisibilityUtil.ESCALATE_VISIBILITY);
   }
 
+  public void testSameNames() throws Exception {
+    doTest(true, 0);
+  }
+  
+  public void testSameNamesRecursion() throws Exception {
+    doTest(true, 0);
+  }
+
   private void doTest(boolean isTargetParameter, final int targetIndex) throws Exception {
     doTest(isTargetParameter, targetIndex, null);
   }