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

AIOOBE

Browse Source
This commit is contained in:
anna
2009-12-22 23:29:47 +03:00
parent 9ddded39b9
commit ca159ebec2
4 changed files with 45 additions and 19 deletions
Download Patch File Download Diff File Expand all files Collapse all files

40
java/java-impl/src/com/intellij/refactoring/extractMethod/ExtractMethodUtil.java
View File

@@ -117,26 +117,28 @@ public class ExtractMethodUtil {
final PsiElementFactory factory = JavaPsiFacade.getInstance(manager.getProject()).getElementFactory();
if (!manager.areElementsEquivalent(oldTarget, newTarget)) {
final PsiParameter[] oldParameters = oldTarget.getParameterList().getParameters();
final PsiMethodCallExpression copy = (PsiMethodCallExpression)call.copy();
final PsiExpression[] args = copy.getArgumentList().getExpressions();
for (int i = 0; i < args.length; i++) {
PsiExpression arg = args[i];
PsiType paramType = i < oldParameters.length ? oldParameters[i].getType() : oldParameters[oldParameters.length - 1].getType();
final PsiTypeCastExpression cast = (PsiTypeCastExpression)factory.createExpressionFromText("(a)b", null);
final PsiTypeElement typeElement = cast.getCastType();
assert typeElement != null;
typeElement.replace(factory.createTypeElement(paramType));
final PsiExpression operand = cast.getOperand();
assert operand != null;
operand.replace(arg);
arg.replace(cast);
}
if (oldParameters.length > 0) {
final PsiMethodCallExpression copy = (PsiMethodCallExpression)call.copy();
final PsiExpression[] args = copy.getArgumentList().getExpressions();
for (int i = 0; i < args.length; i++) {
PsiExpression arg = args[i];
PsiType paramType = i < oldParameters.length ? oldParameters[i].getType() : oldParameters[oldParameters.length - 1].getType();
final PsiTypeCastExpression cast = (PsiTypeCastExpression)factory.createExpressionFromText("(a)b", null);
final PsiTypeElement typeElement = cast.getCastType();
assert typeElement != null;
typeElement.replace(factory.createTypeElement(paramType));
final PsiExpression operand = cast.getOperand();
assert operand != null;
operand.replace(arg);
arg.replace(cast);
}
for (int i = 0; i < copy.getArgumentList().getExpressions().length; i++) {
PsiExpression oldarg = call.getArgumentList().getExpressions()[i];
PsiTypeCastExpression cast = (PsiTypeCastExpression)copy.getArgumentList().getExpressions()[i];
if (!RedundantCastUtil.isCastRedundant(cast)) {
oldarg.replace(cast);
for (int i = 0; i < copy.getArgumentList().getExpressions().length; i++) {
PsiExpression oldarg = call.getArgumentList().getExpressions()[i];
PsiTypeCastExpression cast = (PsiTypeCastExpression)copy.getArgumentList().getExpressions()[i];
if (!RedundantCastUtil.isCastRedundant(cast)) {
oldarg.replace(cast);
}
}
}
}

8
java/java-tests/testData/refactoring/extractMethod/RecursiveCallToExtracted.java Normal file
View File

@@ -0,0 +1,8 @@
public class ExtractMethods {
void newMethod() {
int i = 0;
<selection>if (true) {
newMethod(i);
}</selection>
}
}

12
java/java-tests/testData/refactoring/extractMethod/RecursiveCallToExtracted_after.java Normal file
View File

@@ -0,0 +1,12 @@
public class ExtractMethods {
void newMethod() {
int i = 0;
newMethod(i);
}
private void newMethod(int i) {
if (true) {
newMethod(i);
}
}
}

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

@@ -420,6 +420,10 @@ public class ExtractMethodTest extends LightCodeInsightTestCase {
doTest();
}
public void testRecursiveCallToExtracted() throws Exception {
doTest();
}
private void doPrepareErrorTest(final String expectedMessage) throws Exception {
String expectedError = null;
try {