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

IPP: fix IOE

Browse Source
This commit is contained in:
Bas Leijdekkers
2017-08-31 17:09:20 +02:00
parent 6ff8bdd077
commit 0b752f7819
2 changed files with 20 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files
plugins/IntentionPowerPak/src/com/siyeh/ipp/concatenation/ReplaceFormatStringWithConcatenationIntention.java
+7 -9
View File
@@ -90,17 +90,12 @@ public class ReplaceFormatStringWithConcatenationIntention extends Intention {
final PsiMethodCallExpression methodCallExpression = (PsiMethodCallExpression)element;
final PsiExpressionList argumentList = methodCallExpression.getArgumentList();
final PsiExpression[] arguments = argumentList.getExpressions();
final String replacementExpression;
if (ExpressionUtils.hasStringType(arguments[0])) {
replacementExpression = buildReplacementExpression(arguments, 0);
}
else {
replacementExpression = buildReplacementExpression(arguments, 1);
}
final String replacementExpression =
ExpressionUtils.hasStringType(arguments[0]) ? buildReplacementExpression(arguments, 0) : buildReplacementExpression(arguments, 1);
PsiReplacementUtil.replaceExpression(methodCallExpression, replacementExpression);
}
public String buildReplacementExpression(PsiExpression[] arguments, int indexOfFormatString) {
public static String buildReplacementExpression(PsiExpression[] arguments, int indexOfFormatString) {
final StringBuilder builder = new StringBuilder();
String value = (String)ExpressionUtils.computeConstantExpression(arguments[indexOfFormatString]);
assert value != null;
@@ -113,7 +108,10 @@ public class ReplaceFormatStringWithConcatenationIntention extends Intention {
if (builder.length() > 0) {
builder.append('+');
}
builder.append('"').append(value.substring(start, end)).append("\"+");
builder.append('"').append(value.substring(start, end)).append('"');
}
if (builder.length() > 0) {
builder.append('+');
}
count++;
final PsiExpression argument = arguments[indexOfFormatString + count];
plugins/IntentionPowerPak/testSrc/com/siyeh/ipp/concatenation/ReplaceFormatStringWithConcatenationIntentionTest.java
+13
View File
@@ -59,4 +59,17 @@ public class ReplaceFormatStringWithConcatenationIntentionTest extends IPPTestCa
"}");
}
public void testMultipleWithNothingInBetween() {
doTest("class X {" +
" String m(String tempDataFolderPath, String fileName) {" +
" return String.format(\"%s/f%s%s\", /*_Replace 'String.format()' with concatenation*/tempDataFolderPath, Double.toString(Math.random()), fileName);" +
" }" +
"}",
"class X {" +
" String m(String tempDataFolderPath, String fileName) {" +
" return tempDataFolderPath + \"/f\" + Double.toString(Math.random()) + fileName;" +
" }" +
"}");
}
}