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-17 21:15:29 +03:00
parent 0708c9b735
commit c02afaeb04
11 changed files with 91 additions and 29 deletions
Download Patch File Download Diff File Expand all files Collapse all files
source/com/intellij/refactoring/move/moveInstanceMethod/InternalUsageInfo.java
+16 -7
View File
@@ -2,19 +2,28 @@ package com.intellij.refactoring.move.moveInstanceMethod;
import com.intellij.usageView.UsageInfo;
import com.intellij.psi.PsiReferenceExpression;
import com.intellij.psi.PsiElement;
import com.intellij.psi.PsiExpression;
import com.intellij.psi.PsiNewExpression;
import com.intellij.openapi.diagnostic.Logger;
/**
* @author ven
*/
public class InternalUsageInfo extends UsageInfo {
private final PsiReferenceExpression myReferenceExpression;
public InternalUsageInfo(final PsiReferenceExpression referenceExpression) {
super(referenceExpression);
myReferenceExpression = referenceExpression;
private static final Logger LOG = Logger.getInstance("#com.intellij.refactoring.move.moveInstanceMethod.InternalUsageInfo");
public InternalUsageInfo(final PsiElement referenceElement) {
super(referenceElement);
LOG.assertTrue(referenceElement instanceof PsiReferenceExpression || referenceElement instanceof PsiNewExpression);
}
public PsiReferenceExpression getReferenceExpression() {
return myReferenceExpression;
PsiExpression getQualifier () {
PsiElement element = getElement();
if (element instanceof PsiReferenceExpression) {
return ((PsiReferenceExpression)element).getQualifierExpression();
}
else if (element instanceof PsiNewExpression) return ((PsiNewExpression)element).getQualifier();
return null;
}
}
source/com/intellij/refactoring/move/moveInstanceMethod/MoveInstanceMethodDialog.java
+2 -1
View File
@@ -56,7 +56,8 @@ public class MoveInstanceMethodDialog extends MoveInstanceMethodDialogBase {
protected void doAction() {
final PsiVariable targetVariable = (PsiVariable)myList.getSelectedValue();
final String parameterName = myOldClassParameterNameField.getText().trim();
if (!myMethod.getManager().getNameHelper().isIdentifier(parameterName)) {
if (!myMethod.getManager().getNameHelper().isIdentifier(parameterName) &&
MoveMethodUtil.isOldThisNeeded (myMethod)) {
Messages.showErrorDialog(getProject(), "Please Enter a Valid name for Parameter", myRefactoringName);
return;
}
source/com/intellij/refactoring/move/moveInstanceMethod/MoveInstanceMethodHandler.java
+1 -1
View File
@@ -25,7 +25,7 @@ import java.util.List;
* @author ven
*/
public class MoveInstanceMethodHandler implements RefactoringActionHandler {
private static final Logger LOG = Logger.getInstance("#com.intellij.refactoring.convertToInstanceMethod.ConvertToInstanceMethodHandler");
private static final Logger LOG = Logger.getInstance("#com.intellij.refactoring.move.moveInstanceMethod.MoveInstanceMethodHandler");
static final String REFACTORING_NAME = "Move Instance Method";
public void invoke(Project project, Editor editor, PsiFile file, DataContext dataContext) {
source/com/intellij/refactoring/move/moveInstanceMethod/MoveInstanceMethodProcessor.java
+65 -19
View File
@@ -26,6 +26,7 @@ import java.util.*;
*/
public class MoveInstanceMethodProcessor extends BaseRefactoringProcessor{
private static final Logger LOG = Logger.getInstance("#com.intellij.refactoring.move.moveInstanceMethod.MoveInstanceMethodProcessor");
private final boolean myOldThisNeeded;
public PsiMethod getMethod() {
return myMethod;
@@ -57,6 +58,7 @@ public class MoveInstanceMethodProcessor extends BaseRefactoringProcessor{
final PsiClass targetClass = ((PsiClassType) type).resolve();
myTargetClass = targetClass;
myNewVisibility = newVisibility;
myOldThisNeeded = MoveMethodUtil.isOldThisNeeded(myMethod);
}
protected UsageViewDescriptor createUsageViewDescriptor(UsageInfo[] usages, FindUsagesCommand refreshCommand) {
@@ -134,13 +136,19 @@ public class MoveInstanceMethodProcessor extends BaseRefactoringProcessor{
final PsiCodeBlock body = myMethod.getBody();
if (body != null) {
body.accept(new PsiRecursiveElementVisitor() {
public void visitNewExpression(PsiNewExpression expression) {
if (MoveMethodUtil.isClassInstanceReference(expression, myMethod.getContainingClass())) {
usages.add(new InternalUsageInfo(expression));
}
}
public void visitReferenceExpression(PsiReferenceExpression expression) {
if (!expression.isQualified()) {
if (MoveMethodUtil.isClassInstanceReference(expression, myMethod.getContainingClass())) {
usages.add(new InternalUsageInfo(expression));
} else if (!expression.isQualified()) {
final PsiElement resolved = expression.resolve();
if (myTargetVariable.equals(resolved)) {
usages.add(new InternalUsageInfo(expression));
} else if (resolved instanceof PsiMember && ((PsiMember)resolved).getContainingClass().equals(myMethod.getContainingClass())) {
usages.add(new InternalUsageInfo(expression));
}
}
@@ -192,7 +200,7 @@ public class MoveInstanceMethodProcessor extends BaseRefactoringProcessor{
final PsiClass inheritor = ((InheritorUsageInfo)usage).getInheritor();
addMethodToClass(inheritor, patternMethod);
} else if (usage instanceof MethodCallUsageInfo) {
correctMethodCall (((MethodCallUsageInfo)usage).getMethodCallExpression());
correctMethodCall (((MethodCallUsageInfo)usage).getMethodCallExpression(), false);
} else if (usage instanceof JavadocUsageInfo) {
docRefs.add(usage.getElement().getReference());
}
@@ -213,17 +221,23 @@ public class MoveInstanceMethodProcessor extends BaseRefactoringProcessor{
}
}
private void correctMethodCall(final PsiMethodCallExpression expression) {
private void correctMethodCall(final PsiMethodCallExpression expression, boolean isInternalCall) {
try {
final PsiManager manager = myMethod.getManager();
PsiExpression qualifier = expression.getMethodExpression().getQualifierExpression();
if (qualifier == null) qualifier = manager.getElementFactory().createExpressionFromText("this", null);
final PsiExpression oldQualifier = expression.getMethodExpression().getQualifierExpression();
PsiExpression newQualifier = null;
if (myTargetVariable instanceof PsiParameter) {
final int index = myMethod.getParameterList().getParameterIndex((PsiParameter)myTargetVariable);
final PsiExpression[] arguments = expression.getArgumentList().getExpressions();
if (index < arguments.length) {
newQualifier = (PsiExpression)arguments[index].copy();
if (isInternalCall && (oldQualifier == null || isTrivialThisQualifier(oldQualifier))) {
//See MoveInstanceMethodTest.testRecursive
LOG.assertTrue(myOldThisNeeded);
newQualifier = manager.getElementFactory().createExpressionFromText(myOldClassParameterName, null);
}
else {
newQualifier = (PsiExpression)arguments[index].copy();
}
arguments[index].delete();
}
} else {
@@ -231,11 +245,15 @@ public class MoveInstanceMethodProcessor extends BaseRefactoringProcessor{
newQualifier = manager.getElementFactory().createExpressionFromText(myTargetVariable.getName(), null);
}
expression.getArgumentList().add(qualifier);
if (myOldThisNeeded) {
PsiExpression qualifier = expression.getMethodExpression().getQualifierExpression();
if (qualifier == null) qualifier = manager.getElementFactory().createExpressionFromText("this", null);
expression.getArgumentList().add(qualifier);
}
if (newQualifier != null) {
if ((newQualifier instanceof PsiThisExpression && ((PsiThisExpression)newQualifier).getQualifier() == null)) {
if (isTrivialThisQualifier(newQualifier)) {
//Remove redundant 'this' qualifier
final PsiExpression oldQualifier = expression.getMethodExpression().getQualifierExpression();
if (oldQualifier != null) oldQualifier.delete();
}
else {
@@ -250,6 +268,10 @@ public class MoveInstanceMethodProcessor extends BaseRefactoringProcessor{
}
}
private boolean isTrivialThisQualifier(final PsiExpression newQualifier) {
return newQualifier instanceof PsiThisExpression && ((PsiThisExpression)newQualifier).getQualifier() == null;
}
private PsiMethod addMethodToClass(final PsiClass aClass, final PsiMethod patternMethod) {
try {
final PsiMethod method = (PsiMethod)aClass.add(patternMethod);
@@ -279,18 +301,21 @@ public class MoveInstanceMethodProcessor extends BaseRefactoringProcessor{
public void visitReferenceExpression(PsiReferenceExpression expression) {
try {
final PsiExpression qualifier = expression.getQualifierExpression();
if (qualifier == null || qualifier instanceof PsiThisExpression) {
if (qualifier instanceof PsiReferenceExpression && ((PsiReferenceExpression)qualifier).isReferenceTo(variableCopy)) {
//Target is a field, replace target.m -> m
qualifier.delete();
} else {
final PsiElement resolved = expression.resolve();
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())) {
} else if (MoveMethodUtil.isClassInstanceReference(expression, methodCopy.getContainingClass())) {
PsiReferenceExpression qualified = (PsiReferenceExpression)factory.createExpressionFromText(myOldClassParameterName + ".f", null);
qualified.getReferenceNameElement().replace(expression.getReferenceNameElement());
expression.replace(qualified);
}
} else if (qualifier instanceof PsiReferenceExpression && ((PsiReferenceExpression)qualifier).isReferenceTo(variableCopy)) {
qualifier.delete(); }
}
super.visitReferenceExpression(expression);
}
catch (IncorrectOperationException e) {
@@ -298,10 +323,29 @@ public class MoveInstanceMethodProcessor extends BaseRefactoringProcessor{
}
}
public void visitNewExpression(PsiNewExpression expression) {
try {
final PsiExpression qualifier = expression.getQualifier();
if (qualifier instanceof PsiReferenceExpression && ((PsiReferenceExpression)qualifier).isReferenceTo(variableCopy)) {
//Target is a field, replace target.new A() -> new A()
qualifier.delete();
} else {
if (MoveMethodUtil.isClassInstanceReference(expression, methodCopy.getContainingClass())) {
if (qualifier != null) qualifier.delete();
final PsiExpression newExpression = factory.createExpressionFromText(myOldClassParameterName + "." + expression.getText(), null);
expression.replace(newExpression);
}
}
super.visitNewExpression(expression);
}
catch (IncorrectOperationException e) {
LOG.error(e);
}
}
public void visitMethodCallExpression(PsiMethodCallExpression expression) {
if (expression.getMethodExpression().isReferenceTo(myMethod)) {
correctMethodCall(expression);
correctMethodCall(expression, true);
}
super.visitMethodCallExpression(expression);
@@ -315,9 +359,11 @@ public class MoveInstanceMethodProcessor extends BaseRefactoringProcessor{
methodCopy.getParameterList().getParameters()[index].delete();
}
final PsiClassType type = factory.createType(myMethod.getContainingClass());
final PsiParameter parameter = factory.createParameter(myOldClassParameterName, type);
methodCopy.getParameterList().add(parameter);
if (myOldThisNeeded) {
final PsiClassType type = factory.createType(myMethod.getContainingClass());
final PsiParameter parameter = factory.createParameter(myOldClassParameterName, type);
methodCopy.getParameterList().add(parameter);
}
final List<PsiParameter> newParameters = Arrays.asList(methodCopy.getParameterList().getParameters());
RefactoringUtil.fixJavadocsForParams(methodCopy, new HashSet<PsiParameter>(newParameters));
source/com/intellij/refactoring/move/moveInstanceMethod/MoveInstanceMethodViewDescriptor.java
+1 -1
View File
@@ -31,7 +31,7 @@ public class MoveInstanceMethodViewDescriptor extends UsageViewDescriptorAdapter
}
public String getProcessedElementsHeader() {
return "Convert to instance method";
return "Move instance method";
}
public boolean canRefresh() {
testData/refactoring/moveInstanceMethod/Javadoc.java
+1
View File
@@ -7,6 +7,7 @@ public abstract class Test1 {
* @param f
*/
void <caret>foo (Foreign f) {
bar();
}
/**
testData/refactoring/moveInstanceMethod/Javadoc.java.after
+1
View File
@@ -3,6 +3,7 @@ class Foreign {
* @param test1
*/
void foo(Test1 test1) {
test1.bar();
}
}
testData/refactoring/moveInstanceMethod/Recursive.java
+1
View File
@@ -1,5 +1,6 @@
public class MoveMethodTest {
void <caret>foo (MoveMethodTest f) {
foo(f);
f.foo(f);
}
}
testData/refactoring/moveInstanceMethod/Recursive.java.after
+1
View File
@@ -1,6 +1,7 @@
public class MoveMethodTest {
void foo(MoveMethodTest moveMethodTest) {
moveMethodTest.foo(this);
foo(this);
}
}
testData/refactoring/moveInstanceMethod/WithInner.java
+1
View File
@@ -5,6 +5,7 @@ class Foreign {
public abstract class Test1 {
void <caret>foo (Foreign f, Inner i) {
new Inner();
}
class Inner {}
testData/refactoring/moveInstanceMethod/WithInner.java.after
+1
View File
@@ -1,5 +1,6 @@
class Foreign {
void foo(Test1.Inner i, Test1 test1) {
test1.new Inner();
}
class Inner {}