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

(no message)

Browse Source
This commit is contained in:
Eugene Vigdorchik
2005-02-03 13:03:27 +03:00
parent 65bf522606
commit c7c2e89f3d
1 changed files with 4 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files
source/com/intellij/refactoring/move/moveInstanceMethod/MoveInstanceMethodProcessor.java
+4 -5
View File
@@ -281,15 +281,14 @@ public class MoveInstanceMethodProcessor extends BaseRefactoringProcessor{
final PsiExpression qualifier = expression.getQualifierExpression();
if (qualifier == null || qualifier instanceof PsiThisExpression) {
final PsiElement resolved = expression.resolve();
if (resolved instanceof PsiMember && ((PsiMember)resolved).getContainingClass().equals(methodCopy.getContainingClass())) {
if (variableCopy.equals(resolved)) {
PsiThisExpression thisExpression = (PsiThisExpression)factory.createExpressionFromText("this", null);
expression.replace(thisExpression);
} else if (resolved instanceof PsiMember && ((PsiMember)resolved).getContainingClass().equals(methodCopy.getContainingClass())) {
PsiReferenceExpression qualified = (PsiReferenceExpression)factory.createExpressionFromText(myOldClassParameterName + ".f", null);
qualified.getReferenceNameElement().replace(expression.getReferenceNameElement());
expression.replace(qualified);
}
else if (variableCopy.equals(resolved)) {
PsiThisExpression thisExpression = (PsiThisExpression)factory.createExpressionFromText("this", null);
expression.replace(thisExpression);
}
} else if (qualifier instanceof PsiReferenceExpression && ((PsiReferenceExpression)qualifier).isReferenceTo(variableCopy)) {
qualifier.delete(); }
super.visitReferenceExpression(expression);