move method: new escalate visibility should be processed (IDEADEV-39711)

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

@@ -233,6 +233,7 @@ public class MoveInstanceMethodProcessor extends BaseRefactoringProcessor{
       for (PsiReference reference : docRefs) {
         reference.bindToElement(method);
       }
+      VisibilityUtil.fixVisibility(usages, method, myNewVisibility);
     }
     catch (IncorrectOperationException e) {
       LOG.error(e);

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

@@ -0,0 +1,9 @@
+public class EscalateVisibility {
+  public void x(B b){
+    yy(b);
+  }
+  private void y<caret>y(B b){
+  }
+}
+
+class B {}

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

@@ -0,0 +1,10 @@
+public class EscalateVisibility {
+  public void x(B b){
+    b.yy();
+  }
+}
+
+class B {
+    void yy(){
+}
+}

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

@@ -8,6 +8,7 @@ import com.intellij.refactoring.move.moveInstanceMethod.MoveInstanceMethodHandle
 import com.intellij.refactoring.move.moveInstanceMethod.MoveInstanceMethodProcessor;
 import com.intellij.testFramework.LightCodeInsightTestCase;
 import com.intellij.JavaTestUtil;
+import com.intellij.util.VisibilityUtil;
 
 /**
  * @author ven
@@ -44,7 +45,15 @@ public class MoveInstanceMethodTest extends LightCodeInsightTestCase {
 
   public void testIDEADEV11257() throws Exception { doTest(true, 0); }
 
+  public void testEscalateVisibility() throws Exception {
+    doTest(true, 0, VisibilityUtil.ESCALATE_VISIBILITY);
+  }
+
   private void doTest(boolean isTargetParameter, final int targetIndex) throws Exception {
+    doTest(isTargetParameter, targetIndex, null);
+  }
+
+  private void doTest(boolean isTargetParameter, final int targetIndex, final String newVisibility) throws Exception {
     final String filePath = "/refactoring/moveInstanceMethod/" + getTestName(false) + ".java";
     configureByFile(filePath);
     final PsiElement targetElement = TargetElementUtilBase.findTargetElement(getEditor(), TargetElementUtilBase.ELEMENT_NAME_ACCEPTED);
@@ -53,7 +62,7 @@ public class MoveInstanceMethodTest extends LightCodeInsightTestCase {
     final PsiVariable targetVariable = isTargetParameter ? method.getParameterList().getParameters()[targetIndex] :
                                        method.getContainingClass().getFields()[targetIndex];
     new MoveInstanceMethodProcessor(getProject(),
-                                    method, targetVariable, null, MoveInstanceMethodHandler.suggestParameterNames (method, targetVariable)).run();
+                                    method, targetVariable, newVisibility, MoveInstanceMethodHandler.suggestParameterNames (method, targetVariable)).run();
     checkResultByFile(filePath + ".after");
 
   }