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

Java intention: Quick fix for error "foreach not applicable to type java.util.Iterator" - handle comments and take care of empty block when copying the loop body (IDEA-124751)

Browse Source
This commit is contained in:
Pavel Dolgov
2016-07-04 14:37:31 +03:00
parent c78e91e07d
commit 65a5b0e437
6 changed files with 39 additions and 13 deletions
Download Patch File Download Diff File Expand all files Collapse all files
java/java-impl/src/com/intellij/codeInsight/daemon/impl/quickfix/ReplaceIteratorForEachLoopWithIteratorForLoopFix.java
+7 -5
View File
@@ -42,14 +42,14 @@ public class ReplaceIteratorForEachLoopWithIteratorForLoopFix implements Intenti
@NotNull
@Override
public String getText() {
return "Replace 'for each' loop with iterator 'for' loop";
return getFamilyName();
}
@Nls
@NotNull
@Override
public String getFamilyName() {
return getText();
return "Replace 'for each' loop with iterator 'for' loop";
}
@Override
@@ -112,9 +112,11 @@ public class ReplaceIteratorForEachLoopWithIteratorForLoopFix implements Intenti
newForLoop = (PsiForStatement)styleManager.reformat(newForLoop);
if (forEachBody instanceof PsiBlockStatement) {
final PsiStatement[] statements = ((PsiBlockStatement)forEachBody).getCodeBlock().getStatements();
for (int i = statements.length - 1; i >= 0; i--) {
newBodyBlock.addAfter(statements[i], newFirstStatement);
final PsiCodeBlock bodyCodeBlock = ((PsiBlockStatement)forEachBody).getCodeBlock();
final PsiElement firstBodyElement = bodyCodeBlock.getFirstBodyElement();
final PsiElement lastBodyElement = bodyCodeBlock.getLastBodyElement();
if (firstBodyElement != null && lastBodyElement != null) {
newBodyBlock.addRangeAfter(firstBodyElement, lastBodyElement, newFirstStatement);
}
}
else if (forEachBody != null && !(forEachBody instanceof PsiEmptyStatement)) {