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

inplace introduce: try our best to restore complex expressions during introduce (IDEA-80665)

Browse Source
This commit is contained in:
anna
2012-02-15 21:21:55 +01:00
parent f97b547a5b
commit a8dc6bc627
4 changed files with 137 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files
java/java-impl/src/com/intellij/refactoring/introduceParameter/AbstractJavaInplaceIntroducer.java
+10 -2
View File
@@ -132,8 +132,16 @@ public abstract class AbstractJavaInplaceIntroducer extends AbstractInplaceIntro
if (expression == null) {
expression = PsiTreeUtil.getParentOfType(refVariableElement, PsiExpression.class);
}
if (expression instanceof PsiReferenceExpression && expression.getParent() instanceof PsiMethodCallExpression) {
expression = (PsiExpression)expression.getParent();
while (expression instanceof PsiReferenceExpression) {
final PsiElement parent = expression.getParent();
if (parent instanceof PsiMethodCallExpression) {
if (parent.getText().equals(exprText)) return (PsiExpression)parent;
}
if (parent instanceof PsiExpression) {
expression = (PsiExpression)parent;
} else {
return null;
}
}
return expression != null && expression.isValid() && expression.getText().equals(exprText) ? expression : null;
}