MDS/openide
1
0
Fork 0
mirror of https://gitflic.ru/project/openide/openide.git synced 2026-01-06 03:21:12 +07:00
Code Issues Packages Projects Releases Wiki Activity

rename: context class should be chosen when qualify conflict ref (IDEA-83928)

Browse Source
This commit is contained in:
anna
2012-04-04 16:23:52 +02:00
parent db78c2d427
commit f7e384c39d
4 changed files with 34 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

7
java/java-impl/src/com/intellij/refactoring/rename/RenameJavaMemberProcessor.java
View File

@@ -87,9 +87,14 @@ public abstract class RenameJavaMemberProcessor extends RenamePsiElementProcesso
ref = (PsiReferenceExpression)factory.createExpressionFromText("this." + name, context);
return ref;
}
while (contextClass != null && !InheritanceUtil.isInheritorOrSelf(contextClass, containingClass, true)) {
contextClass = PsiTreeUtil.getParentOfType(contextClass, PsiClass.class, true);
}
ref = (PsiReferenceExpression) factory.createExpressionFromText("A.this." + name, null);
qualifier = ((PsiThisExpression)ref.getQualifierExpression()).getQualifier();
final PsiJavaCodeReferenceElement classReference = factory.createClassReferenceElement(containingClass);
final PsiJavaCodeReferenceElement classReference = factory.createClassReferenceElement(contextClass != null ? contextClass : containingClass);
qualifier.replace(classReference);
}
return ref;

12
java/java-tests/testData/refactoring/renameCollisions/RenameFieldInSuper.java Normal file
View File

@@ -0,0 +1,12 @@
class A {
boolean _g<caret>g;
}
class B extends A {
class FF {
public void setGG(boolean gg) {
_gg = gg;
}
}
}

12
java/java-tests/testData/refactoring/renameCollisions/RenameFieldInSuper.java.after Normal file
View File

@@ -0,0 +1,12 @@
class A {
boolean gg;
}
class B extends A {
class FF {
public void setGG(boolean gg) {
B.this.gg = gg;
}
}
}

4
java/java-tests/testSrc/com/intellij/refactoring/RenameCollisionsTest.java
View File

@@ -184,6 +184,10 @@ public class RenameCollisionsTest extends LightRefactoringTestCase {
public void testRenameStaticMethodTypeParameter() throws Exception {
doTest("E");
}
public void testRenameFieldInSuper() throws Exception {
doTest("gg");
}
private void doTest(final String newName) throws Exception {
configureByFile(BASE_PATH + getTestName(false) + ".java");