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

StreamToLoop: SourceOperation#wrap: chop parentheses by index (first and last); explanatory comments (IDEA-CR-17009)

Browse Source
This commit is contained in:
Tagir Valeev
2017-01-17 10:11:15 +07:00
parent 6d0ab542c0
commit 2c82e3f862
1 changed files with 9 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files
java/java-impl/src/com/intellij/codeInspection/streamToLoop/SourceOperation.java
+9 -5
View File
@@ -163,17 +163,21 @@ abstract class SourceOperation extends Operation {
@Override
public String wrap(StreamVariable outVar, String code, StreamToLoopReplacementContext context) {
String type = outVar.getType();
String collection;
String iterationParameter;
PsiExpressionList argList = myCall.getArgumentList();
if (TypeConversionUtil.isPrimitive(type)) {
collection = StreamEx.of(argList.getChildren()).remove(child -> child.textMatches("(") || child.textMatches(")"))
.map(PsiElement::getText).joining("", "new " + type + "[] {", "}");
// Not using argList.getExpressions() here as we want to preserve comments and formatting between the expressions
PsiElement[] children = argList.getChildren();
// first and last children are (parentheses), we need to remove them
iterationParameter = StreamEx.of(children, 1, children.length - 1)
.map(PsiElement::getText)
.joining("", "new " + type + "[] {", "}");
}
else {
collection = "java.util.Arrays.<" + type + ">asList" + argList.getText();
iterationParameter = "java.util.Arrays.<" + type + ">asList" + argList.getText();
}
return context.getLoopLabel() +
"for(" + outVar.getDeclaration() + ": " + collection + ") {" + code + "}\n";
"for(" + outVar.getDeclaration() + ": " + iterationParameter + ") {" + code + "}\n";
}
}