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

Revert substring(x).indexOf(y) -> indexOf(y, x) (IDEA-219640, case#3); was incorrect replacement

Browse Source 
GitOrigin-RevId: f62ccdd76bd6353fe1bce95fe17ab4b3ca507dce
This commit is contained in:
Tagir Valeev
2019-11-25 09:31:23 +00:00
committed by intellij-monorepo-bot
parent 30fbc0441a
commit 98792cbf73
3 changed files with 4 additions and 45 deletions
Download Patch File Download Diff File Expand all files Collapse all files
java/java-tests/testData/codeInsight/daemonCodeAnalyzer/quickFix/redundantStringOperation/afterSubstringIndexOf.java
-12
View File
@@ -1,12 +0,0 @@
// "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);
int posFromZero = s.indexOf("xyzt") > 0;
}
}
java/java-tests/testData/codeInsight/daemonCodeAnalyzer/quickFix/redundantStringOperation/beforeSubstringIndexOf.java
-10
View File
@@ -1,10 +0,0 @@
// "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);
int posFromZero = s.substring(0).indexOf("xyzt") > 0;
}
}
plugins/InspectionGadgets/src/com/siyeh/ig/redundancy/RedundantStringOperationInspection.java
+4 -23
View File
@@ -53,7 +53,6 @@ public class RedundantStringOperationInspection extends AbstractBaseJavaLocalIns
private static final CallMatcher STRING_LAST_INDEX_OF = exactInstanceCall(JAVA_LANG_STRING, "lastIndexOf").parameterCount(2);
private static final CallMatcher STRING_IS_EMPTY = exactInstanceCall(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 = exactInstanceCall(JAVA_LANG_STRING, "indexOf").parameterCount(1);
private static final CallMatcher STRING_EQUALS = exactInstanceCall(JAVA_LANG_STRING, "equals").parameterTypes(JAVA_LANG_OBJECT);
public boolean ignoreStringConstructor = false;
@@ -95,7 +94,6 @@ public class RedundantStringOperationInspection extends AbstractBaseJavaLocalIns
.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_INDEX_OF_ONE_ARG, this::getRedundantSubstringIndexOfProblem)
.register(STRING_EQUALS, this::getRedundantSubstringEqualsProblem);
private final InspectionManager myManager;
private final ProblemsHolder myHolder;
@@ -162,20 +160,6 @@ public class RedundantStringOperationInspection extends AbstractBaseJavaLocalIns
return null;
}
private ProblemDescriptor getRedundantSubstringIndexOfProblem(PsiMethodCallExpression call) {
PsiMethodCallExpression qualifierCall = MethodCallUtils.getQualifierMethodCall(call);
if (STRING_SUBSTRING_ONE_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 RemoveRedundantSubstringFix(null));
}
}
return null;
}
private ProblemDescriptor getRedundantSubstringEqualsProblem(PsiMethodCallExpression call) {
PsiMethodCallExpression qualifierCall = MethodCallUtils.getQualifierMethodCall(call);
if (qualifierCall == null) return null;
@@ -358,9 +342,9 @@ public class RedundantStringOperationInspection extends AbstractBaseJavaLocalIns
}
private static class RemoveRedundantSubstringFix implements LocalQuickFix {
private final @Nullable String myBindCallName;
private final @NotNull String myBindCallName;
RemoveRedundantSubstringFix(@Nullable String bindCallName) {
RemoveRedundantSubstringFix(@NotNull String bindCallName) {
myBindCallName = bindCallName;
}
@@ -368,8 +352,7 @@ public class RedundantStringOperationInspection extends AbstractBaseJavaLocalIns
@NotNull
@Override
public String getName() {
return myBindCallName == null ? getFamilyName() :
"Use '"+myBindCallName+"' and remove redundant 'substring()' call";
return "Use '" + myBindCallName + "' and remove redundant 'substring()' call";
}
@Nls(capitalization = Nls.Capitalization.Sentence)
@@ -393,9 +376,7 @@ public class RedundantStringOperationInspection extends AbstractBaseJavaLocalIns
if (!"endsWith".equals(myBindCallName) && !ExpressionUtils.isZero(args[0])) {
nextCall.getArgumentList().add(ct.markUnchanged(args[0]));
}
if (myBindCallName != null) {
ExpressionUtils.bindCallTo(nextCall, myBindCallName);
}
ExpressionUtils.bindCallTo(nextCall, myBindCallName);
ct.replaceAndRestoreComments(substringCall, stringExpr);
}
}