move members: do not escalate visibility when usages are moved together (IDEA-70796 )

java/java-impl/src/com/intellij/refactoring/move/moveMembers/MoveMembersProcessor.java

@@ -231,7 +231,13 @@ public class MoveMembersProcessor extends BaseRefactoringProcessor {
 
     if (myNewVisibility == null) return;
 
-    VisibilityUtil.fixVisibility(usages, newMember, myNewVisibility);
+    final List<UsageInfo> filtered = new ArrayList<UsageInfo>();
+    for (UsageInfo usage : usages) {
+      if (usage instanceof MoveMembersUsageInfo && ((MoveMembersUsageInfo)usage).member == newMember) {
+        filtered.add(usage);
+      }
+    }
+    VisibilityUtil.fixVisibility(filtered.toArray(new UsageInfo[filtered.size()]), newMember, myNewVisibility);
   }
 
   protected boolean preprocessUsages(Ref<UsageInfo[]> refUsages) {

java/java-tests/testData/refactoring/moveMembers/untouchedVisibility/after/pack1/A.java

@@ -0,0 +1,20 @@
+/*
+ * Copyright 2000-2011 JetBrains s.r.o.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+package pack1;
+
+public class A {
+
+}

java/java-tests/testData/refactoring/moveMembers/untouchedVisibility/after/pack1/C.java

@@ -0,0 +1,23 @@
+/*
+ * Copyright 2000-2011 JetBrains s.r.o.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+package pack1;
+public class C {
+    public static void foo() {
+        bar();
+    }
+
+    private static void bar(){}
+}

java/java-tests/testData/refactoring/moveMembers/untouchedVisibility/after/pack2/B.java

@@ -0,0 +1,22 @@
+/*
+ * Copyright 2000-2011 JetBrains s.r.o.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+package pack2;
+import pack1.*;
+public class B {
+  protected B(){
+    C.foo();
+  }
+}

java/java-tests/testData/refactoring/moveMembers/untouchedVisibility/before/pack1/A.java

@@ -0,0 +1,24 @@
+/*
+ * Copyright 2000-2011 JetBrains s.r.o.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+package pack1;
+
+public class A {
+    public static void foo() {
+        bar();
+    }
+
+    private static void bar(){}
+}

java/java-tests/testData/refactoring/moveMembers/untouchedVisibility/before/pack1/C.java

@@ -0,0 +1,17 @@
+/*
+ * Copyright 2000-2011 JetBrains s.r.o.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+package pack1;
+public class C {}

java/java-tests/testData/refactoring/moveMembers/untouchedVisibility/before/pack2/B.java

@@ -0,0 +1,22 @@
+/*
+ * Copyright 2000-2011 JetBrains s.r.o.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+package pack2;
+import pack1.*;
+public class B {
+  protected B(){
+    A.foo();
+  }
+}

java/java-tests/testSrc/com/intellij/refactoring/MoveMembersTest.java

@@ -76,6 +76,10 @@ public class MoveMembersTest extends MultiFileTestCase {
     doTest("pack1.A", "pack1.C", 0);
   }
 
+  public void testUntouchedVisibility() throws Exception {
+    doTest("pack1.A", "pack1.C", 0, 1);
+  }
+
   public void testOtherPackageImport() throws Exception {
     doTest("pack1.ClassWithStaticMethod", "pack2.OtherClass", 1);
   }