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

BoolUtils#getNegatedExpressionText: push negation down into || and &&

Browse Source
This commit is contained in:
Tagir Valeev
2017-04-10 16:08:16 +07:00
parent 21a30b344d
commit d0bd812d05
2 changed files with 41 additions and 23 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
java/java-tests/testData/codeInsight/daemonCodeAnalyzer/quickFix/streamApiMigration/afterContinueOr.java
View File

@@ -8,7 +8,7 @@ public class Main {
}
public long test(List<Person> collection) {
long i = collection.stream().filter(person -> !(person == null || person.getAge() < 10)).mapToLong(Person::getAge).sum();
long i = collection.stream().filter(person -> person != null && person.getAge() >= 10).mapToLong(Person::getAge).sum();
return i;
}
}

62
plugins/InspectionGadgets/InspectionGadgetsAnalysis/src/com/siyeh/ig/psiutils/BoolUtils.java
View File

@@ -15,8 +15,10 @@
*/
package com.siyeh.ig.psiutils;
import com.intellij.openapi.util.text.StringUtil;
import com.intellij.psi.*;
import com.intellij.psi.tree.IElementType;
import com.intellij.util.Function;
import org.jetbrains.annotations.Contract;
import org.jetbrains.annotations.NonNls;
import org.jetbrains.annotations.NotNull;
@@ -77,41 +79,57 @@ public class BoolUtils {
':' + getNegatedExpressionText(conditionalExpression.getElseExpression());
return needParenthesis ? "(" + text + ")" : text;
}
else if (isNegation(expression)) {
if (isNegation(expression)) {
final PsiExpression negated = getNegated(expression);
if (negated == null) {
return "";
}
return ParenthesesUtils.getText(negated, precedence);
}
else if (ComparisonUtils.isComparison(expression)) {
if (expression instanceof PsiPolyadicExpression) {
final PsiPolyadicExpression polyadicExpression = (PsiPolyadicExpression)expression;
final String negatedComparison = ComparisonUtils.getNegatedComparison(polyadicExpression.getOperationTokenType());
final StringBuilder result = new StringBuilder();
IElementType tokenType = polyadicExpression.getOperationTokenType();
final PsiExpression[] operands = polyadicExpression.getOperands();
final boolean isEven = (operands.length & 1) != 1;
for (int i = 0, length = operands.length; i < length; i++) {
final PsiExpression operand = operands[i];
if (TypeUtils.hasFloatingPointType(operand)) {
// preserve semantics for NaNs
return "!(" + polyadicExpression.getText() + ')';
}
if (i > 0) {
if (isEven && (i & 1) != 1) {
final PsiJavaToken token = polyadicExpression.getTokenBeforeOperand(operand);
if (token != null) {
result.append(token.getText());
if (ComparisonUtils.isComparison(polyadicExpression)) {
final String negatedComparison = ComparisonUtils.getNegatedComparison(tokenType);
final StringBuilder result = new StringBuilder();
final boolean isEven = (operands.length & 1) != 1;
for (int i = 0, length = operands.length; i < length; i++) {
final PsiExpression operand = operands[i];
if (TypeUtils.hasFloatingPointType(operand)) {
// preserve semantics for NaNs
return "!(" + polyadicExpression.getText() + ')';
}
if (i > 0) {
if (isEven && (i & 1) != 1) {
final PsiJavaToken token = polyadicExpression.getTokenBeforeOperand(operand);
if (token != null) {
result.append(token.getText());
}
}
else {
result.append(negatedComparison);
}
}
else {
result.append(negatedComparison);
}
result.append(operand.getText());
}
result.append(operand.getText());
return result.toString();
}
if(tokenType.equals(JavaTokenType.ANDAND) || tokenType.equals(JavaTokenType.OROR)) {
String targetToken = tokenType.equals(JavaTokenType.ANDAND) ? "||" : "&&";
Function<PsiElement, String> replacer = child -> {
if (child instanceof PsiExpression) {
return getNegatedExpressionText((PsiExpression)child);
}
if (child instanceof PsiJavaToken && ((PsiJavaToken)child).getTokenType().equals(tokenType)) {
return targetToken;
}
return child.getText();
};
return StringUtil.join(polyadicExpression.getChildren(), replacer, "");
}
return result.toString();
}
else return '!' + ParenthesesUtils.getText(expression, ParenthesesUtils.PREFIX_PRECEDENCE);
return '!' + ParenthesesUtils.getText(expression, ParenthesesUtils.PREFIX_PRECEDENCE);
}
@Nullable