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

inline: show conflict when method is used in method reference

Browse Source
This commit is contained in:
anna
2012-10-09 17:54:32 +02:00
parent c87933a213
commit c4695e9e30
1 changed files with 4 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files
java/java-impl/src/com/intellij/refactoring/inline/InlineMethodProcessor.java
+4
View File
@@ -191,6 +191,9 @@ public class InlineMethodProcessor extends BaseRefactoringProcessor {
if (element instanceof PsiDocMethodOrFieldRef && !PsiTreeUtil.isAncestor(myMethod, element, false)) {
conflicts.putValue(element, "Inlined method is used in javadoc");
}
if (element instanceof PsiMethodReferenceExpression) {
conflicts.putValue(element, "Inlined method is used in method reference");
}
}
}
@@ -426,6 +429,7 @@ public class InlineMethodProcessor extends BaseRefactoringProcessor {
PsiReferenceExpression[] refs = refExprList.toArray(new PsiReferenceExpression[refExprList.size()]);
refs = addBracesWhenNeeded(refs);
for (PsiReferenceExpression ref : refs) {
if (ref instanceof PsiMethodReferenceExpression) continue;
inlineMethodCall(ref);
}
for (PsiElement psiElement : imports2Delete) {