MDS/openide
1
0
Fork 0
mirror of https://gitflic.ru/project/openide/openide.git synced 2026-09-27 10:03:11 +07:00
Code Issues Packages Projects Releases Wiki Activity

push down: qualify this statement (IDEADEV-38933)

Browse Source
This commit is contained in:
anna
2009-10-08 11:47:58 +04:00
parent 47088e8341
commit 40a6a2a24c
4 changed files with 58 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files
java/java-impl/src/com/intellij/refactoring/memberPushDown/PushDownProcessor.java
+14 -5
View File
@@ -151,22 +151,28 @@ public class PushDownProcessor extends BaseRefactoringProcessor {
private void encodeRef(final PsiJavaCodeReferenceElement expression, final Set<PsiMember> movedMembers, final PsiElement toPut) {
final PsiElement resolved = expression.resolve();
if (resolved == null) return;
final PsiElement qualifier = expression.getQualifier();
for (PsiMember movedMember : movedMembers) {
if (movedMember.equals(resolved)) {
if (expression.getQualifier() == null) {
if (qualifier == null) {
toPut.putCopyableUserData(REMOVE_QUALIFIER_KEY, Boolean.TRUE);
} else {
final PsiElement qualifier = expression.getQualifier();
if (qualifier instanceof PsiJavaCodeReferenceElement &&
((PsiJavaCodeReferenceElement)qualifier).isReferenceTo(myClass)) {
toPut.putCopyableUserData(REPLACE_QUALIFIER_KEY, myClass);
}
}
} else if (movedMember instanceof PsiClass && PsiTreeUtil.getParentOfType(resolved, PsiClass.class, false) == movedMember) {
final PsiElement qualifier = expression.getQualifier();
if (qualifier instanceof PsiJavaCodeReferenceElement && ((PsiJavaCodeReferenceElement)qualifier).isReferenceTo(movedMember)) {
toPut.putCopyableUserData(REPLACE_QUALIFIER_KEY, (PsiClass)movedMember);
}
} else {
if (qualifier instanceof PsiThisExpression) {
final PsiJavaCodeReferenceElement qElement = ((PsiThisExpression)qualifier).getQualifier();
if (qElement != null && qElement.isReferenceTo(myClass)) {
toPut.putCopyableUserData(REPLACE_QUALIFIER_KEY, myClass);
}
}
}
}
}
@@ -215,7 +221,7 @@ public class PushDownProcessor extends BaseRefactoringProcessor {
PsiClass psiClass = toGet.getCopyableUserData(REPLACE_QUALIFIER_KEY);
if (psiClass != null) {
toGet.putCopyableUserData(REPLACE_QUALIFIER_KEY, null);
final PsiElement qualifier = ref.getQualifier();
PsiElement qualifier = ref.getQualifier();
if (qualifier != null) {
if (psiClass == myClass) {
@@ -225,10 +231,13 @@ public class PushDownProcessor extends BaseRefactoringProcessor {
LOG.assertTrue(psiClass != null);
}
if (ref instanceof PsiReferenceExpression) {
if (!(qualifier instanceof PsiThisExpression) && ref instanceof PsiReferenceExpression) {
((PsiReferenceExpression)ref).setQualifierExpression(factory.createReferenceExpression(psiClass));
}
else {
if (qualifier instanceof PsiThisExpression) {
qualifier = ((PsiThisExpression)qualifier).getQualifier();
}
qualifier.replace(factory.createReferenceElementByType(factory.createType(psiClass)));
}
}
java/java-tests/testData/refactoring/pushDown/ThisRefInAnonymous.java
+20
View File
@@ -0,0 +1,20 @@
class A {
void <caret>foo() {
new Runnable() {
public void run() {
A.this.toString();
}
}
}
void leaveIt() {
new Runnable() {
public void run() {
A.this.toString();
}
}
}
}
class B extends A {
}
java/java-tests/testData/refactoring/pushDown/ThisRefInAnonymous.java.after
+20
View File
@@ -0,0 +1,20 @@
class A {
void leaveIt() {
new Runnable() {
public void run() {
A.this.toString();
}
}
}
}
class B extends A {
void foo() {
new Runnable() {
public void run() {
B.this.toString();
}
}
}
}
java/java-tests/testSrc/com/intellij/refactoring/PushDownTest.java
+4
View File
@@ -88,4 +88,8 @@ public class PushDownTest extends LightCodeInsightTestCase {
public void testFieldAndStaticReferencedClass() throws Exception {
doTest();
}
public void testThisRefInAnonymous() throws Exception {
doTest();
}
}