rename: qualify to avoid undiagnosed shadowing ( IDEA-20634 )

java/java-tests/testData/refactoring/renameCollisions/RenameInnerInSuperClass.java

@@ -0,0 +1,19 @@
+class A {
+  class <caret>B {
+    int x = 42;
+  }
+}
+
+public class D {
+  static class C extends A {
+    int x = 23;
+
+    int m() {
+      return C.this.x;
+    }
+  }
+
+  public static void main(String[] args) {
+    System.out.println(new C().m());
+  }
+}

java/java-tests/testData/refactoring/renameCollisions/RenameInnerInSuperClass.java.after

@@ -0,0 +1,19 @@
+class A {
+  class C {
+    int x = 42;
+  }
+}
+
+public class D {
+  static class C extends A {
+    int x = 23;
+
+    int m() {
+      return D.C.this.x;
+    }
+  }
+
+  public static void main(String[] args) {
+    System.out.println(new C().m());
+  }
+}

java/java-tests/testData/refactoring/renameCollisions/RenameInnerInSuperClassStatic.java

@@ -0,0 +1,19 @@
+class A {
+  static class <caret>B {
+    static int x = 42;
+  }
+}
+
+public class D {
+  static class C extends A {
+    static int x = 23;
+
+    static int m() {
+      return C.x;
+    }
+  }
+
+  public static void main(String[] args) {
+    System.out.println(C.m());
+  }
+}

java/java-tests/testData/refactoring/renameCollisions/RenameInnerInSuperClassStatic.java.after

@@ -0,0 +1,19 @@
+class A {
+  static class C {
+    static int x = 42;
+  }
+}
+
+public class D {
+  static class C extends A {
+    static int x = 23;
+
+    static int m() {
+      return D.C.x;
+    }
+  }
+
+  public static void main(String[] args) {
+    System.out.println(D.C.m());
+  }
+}

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

@@ -160,6 +160,14 @@ public class RenameCollisionsTest extends LightCodeInsightTestCase {
     doTest("P");
   }
 
+  public void testRenameInnerInSuperClass() throws Exception {
+    doTest("C");
+  }
+
+  public void testRenameInnerInSuperClassStatic() throws Exception {
+    doTest("C");
+  }
+
   private void doTest(final String newName) throws Exception {
     configureByFile(BASE_PATH + getTestName(false) + ".java");
     PsiElement element = TargetElementUtilBase