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

substring(x).indexOf(y) -> indexOf(y, x) (IDEA-219640, case#3)

Browse Source 
GitOrigin-RevId: aab34215f1dc50e33af12cc56954dc17b9104318
This commit is contained in:
Tagir Valeev
2019-11-22 06:36:34 +00:00
committed by intellij-monorepo-bot
parent 4e9f723467
commit 7f8d9a2372
3 changed files with 63 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files
java/java-tests/testData/codeInsight/daemonCodeAnalyzer/quickFix/redundantStringOperation/afterSubstringIndexOf.java
+11
View File
@@ -0,0 +1,11 @@
// "Fix all 'Redundant String operation' problems in file" "true"
class X {
void test(String s) {
/*1*/
/*2*/
int pos = s/*3*/.indexOf("foo", 10);
int posBounded = s.substring(10, 20).indexOf("foo");
int posChar = s.indexOf('f', 10);
int posIdx = s.substring(10).indexOf('f', 2);
}
}
java/java-tests/testData/codeInsight/daemonCodeAnalyzer/quickFix/redundantStringOperation/beforeSubstringIndexOf.java
+9
View File
@@ -0,0 +1,9 @@
// "Fix all 'Redundant String operation' problems in file" "true"
class X {
void test(String s) {
int pos = s.substr<caret>ing(/*1*/10/*2*/)/*3*/.indexOf("foo");
int posBounded = s.substring(10, 20).indexOf("foo");
int posChar = s.substring(10).indexOf('f');
int posIdx = s.substring(10).indexOf('f', 2);
}
}
plugins/InspectionGadgets/src/com/siyeh/ig/redundancy/RedundantStringOperationInspection.java
+43 -2
View File
@@ -38,8 +38,9 @@ public class RedundantStringOperationInspection extends AbstractBaseJavaLocalIns
private static final CallMatcher STRING_TO_STRING = instanceCall(JAVA_LANG_STRING, "toString").parameterCount(0);
private static final CallMatcher STRING_INTERN = instanceCall(JAVA_LANG_STRING, "intern").parameterCount(0);
private static final CallMatcher STRING_LENGTH = instanceCall(JAVA_LANG_STRING, "length").parameterCount(0);
private static final CallMatcher STRING_SUBSTRING_SINGLE_ARG = instanceCall(JAVA_LANG_STRING, "substring").parameterTypes("int");
private static final CallMatcher STRING_SUBSTRING = anyOf(
instanceCall(JAVA_LANG_STRING, "substring").parameterTypes("int"),
STRING_SUBSTRING_SINGLE_ARG,
instanceCall(JAVA_LANG_STRING, "substring").parameterTypes("int", "int"));
private static final CallMatcher STRING_BUILDER_APPEND =
instanceCall(CommonClassNames.JAVA_LANG_ABSTRACT_STRING_BUILDER, "append").parameterTypes(JAVA_LANG_STRING);
@@ -50,6 +51,7 @@ public class RedundantStringOperationInspection extends AbstractBaseJavaLocalIns
private static final CallMatcher STRING_LAST_INDEX_OF = instanceCall(JAVA_LANG_STRING, "lastIndexOf").parameterCount(2);
private static final CallMatcher STRING_IS_EMPTY = instanceCall(JAVA_LANG_STRING, "isEmpty").parameterCount(0);
private static final CallMatcher CASE_CHANGE = exactInstanceCall(JAVA_LANG_STRING, "toUpperCase", "toLowerCase");
private static final CallMatcher STRING_INDEX_OF_ONE_ARG = instanceCall(JAVA_LANG_STRING, "indexOf").parameterCount(1);
@Nls
@NotNull
@@ -79,7 +81,8 @@ public class RedundantStringOperationInspection extends AbstractBaseJavaLocalIns
.register(PRINTSTREAM_PRINTLN, call -> getRedundantArgumentProblem(getSingleEmptyStringArgument(call)))
.register(METHOD_WITH_REDUNDANT_ZERO_AS_SECOND_PARAMETER, this::getRedundantZeroAsSecondParameterProblem)
.register(STRING_LAST_INDEX_OF, this::getLastIndexOfProblem)
.register(STRING_IS_EMPTY, this::getRedundantCaseChangeProblem);
.register(STRING_IS_EMPTY, this::getRedundantCaseChangeProblem)
.register(STRING_INDEX_OF_ONE_ARG, this::getRedundantSubstringIndexOfProblem);
private final InspectionManager myManager;
private final ProblemsHolder myHolder;
private final boolean myIsOnTheFly;
@@ -135,6 +138,20 @@ public class RedundantStringOperationInspection extends AbstractBaseJavaLocalIns
return null;
}
private ProblemDescriptor getRedundantSubstringIndexOfProblem(PsiMethodCallExpression call) {
PsiMethodCallExpression qualifierCall = MethodCallUtils.getQualifierMethodCall(call);
if (STRING_SUBSTRING_SINGLE_ARG.test(qualifierCall) && qualifierCall.getMethodExpression().getQualifierExpression() != null) {
PsiElement anchor = qualifierCall.getMethodExpression().getReferenceNameElement();
if (anchor != null) {
return myManager.createProblemDescriptor(anchor, (TextRange)null,
InspectionGadgetsBundle.message("inspection.redundant.string.call.message"),
ProblemHighlightType.LIKE_UNUSED_SYMBOL, myIsOnTheFly,
new RemoveSubstringBeforeIndexOfFix());
}
}
return null;
}
@Nullable
private ProblemDescriptor getRedundantCaseChangeProblem(PsiMethodCallExpression call) {
PsiMethodCallExpression qualifierCall = MethodCallUtils.getQualifierMethodCall(call);
@@ -262,6 +279,30 @@ public class RedundantStringOperationInspection extends AbstractBaseJavaLocalIns
}
}
private static class RemoveSubstringBeforeIndexOfFix implements LocalQuickFix {
@Nls(capitalization = Nls.Capitalization.Sentence)
@NotNull
@Override
public String getFamilyName() {
return "Remove redundant 'substring()' call";
}
@Override
public void applyFix(@NotNull Project project, @NotNull ProblemDescriptor descriptor) {
PsiMethodCallExpression substringCall = PsiTreeUtil.getParentOfType(descriptor.getStartElement(), PsiMethodCallExpression.class);
if (substringCall == null) return;
PsiExpression stringExpr = substringCall.getMethodExpression().getQualifierExpression();
if (stringExpr == null) return;
PsiMethodCallExpression indexOfCall = ExpressionUtils.getCallForQualifier(substringCall);
if (indexOfCall == null) return;
PsiExpression[] args = substringCall.getArgumentList().getExpressions();
if (args.length != 1) return;
CommentTracker ct = new CommentTracker();
indexOfCall.getArgumentList().add(ct.markUnchanged(args[0]));
ct.replaceAndRestoreComments(substringCall, stringExpr);
}
}
private static class RemoveRedundantStringCallFix implements LocalQuickFix {
private final FixType myFixType;
private final String myToRemove;