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

extract method: pre/post expressions checks fixed (IDEA-65476 )

Browse Source
This commit is contained in:
anna
2011-02-14 14:14:32 +01:00
parent c13f2df920
commit 9b28b9cf01
4 changed files with 53 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files
java/java-impl/src/com/intellij/refactoring/extractMethod/ExtractMethodProcessor.java
+11 -4
View File
@@ -51,6 +51,7 @@ import com.intellij.psi.search.GlobalSearchScope;
import com.intellij.psi.search.LocalSearchScope;
import com.intellij.psi.search.SearchScope;
import com.intellij.psi.search.searches.ReferencesSearch;
import com.intellij.psi.tree.IElementType;
import com.intellij.psi.util.PsiFormatUtil;
import com.intellij.psi.util.PsiTreeUtil;
import com.intellij.psi.util.PsiUtil;
@@ -736,10 +737,16 @@ public class ExtractMethodProcessor implements MatchProvider {
if (myExpression instanceof PsiAssignmentExpression) {
expression2Replace = ((PsiAssignmentExpression)myExpression).getRExpression();
} else if (myExpression instanceof PsiPostfixExpression || myExpression instanceof PsiPrefixExpression) {
PsiExpression operand = myExpression instanceof PsiPostfixExpression ? ((PsiPostfixExpression)myExpression).getOperand() :
((PsiPrefixExpression)myExpression).getOperand();
expression2Replace =
((PsiBinaryExpression)myExpression.replace(myElementFactory.createExpressionFromText(operand.getText() + " + x", operand))).getROperand();
final IElementType elementType = myExpression instanceof PsiPostfixExpression
? ((PsiPostfixExpression)myExpression).getOperationTokenType()
: ((PsiPrefixExpression)myExpression).getOperationTokenType();
if (elementType == JavaTokenType.PLUSPLUS || elementType == JavaTokenType.MINUSMINUS) {
PsiExpression operand = myExpression instanceof PsiPostfixExpression ? ((PsiPostfixExpression)myExpression).getOperand() :
((PsiPrefixExpression)myExpression).getOperand();
expression2Replace =
((PsiBinaryExpression)myExpression.replace(myElementFactory.createExpressionFromText(operand.getText() + " + x", operand))).getROperand();
}
}
myExpression = (PsiExpression)IntroduceVariableBase.replace(expression2Replace, myMethodCall, myProject);
myMethodCall = PsiTreeUtil.getParentOfType(myExpression.findElementAt(myExpression.getText().indexOf(myMethodCall.getText())), PsiMethodCallExpression.class);
java/java-tests/testData/refactoring/extractMethod/FoldInWhile.java
+17
View File
@@ -0,0 +1,17 @@
class Test {
String[] foo() {
return null;
}
boolean bar(String s) {
return false;
}
void foooooo() {
String[] modules = foo();
int i = 0;
while (i < modules.length && <selection>!bar(modules[i])</selection>) {
i++;
}
}
}
java/java-tests/testData/refactoring/extractMethod/FoldInWhile_after.java
+21
View File
@@ -0,0 +1,21 @@
class Test {
String[] foo() {
return null;
}
boolean bar(String s) {
return false;
}
void foooooo() {
String[] modules = foo();
int i = 0;
while (i < modules.length && newMethod(modules[i])) {
i++;
}
}
private boolean newMethod(String module) {
return !bar(module);
}
}
java/java-tests/testSrc/com/intellij/refactoring/ExtractMethodTest.java
+4
View File
@@ -479,6 +479,10 @@ public class ExtractMethodTest extends LightCodeInsightTestCase {
doTest();
}
public void testFoldInWhile() throws Exception {
doTest();
}
private void doPrepareErrorTest(final String expectedMessage) throws Exception {
String expectedError = null;
try {