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

StreamToLoop: support array slice (Arrays.stream(arr, from, to))

Browse Source
This commit is contained in:
Tagir Valeev
2017-09-18 17:29:06 +07:00
parent 70802074d0
commit d7f09f6cdd
3 changed files with 79 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files

57
java/java-impl/src/com/intellij/codeInspection/streamToLoop/SourceOperation.java
View File

@@ -28,6 +28,7 @@ import org.jetbrains.annotations.NotNull;
import org.jetbrains.annotations.Nullable;
import java.util.Arrays;
import java.util.Objects;
import java.util.function.Consumer;
import static com.intellij.codeInspection.streamToLoop.FunctionHelper.replaceVarReference;
@@ -106,6 +107,14 @@ abstract class SourceOperation extends Operation {
CommonClassNames.JAVA_UTIL_ARRAYS.equals(className)) {
return new ForEachSource(args[0]);
}
if (name.equals("stream") &&
args.length == 3 &&
CommonClassNames.JAVA_UTIL_ARRAYS.equals(className) &&
args[0].getType() != null &&
PsiType.INT.equals(args[1].getType()) &&
PsiType.INT.equals(args[2].getType())) {
return new ArraySliceSource(args[0], args[1], args[2]);
}
if (supportUnknownSources) {
PsiType type = StreamApiUtil.getStreamElementType(call.getType(), false);
if (type != null) {
@@ -320,6 +329,54 @@ abstract class SourceOperation extends Operation {
}
}
static class ArraySliceSource extends SourceOperation {
private @NotNull PsiExpression myArray;
private @NotNull PsiExpression myOrigin;
private @NotNull PsiExpression myBound;
private @NotNull PsiType myArrayType;
ArraySliceSource(@NotNull PsiExpression array, @NotNull PsiExpression origin, @NotNull PsiExpression bound) {
myOrigin = origin;
myBound = bound;
myArray = array;
myArrayType = Objects.requireNonNull(myArray.getType());
}
@Override
void rename(String oldName, String newName, StreamToLoopReplacementContext context) {
myOrigin = replaceVarReference(myOrigin, oldName, newName, context);
myBound = replaceVarReference(myBound, oldName, newName, context);
myArray = replaceVarReference(myArray, oldName, newName, context);
}
@Override
public void registerReusedElements(Consumer<PsiElement> consumer) {
consumer.accept(myOrigin);
consumer.accept(myBound);
consumer.accept(myArray);
}
@Override
String wrap(StreamVariable outVar, String code, StreamToLoopReplacementContext context) {
String bound = myBound.getText();
String array = myArray.getText();
if (!ExpressionUtils.isSimpleExpression(context.createExpression(array))) {
array = context.declare("array", myArrayType.getCanonicalText(), array);
}
if (!ExpressionUtils.isSimpleExpression(context.createExpression(bound))) {
bound = context.declare("bound", "int", bound);
}
String loopVar = context.registerVarName(Arrays.asList("i", "j", "idx"));
String element = outVar.getDeclaration(array + "[" + loopVar + "]");
return context.getLoopLabel() +
"for(" + "int " + loopVar + " = " + myOrigin.getText() + ";" +
loopVar + "<" + bound + ";" +
loopVar + "++) {\n" +
element +
code + "}\n";
}
}
private static class StreamIteratorSource extends SourceOperation {
private final String myElementType;
private PsiMethodCallExpression myCall;

13
java/java-tests/testData/codeInsight/daemonCodeAnalyzer/quickFix/streamToLoop/afterArraySlice.java Normal file
View File

@@ -0,0 +1,13 @@
// "Replace Stream API chain with loop" "true"
import java.util.Arrays;
public class Test {
public static void test(String[] arr) {
int bound = arr.length - 1;
for (int i = 1; i < bound; i++) {
String s = arr[i];
System.out.println(s);
}
}
}

9
java/java-tests/testData/codeInsight/daemonCodeAnalyzer/quickFix/streamToLoop/beforeArraySlice.java Normal file
View File

@@ -0,0 +1,9 @@
// "Replace Stream API chain with loop" "true"
import java.util.Arrays;
public class Test {
public static void test(String[] arr) {
Arrays.stream(arr, 1, arr.length - 1).forE<caret>ach(System.out::println);
}
}