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

StreamApiMigrationInspection: support postfix limit conversion (like if(count++ > 100) break; => limit(102)) (IDEA-CR-16910)

Browse Source
This commit is contained in:
Tagir Valeev
2016-12-21 13:45:42 +07:00
parent fa956bd50c
commit 6341a52ccd
3 changed files with 40 additions and 12 deletions
Download Patch File Download Diff File Expand all files Collapse all files

28
java/java-impl/src/com/intellij/codeInspection/streamMigration/StreamApiMigrationInspection.java
View File

@@ -315,7 +315,6 @@ public class StreamApiMigrationInspection extends BaseJavaBatchLocalInspectionTo
PsiExpression counter = PsiUtil.skipParenthesizedExprDown(limitOp.getCountExpression());
if (tb.isEmpty()) {
// like "if(++count == limit) break"
if(!(counter instanceof PsiPrefixExpression)) return false;
variable = getIncrementedVariable(counter, tb, nonFinalVariables);
} else if (!ExpressionUtils.isReferenceTo(counter, variable)) {
return false;
@@ -1097,12 +1096,13 @@ public class StreamApiMigrationInspection extends BaseJavaBatchLocalInspectionTo
}
static class LimitOp extends Operation {
private final boolean myInclusive;
private final PsiExpression myCounter;
private final int myDelta;
LimitOp(@Nullable Operation previousOp, PsiExpression counter, PsiExpression expression, PsiVariable variable, boolean inclusive) {
LimitOp(@Nullable Operation previousOp, PsiExpression counter, PsiExpression expression, PsiVariable variable, int delta) {
super(previousOp, expression, variable);
myInclusive = inclusive;
LOG.assertTrue(delta >= 0);
myDelta = delta;
myCounter = counter;
}
@@ -1116,16 +1116,16 @@ public class StreamApiMigrationInspection extends BaseJavaBatchLocalInspectionTo
}
private String getLimitExpression() {
if(!myInclusive) {
if(myDelta == 0) {
return myExpression.getText();
}
if (myExpression instanceof PsiLiteralExpression) {
Object value = ((PsiLiteralExpression)myExpression).getValue();
if (value instanceof Integer || value instanceof Long) {
return String.valueOf(((Number)value).longValue() + 1);
return String.valueOf(((Number)value).longValue() + myDelta);
}
}
return ParenthesesUtils.getText(myExpression, ParenthesesUtils.ADDITIVE_PRECEDENCE) + "+1";
return ParenthesesUtils.getText(myExpression, ParenthesesUtils.ADDITIVE_PRECEDENCE) + "+" + myDelta;
}
}
@@ -1553,16 +1553,17 @@ public class StreamApiMigrationInspection extends BaseJavaBatchLocalInspectionTo
if(!ComparisonUtils.isComparison(binOp)) return this;
String comparison = filter.isNegated() ? ComparisonUtils.getNegatedComparison(binOp.getOperationTokenType())
: binOp.getOperationSign().getText();
boolean inclusive = false, flipped = false;
boolean flipped = false;
int delta = 0;
switch (comparison) {
case "==":
case ">=":
break;
case ">":
inclusive = true;
delta = 1;
break;
case "<":
inclusive = true;
delta = 1;
flipped = true;
break;
case "<=":
@@ -1571,14 +1572,17 @@ public class StreamApiMigrationInspection extends BaseJavaBatchLocalInspectionTo
default:
return this;
}
PsiExpression counter = flipped ? binOp.getROperand() : binOp.getLOperand();
PsiExpression counter = PsiUtil.skipParenthesizedExprDown(flipped ? binOp.getROperand() : binOp.getLOperand());
if(counter == null || VariableAccessUtils.variableIsUsed(myVariable, counter)) return this;
PsiExpression limit = flipped ? binOp.getLOperand() : binOp.getROperand();
if(!ExpressionUtils.isSimpleExpression(limit) || VariableAccessUtils.variableIsUsed(myVariable, limit)) return this;
PsiType type = limit.getType();
if(!PsiType.INT.equals(type) && !PsiType.LONG.equals(type)) return this;
if(counter instanceof PsiPostfixExpression) {
delta++;
}
LimitOp limitOp = new LimitOp(filter.getPreviousOp(), counter, limit, myVariable, inclusive);
LimitOp limitOp = new LimitOp(filter.getPreviousOp(), counter, limit, myVariable, delta);
return new TerminalBlock(limitOp, myVariable, statements);
}

10
java/java-tests/testData/codeInsight/daemonCodeAnalyzer/quickFix/streamApiMigration/afterLimitCountPostfix.java Normal file
View File

@@ -0,0 +1,10 @@
// "Replace with count()" "true"
import java.util.Arrays;
public class Main {
public long test(String[] array) {
long longStrings = Arrays.stream(array).map(String::trim).filter(trimmed -> trimmed.length() > 10).limit(102).count();
return longStrings;
}
}

14
java/java-tests/testData/codeInsight/daemonCodeAnalyzer/quickFix/streamApiMigration/beforeLimitCountPostfix.java Normal file
View File

@@ -0,0 +1,14 @@
// "Replace with count()" "true"
public class Main {
public long test(String[] array) {
long longStrings = 0;
for(String str : a<caret>rray) {
String trimmed = str.trim();
if(trimmed.length() > 10) {
if(longStrings++ > 100) break;
}
}
return longStrings;
}
}