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

TrivialFunctionalExpressionUsageInspection: fixed hasNameConflict

Browse Source
This commit is contained in:
Tagir Valeev
2019-02-07 10:59:07 +07:00
parent 5de8f58f34
commit 7f32ba7cde
1 changed files with 5 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files
plugins/InspectionGadgets/src/com/intellij/codeInspection/TrivialFunctionalExpressionUsageInspection.java
+5 -4
View File
@@ -226,7 +226,7 @@ public class TrivialFunctionalExpressionUsageInspection extends AbstractBaseJava
statement = ObjectUtils.tryCast(statements[statements.length - 1], PsiReturnStatement.class);
if (anchor != null) {
PsiElement gParent = anchor.getParent();
if (hasNameConflict(statements, anchor)) {
if (hasNameConflict(statements, anchor, element)) {
gParent.addBefore(JavaPsiFacade.getElementFactory(element.getProject()).createStatementFromText(ct.text(body), anchor), anchor);
}
else {
@@ -246,15 +246,16 @@ public class TrivialFunctionalExpressionUsageInspection extends AbstractBaseJava
ct.deleteAndRestoreComments(callExpression);
}
}
private static boolean hasNameConflict(PsiStatement[] statements, PsiElement anchor) {
private static boolean hasNameConflict(PsiStatement[] statements, PsiElement anchor, PsiLambdaExpression lambda) {
Predicate<PsiVariable> allowedVar = variable -> PsiTreeUtil.isAncestor(lambda, variable, true);
JavaCodeStyleManager manager = JavaCodeStyleManager.getInstance(anchor.getProject());
return StreamEx.of(statements).select(PsiDeclarationStatement.class)
.flatArray(PsiDeclarationStatement::getDeclaredElements)
.select(PsiNamedElement.class)
.map(PsiNamedElement::getName)
.nonNull()
.anyMatch(name -> !name.equals(manager.suggestUniqueVariableName(name, anchor, true)));
.anyMatch(name -> !name.equals(manager.suggestUniqueVariableName(name, anchor, allowedVar)));
}
private static void inlineCallArguments(PsiMethodCallExpression callExpression,