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

remove redundant casts when extract changed parameter type accordingly (IDEA-79743)

Browse Source
This commit is contained in:
Anna Kozlova
2012-02-02 11:03:55 +04:00
parent 41c22fd6b9
commit 7d870ed603
6 changed files with 67 additions and 28 deletions
Download Patch File Download Diff File Expand all files Collapse all files
java/java-impl/src/com/intellij/codeInspection/redundantCast/RedundantCastInspection.java
+1 -27
View File
@@ -28,7 +28,6 @@ import com.intellij.openapi.util.WriteExternalException;
import com.intellij.psi.*;
import com.intellij.psi.util.PsiUtil;
import com.intellij.psi.util.RedundantCastUtil;
import com.intellij.util.IncorrectOperationException;
import com.intellij.util.containers.IntArrayList;
import org.jdom.Element;
import org.jetbrains.annotations.NonNls;
@@ -139,7 +138,7 @@ public class RedundantCastInspection extends GenericsInspectionToolBase {
PsiElement castTypeElement = descriptor.getPsiElement();
PsiTypeCastExpression cast = castTypeElement == null ? null : (PsiTypeCastExpression)castTypeElement.getParent();
if (cast != null) {
removeCast(cast);
RedundantCastUtil.removeCast(cast);
}
}
@@ -163,29 +162,4 @@ public class RedundantCastInspection extends GenericsInspectionToolBase {
public String getShortName() {
return SHORT_NAME;
}
private static void removeCast(PsiTypeCastExpression castExpression) {
if (castExpression == null) return;
PsiExpression operand = castExpression.getOperand();
if (operand instanceof PsiParenthesizedExpression) {
final PsiParenthesizedExpression parExpr = (PsiParenthesizedExpression)operand;
operand = parExpr.getExpression();
}
if (operand == null) return;
PsiElement toBeReplaced = castExpression;
PsiElement parent = castExpression.getParent();
while (parent instanceof PsiParenthesizedExpression) {
toBeReplaced = parent;
parent = parent.getParent();
}
try {
toBeReplaced.replace(operand);
}
catch (IncorrectOperationException e) {
LOG.error(e);
}
}
}
java/java-impl/src/com/intellij/refactoring/extractMethod/ExtractMethodProcessor.java
+17
View File
@@ -758,6 +758,23 @@ public class ExtractMethodProcessor implements MatchProvider {
adjustFinalParameters(newMethod);
for (int i = 0, length = myVariableDatum.length; i < length; i++) {
ParameterTablePanel.VariableData data = myVariableDatum[i];
final PsiVariable variable = data.variable;
final PsiParameter psiParameter = newMethod.getParameterList().getParameters()[i];
if (!TypeConversionUtil.isAssignable(variable.getType(), psiParameter.getType())) {
for (PsiReference reference : ReferencesSearch.search(psiParameter, new LocalSearchScope(body))){
final PsiElement element = reference.getElement();
if (element != null) {
final PsiElement parent = element.getParent();
if (parent instanceof PsiTypeCastExpression) {
RedundantCastUtil.removeCast((PsiTypeCastExpression)parent);
}
}
}
}
}
myExtractedMethod = (PsiMethod)myTargetClass.addAfter(newMethod, myAnchor);
if (isNeedToChangeCallContext() && myNeedChangeContext) {
ChangeContextUtil.decodeContextInfo(myExtractedMethod, myTargetClass, RefactoringUtil.createThisExpression(myManager, null));