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

Fix IDEA-177647 Convert String to StringBuilder intention produces wrong code

Browse Source
This commit is contained in:
Tagir Valeev
2017-08-17 17:52:16 +07:00
parent 7878a20a75
commit f73a5572c0
3 changed files with 56 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files
java/java-tests/testData/codeInsight/daemonCodeAnalyzer/quickFix/stringConcatInLoop/afterConcatChar.java
+16
View File
@@ -0,0 +1,16 @@
// "Convert variable 'str1' from String to StringBuilder" "true"
public class IntentionBug {
public static void main(String[] args) {
/*1*/
/*2*/
StringBuilder str1 = new StringBuilder();
for (char i = 'a'; i < 'd'; i++) {
str1.append(i).append((char) (i + 1));
str1.append(i).append((char) (i + 1));
str1.append(1).append(2).append(3);
str1.append(1 + 2 + 3);
}
System.out.println(str1);
}
}
java/java-tests/testData/codeInsight/daemonCodeAnalyzer/quickFix/stringConcatInLoop/beforeConcatChar.java
+14
View File
@@ -0,0 +1,14 @@
// "Convert variable 'str1' from String to StringBuilder" "true"
public class IntentionBug {
public static void main(String[] args) {
String str1 = "";
for (char i = 'a'; i < 'd'; i++) {
str1 = str1 <caret>+ i + (char) (i + 1);
str1 = /*1*/str1/*2*/+ i + (char) (i + 1);
str1 = str1+1+2+3;
str1 = str1+(1+2+3);
}
System.out.println(str1);
}
}
plugins/InspectionGadgets/InspectionGadgetsAnalysis/src/com/siyeh/ig/performance/StringConcatenationInLoopsInspection.java
+26 -9
View File
@@ -46,6 +46,7 @@ import java.util.ArrayList;
import java.util.Collection;
import java.util.List;
import java.util.Objects;
import java.util.function.Predicate;
import java.util.regex.Pattern;
public class StringConcatenationInLoopsInspection extends BaseInspection {
@@ -335,12 +336,20 @@ public class StringConcatenationInLoopsInspection extends BaseInspection {
PsiVariable builderVariable,
PsiElement scope,
CommentTracker ct) {
replaceAll(variable, builderVariable, scope, ct, ref -> false);
}
void replaceAll(PsiVariable variable,
PsiVariable builderVariable,
PsiElement scope,
CommentTracker ct,
Predicate<PsiReferenceExpression> skip) {
Query<PsiReference> query =
scope == null ? ReferencesSearch.search(variable) : ReferencesSearch.search(variable, new LocalSearchScope(scope));
Collection<PsiReference> refs = query.findAll();
for(PsiReference ref : refs) {
PsiElement target = ref.getElement();
if(target instanceof PsiReferenceExpression && target.isValid()) {
if(target instanceof PsiReferenceExpression && target.isValid() && !skip.test((PsiReferenceExpression)target)) {
replace(variable, builderVariable, (PsiReferenceExpression)target, ct);
}
}
@@ -461,6 +470,7 @@ public class StringConcatenationInLoopsInspection extends BaseInspection {
PsiAssignmentExpression assignment,
CommentTracker ct) {
PsiExpression rValue = PsiUtil.skipParenthesizedExprDown(assignment.getRExpression());
String builderName = Objects.requireNonNull(builderVariable.getName());
if(assignment.getOperationTokenType().equals(JavaTokenType.EQ)) {
if (rValue instanceof PsiPolyadicExpression &&
((PsiPolyadicExpression)rValue).getOperationTokenType().equals(JavaTokenType.PLUS)) {
@@ -470,13 +480,20 @@ public class StringConcatenationInLoopsInspection extends BaseInspection {
// s = s + ...;
if (ExpressionUtils.isReferenceTo(operands[0], variable)) {
StreamEx.iterate(operands[1], Objects::nonNull, PsiElement::getNextSibling).forEach(ct::markUnchanged);
String text = rValue.getText().substring(operands[1].getStartOffsetInParent());
PsiExpression added = JavaPsiFacade.getElementFactory(variable.getProject()).createExpressionFromText(text, assignment);
replaceAll(variable, builderVariable, added, ct);
replaceAll(variable, builderVariable, rValue, ct, operands[0]::equals);
StringBuilder replacement =
ChangeToAppendUtil.buildAppendExpression(added, false, new StringBuilder(builderVariable.getName()));
ChangeToAppendUtil.buildAppendExpression(rValue, false, new StringBuilder(builderName));
if (replacement != null) {
ct.replace(assignment, replacement.toString());
PsiMethodCallExpression append = (PsiMethodCallExpression)ct.replace(assignment, replacement.toString());
while(true) {
PsiMethodCallExpression qualifierCall = MethodCallUtils.getQualifierMethodCall(append);
if (qualifierCall == null) break;
append = qualifierCall;
}
PsiExpression qualifier = append.getMethodExpression().getQualifierExpression();
if (qualifier != null) {
append.replace(qualifier);
}
}
return;
}
@@ -485,7 +502,7 @@ public class StringConcatenationInLoopsInspection extends BaseInspection {
if (ExpressionUtils.isReferenceTo(lastOp, variable)) {
ct.delete(concat.getTokenBeforeOperand(lastOp), lastOp);
replaceAll(variable, builderVariable, rValue, ct);
ct.replace(assignment, builderVariable.getName() + ".insert(0," + ct.text(rValue) + ")");
ct.replace(assignment, builderName + ".insert(0," + ct.text(rValue) + ")");
return;
}
}
@@ -500,14 +517,14 @@ public class StringConcatenationInLoopsInspection extends BaseInspection {
String replacement = "";
if (rValue != null) {
StringBuilder sb =
ChangeToAppendUtil.buildAppendExpression(ct.markUnchanged(rValue), false, new StringBuilder(builderVariable.getName()));
ChangeToAppendUtil.buildAppendExpression(ct.markUnchanged(rValue), false, new StringBuilder(builderName));
if (sb != null) {
replacement = sb.toString();
}
}
ct.replace(assignment, replacement);
} else if(assignment.getOperationTokenType().equals(JavaTokenType.EQ)) {
ct.replace(assignment, builderVariable.getName() + "=" + generateNewStringBuilder(rValue, ct));
ct.replace(assignment, builderName + "=" + generateNewStringBuilder(rValue, ct));
}
}
}