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

IDEA-80185 (Replace with For-Each with Indexed Loop bug)

Browse Source
This commit is contained in:
Bas Leijdekkers
2012-01-23 10:39:23 +01:00
parent 08091005ad
commit 33bfed7c94
1 changed files with 13 additions and 13 deletions
Download Patch File Download Diff File Expand all files Collapse all files
plugins/IntentionPowerPak/src/com/siyeh/ipp/forloop/ReplaceForEachLoopWithIndexedForLoopIntention.java
+13 -13
View File
@@ -1,5 +1,5 @@
/*
* Copyright 2003-2011 Dave Griffith, Bas Leijdekkers
* Copyright 2003-2012 Dave Griffith, Bas Leijdekkers
*
* Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License.
@@ -35,10 +35,8 @@ public class ReplaceForEachLoopWithIndexedForLoopIntention extends Intention {
}
@Override
public void processIntention(@NotNull PsiElement element)
throws IncorrectOperationException {
final PsiForeachStatement statement =
(PsiForeachStatement)element.getParent();
public void processIntention(@NotNull PsiElement element) throws IncorrectOperationException {
final PsiForeachStatement statement = (PsiForeachStatement)element.getParent();
if (statement == null) {
return;
}
@@ -54,18 +52,20 @@ public class ReplaceForEachLoopWithIndexedForLoopIntention extends Intention {
return;
}
final boolean isArray = iteratedValueType instanceof PsiArrayType;
final String iteratedValueText =
getReferenceToIterate(iteratedValue, statement);
final PsiElement grandParent = statement.getParent();
final PsiStatement context;
if (grandParent instanceof PsiLabeledStatement) {
context = (PsiStatement)grandParent;
} else {
context = statement;
}
final String iteratedValueText = getReferenceToIterate(iteratedValue, context);
final String lengthText;
if (isArray) {
lengthText =
createVariableName(iteratedValueText + "Length",
PsiType.INT, statement);
lengthText = createVariableName(iteratedValueText + "Length", PsiType.INT, statement);
}
else {
lengthText =
createVariableName(iteratedValueText + "Size",
PsiType.INT, statement);
lengthText = createVariableName(iteratedValueText + "Size", PsiType.INT, statement);
}
@NonNls final StringBuilder newStatement = new StringBuilder();
newStatement.append("for(int ");