From 1eebf487f388897f0b32443099b2263a70eb890a Mon Sep 17 00:00:00 2001
From: Bas Leijdekkers <basleijdekkers@gmail.com>
Date: Fri, 28 Oct 2016 17:34:13 +0200
Subject: [PATCH] IG: merge 3 inspections into one "Call to suspicious String
 method" inspection

---
 .../ex/InspectionProfileTest.java             |   9 ++
 .../src/META-INF/InspectionGadgets.xml        |  19 +--
 .../siyeh/InspectionGadgetsBundle.properties  |   8 +-
 ...llToSuspiciousStringMethodInspection.java} |  92 ++++-------
 ...uspiciousStringMethodInspectionMerger.java |  47 ++++++
 .../ig/internationalization/NonNlsUtils.java  |   6 +-
 .../StringCompareToInspection.java            | 146 ------------------
 .../StringEqualsIgnoreCaseInspection.java     | 142 -----------------
 .../CallToSuspiciousStringMethod.html         |   9 ++
 .../StringCompareTo.html                      |   9 --
 .../inspectionDescriptions/StringEquals.html  |   9 --
 .../StringEqualsIgnoreCase.html               |   9 --
 .../StringCompareToInspection.java            |  13 --
 .../StringEqualsIgnoreCaseInspection.java     |  13 --
 .../StringEqualsInspection.java               |  13 --
 .../CallToSuspiciousStringMethod.java         |  18 +++
 ...oSuspiciousStringMethodInspectionTest.java |  36 +++++
 17 files changed, 164 insertions(+), 434 deletions(-)
 rename plugins/InspectionGadgets/InspectionGadgetsAnalysis/src/com/siyeh/ig/internationalization/{StringEqualsInspection.java => CallToSuspiciousStringMethodInspection.java} (51%)
 create mode 100644 plugins/InspectionGadgets/InspectionGadgetsAnalysis/src/com/siyeh/ig/internationalization/CallToSuspiciousStringMethodInspectionMerger.java
 delete mode 100644 plugins/InspectionGadgets/InspectionGadgetsAnalysis/src/com/siyeh/ig/internationalization/StringCompareToInspection.java
 delete mode 100644 plugins/InspectionGadgets/InspectionGadgetsAnalysis/src/com/siyeh/ig/internationalization/StringEqualsIgnoreCaseInspection.java
 create mode 100644 plugins/InspectionGadgets/src/inspectionDescriptions/CallToSuspiciousStringMethod.html
 delete mode 100644 plugins/InspectionGadgets/src/inspectionDescriptions/StringCompareTo.html
 delete mode 100644 plugins/InspectionGadgets/src/inspectionDescriptions/StringEquals.html
 delete mode 100644 plugins/InspectionGadgets/src/inspectionDescriptions/StringEqualsIgnoreCase.html
 delete mode 100644 plugins/InspectionGadgets/test/com/siyeh/igtest/internationalization/StringCompareToInspection.java
 delete mode 100644 plugins/InspectionGadgets/test/com/siyeh/igtest/internationalization/StringEqualsIgnoreCaseInspection.java
 delete mode 100644 plugins/InspectionGadgets/test/com/siyeh/igtest/internationalization/StringEqualsInspection.java
 create mode 100644 plugins/InspectionGadgets/test/com/siyeh/igtest/internationalization/call_to_suspicious_string_method/CallToSuspiciousStringMethod.java
 create mode 100644 plugins/InspectionGadgets/testsrc/com/siyeh/ig/internationalization/CallToSuspiciousStringMethodInspectionTest.java

diff --git a/java/java-tests/testSrc/com/intellij/codeInspection/ex/InspectionProfileTest.java b/java/java-tests/testSrc/com/intellij/codeInspection/ex/InspectionProfileTest.java
index b209a4534582..096795247e23 100644
--- a/java/java-tests/testSrc/com/intellij/codeInspection/ex/InspectionProfileTest.java
+++ b/java/java-tests/testSrc/com/intellij/codeInspection/ex/InspectionProfileTest.java
@@ -402,6 +402,15 @@ public class InspectionProfileTest extends LightIdeaTestCase {
                          "</profile>");
   }
 
+  public void testMergedCallToSuspiciousStringMethodInspections() throws Exception {
+    checkMergedNoChanges("<profile version=\"1.0\">\n" +
+                         "  <option name=\"myName\" value=\"" + PROFILE + "\" />\n" +
+                         "  <inspection_tool class=\"StringCompareTo\" enabled=\"true\" level=\"WARNING\" enabled_by_default=\"true\" />\n" +
+                         "  <inspection_tool class=\"StringEquals\" enabled=\"true\" level=\"WARNING\" enabled_by_default=\"true\" />\n" +
+                         "  <inspection_tool class=\"StringEqualsIgnoreCase\" enabled=\"true\" level=\"WARNING\" enabled_by_default=\"true\" />\n" +
+                         "</profile>" );
+  }
+
   public void testMergedMisspelledInspections() throws Exception {
     checkMergedNoChanges("<profile version=\"1.0\">\n" +
                          "  <option name=\"myName\" value=\"" + PROFILE + "\" />\n" +
diff --git a/plugins/InspectionGadgets/InspectionGadgetsAnalysis/src/META-INF/InspectionGadgets.xml b/plugins/InspectionGadgets/InspectionGadgetsAnalysis/src/META-INF/InspectionGadgets.xml
index afd0e1a4f322..831dd30c8ea6 100644
--- a/plugins/InspectionGadgets/InspectionGadgetsAnalysis/src/META-INF/InspectionGadgets.xml
+++ b/plugins/InspectionGadgets/InspectionGadgetsAnalysis/src/META-INF/InspectionGadgets.xml
@@ -7,6 +7,7 @@
     <inspectionElementsMerger implementation="com.siyeh.ig.junit.MalformedSetUpTearDownInspectionMerger"/>
     <inspectionElementsMerger implementation="com.siyeh.ig.inheritance.MethodDoesntCallSuperMethodInspectionMerger"/>
     <inspectionElementsMerger implementation="com.siyeh.ig.threading.WaitNotifyNotInSynchronizedContextInspectionMerger"/>
+    <inspectionElementsMerger implementation="com.siyeh.ig.internationalization.CallToSuspiciousStringMethodInspectionMerger"/>
 
     <!--group.names.abstraction.issues-->
     <localInspection groupPath="Java" language="JAVA" shortName="BooleanParameter" bundle="com.siyeh.InspectionGadgetsBundle" key="boolean.parameter.display.name"
@@ -1129,6 +1130,10 @@
                      level="WARNING" implementationClass="com.siyeh.ig.initialization.ThisEscapedInConstructorInspection"/>
 
     <!--group.names.internationalization.issues-->
+    <localInspection groupPath="Java" language="JAVA" shortName="CallToSuspiciousStringMethod" bundle="com.siyeh.InspectionGadgetsBundle"
+                     key="call.to.suspicious.string.method.display.name" groupBundle="messages.InspectionsBundle"
+                     groupKey="group.names.internationalization.issues" enabledByDefault="false" level="WARNING"
+                     implementationClass="com.siyeh.ig.internationalization.CallToSuspiciousStringMethodInspection"/>
     <localInspection groupPath="Java" language="JAVA" shortName="CharacterComparison" bundle="com.siyeh.InspectionGadgetsBundle" key="character.comparison.display.name"
                      groupBundle="messages.InspectionsBundle" groupKey="group.names.internationalization.issues" enabledByDefault="false"
                      level="WARNING" implementationClass="com.siyeh.ig.internationalization.CharacterComparisonInspection"/>
@@ -1147,21 +1152,9 @@
                      key="instantiating.simpledateformat.without.locale.display.name" groupBundle="messages.InspectionsBundle"
                      groupKey="group.names.internationalization.issues" enabledByDefault="false" level="WARNING"
                      implementationClass="com.siyeh.ig.internationalization.SimpleDateFormatWithoutLocaleInspection"/>
-    <localInspection groupPath="Java" language="JAVA" suppressId="CallToStringCompareTo" shortName="StringCompareTo" bundle="com.siyeh.InspectionGadgetsBundle"
-                     key="string.compareto.call.display.name" groupBundle="messages.InspectionsBundle"
-                     groupKey="group.names.internationalization.issues" enabledByDefault="false" level="WARNING"
-                     implementationClass="com.siyeh.ig.internationalization.StringCompareToInspection"/>
     <localInspection groupPath="Java" language="JAVA" shortName="StringConcatenation" bundle="com.siyeh.InspectionGadgetsBundle" key="string.concatenation.display.name"
                      groupBundle="messages.InspectionsBundle" groupKey="group.names.internationalization.issues" enabledByDefault="false"
                      level="WARNING" implementationClass="com.siyeh.ig.internationalization.StringConcatenationInspection"/>
-    <localInspection groupPath="Java" language="JAVA" suppressId="CallToStringEqualsIgnoreCase" shortName="StringEqualsIgnoreCase" bundle="com.siyeh.InspectionGadgetsBundle"
-                     key="string.equalsignorecase.call.display.name" groupBundle="messages.InspectionsBundle"
-                     groupKey="group.names.internationalization.issues" enabledByDefault="false" level="WARNING"
-                     implementationClass="com.siyeh.ig.internationalization.StringEqualsIgnoreCaseInspection"/>
-    <localInspection groupPath="Java" language="JAVA" suppressId="CallToStringEquals" shortName="StringEquals" bundle="com.siyeh.InspectionGadgetsBundle"
-                     key="string.equals.call.display.name" groupBundle="messages.InspectionsBundle"
-                     groupKey="group.names.internationalization.issues" enabledByDefault="false" level="WARNING"
-                     implementationClass="com.siyeh.ig.internationalization.StringEqualsInspection"/>
     <localInspection groupPath="Java" language="JAVA" suppressId="StringToUpperCaseOrToLowerCaseWithoutLocale" shortName="StringToUpperWithoutLocale"
                      bundle="com.siyeh.InspectionGadgetsBundle" key="string.touppercase.tolowercase.without.locale.display.name"
                      groupBundle="messages.InspectionsBundle" groupKey="group.names.internationalization.issues" enabledByDefault="false"
@@ -1182,7 +1175,7 @@
                      key="unnecessary.unicode.escape.display.name" groupBundle="messages.InspectionsBundle"
                      groupKey="group.names.internationalization.issues" enabledByDefault="false" level="WARNING"
                      implementationClass="com.siyeh.ig.internationalization.UnnecessaryUnicodeEscapeInspection"/>
-<localInspection groupPath="Java" language="JAVA" shortName="ImplicitDefaultCharsetUsage" bundle="com.siyeh.InspectionGadgetsBundle"
+    <localInspection groupPath="Java" language="JAVA" shortName="ImplicitDefaultCharsetUsage" bundle="com.siyeh.InspectionGadgetsBundle"
                      key="implicit.default.charset.usage.display.name" groupBundle="messages.InspectionsBundle"
                      groupKey="group.names.internationalization.issues" enabledByDefault="false" level="WARNING"
                      implementationClass="com.siyeh.ig.internationalization.ImplicitDefaultCharsetUsageInspection"/>
diff --git a/plugins/InspectionGadgets/InspectionGadgetsAnalysis/src/com/siyeh/InspectionGadgetsBundle.properties b/plugins/InspectionGadgets/InspectionGadgetsAnalysis/src/com/siyeh/InspectionGadgetsBundle.properties
index d71660236fb2..49575d42e3b1 100644
--- a/plugins/InspectionGadgets/InspectionGadgetsAnalysis/src/com/siyeh/InspectionGadgetsBundle.properties
+++ b/plugins/InspectionGadgets/InspectionGadgetsAnalysis/src/com/siyeh/InspectionGadgetsBundle.properties
@@ -320,8 +320,6 @@ call.to.numeric.tostring.display.name=Call to Numeric 'toString()'
 call.to.numeric.tostring.problem.descriptor=Numeric <code>#ref()</code> called in an internationalized context #loc
 instantiating.simpledateformat.without.locale.display.name=Instantiating a SimpleDateFormat without a Locale
 instantiating.simpledateformat.without.locale.problem.descriptor=Instantiating a <code>#ref</code> without specifying a Locale in an internationalized context #loc
-string.compareto.call.display.name=Call to 'String.compareTo()'
-string.compareto.call.problem.descriptor=<code>String.#ref()</code> called using internationalized strings #loc
 string.concatenation.display.name=String concatenation
 string.concatenation.problem.descriptor=String concatenation <code>#ref</code> in an internationalized context #loc
 string.concatenation.ignore.system.out.option=Ignore for 'System.out.print' arguments
@@ -332,10 +330,6 @@ string.concatenation.ignore.constant.initializers.option=Ignore for initializers
 ignore.in.annotations=Ignore in annotations
 ignore.in.tostring=Ignore inside toString() methods
 ignore.as.initial.capacity=Ignore initial capacity for StringBuilders and Collections
-string.equalsignorecase.call.display.name=Call to 'String.equalsIgnoreCase()'
-string.equalsignorecase.call.problem.descriptor=<code>String.#ref()</code> using internationalized strings #loc
-string.equals.call.display.name=Call to 'String.equals()'
-string.equals.call.problem.descriptor=<code>String.#ref()</code> using internationalized strings #loc
 string.touppercase.tolowercase.without.locale.display.name=Call to 'String.toUpperCase()' or 'toLowerCase()' without a Locale
 string.touppercase.tolowercase.without.locale.problem.descriptor=<code>String.#ref()</code> called without specifying a Locale using internationalized strings #loc
 use.stringtokenizer.display.name=Use of StringTokenizer
@@ -2205,3 +2199,5 @@ wait.notify.while.not.synchronized.on.problem.descriptor=Call to <code>#ref</cod
 junit5.assertions.converter.display.name=Obsolete assertions in JUnit 5 tests
 junit5.converter.display.name=JUnit4 test can be JUnit5
 junit5.converter.fix.name=Migrate to JUnit5
+call.to.suspicious.string.method.display.name=Call to suspicious String method
+call.to.suspicious.string.method.problem.descriptor=<code>String.#ref()</code> called in internationalized context #loc
diff --git a/plugins/InspectionGadgets/InspectionGadgetsAnalysis/src/com/siyeh/ig/internationalization/StringEqualsInspection.java b/plugins/InspectionGadgets/InspectionGadgetsAnalysis/src/com/siyeh/ig/internationalization/CallToSuspiciousStringMethodInspection.java
similarity index 51%
rename from plugins/InspectionGadgets/InspectionGadgetsAnalysis/src/com/siyeh/ig/internationalization/StringEqualsInspection.java
rename to plugins/InspectionGadgets/InspectionGadgetsAnalysis/src/com/siyeh/ig/internationalization/CallToSuspiciousStringMethodInspection.java
index 3da029b5c112..32b9eaea5bf8 100644
--- a/plugins/InspectionGadgets/InspectionGadgetsAnalysis/src/com/siyeh/ig/internationalization/StringEqualsInspection.java
+++ b/plugins/InspectionGadgets/InspectionGadgetsAnalysis/src/com/siyeh/ig/internationalization/CallToSuspiciousStringMethodInspection.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2003-2010 Dave Griffith, Bas Leijdekkers
+ * Copyright 2000-2016 JetBrains s.r.o.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -24,90 +24,70 @@ import com.siyeh.ig.BaseInspectionVisitor;
 import com.siyeh.ig.DelegatingFix;
 import com.siyeh.ig.InspectionGadgetsFix;
 import com.siyeh.ig.psiutils.MethodCallUtils;
-import com.siyeh.ig.psiutils.TypeUtils;
+import org.jetbrains.annotations.Nls;
 import org.jetbrains.annotations.NotNull;
 
 import java.util.ArrayList;
 import java.util.List;
 
-public class StringEqualsInspection extends BaseInspection {
+/**
+ * @author Bas Leijdekkers
+ */
+public class CallToSuspiciousStringMethodInspection extends BaseInspection {
 
-  @Override
+  @Nls
   @NotNull
-  public String getID() {
-    return "CallToStringEquals";
-  }
-
   @Override
-  @NotNull
   public String getDisplayName() {
-    return InspectionGadgetsBundle.message(
-      "string.equals.call.display.name");
+    return InspectionGadgetsBundle.message("call.to.suspicious.string.method.display.name");
+  }
+
+  @NotNull
+  @Override
+  protected String buildErrorString(Object... infos) {
+    return InspectionGadgetsBundle.message("call.to.suspicious.string.method.problem.descriptor");
   }
 
   @Override
-  @NotNull
-  public String buildErrorString(Object... infos) {
-    return InspectionGadgetsBundle.message(
-      "string.equals.call.problem.descriptor");
+  public BaseInspectionVisitor buildVisitor() {
+    return new CallToSuspiciousStringMethodVisitor();
   }
 
   @Override
   @NotNull
   protected InspectionGadgetsFix[] buildFixes(Object... infos) {
-    final PsiMethodCallExpression methodCallExpression =
-      (PsiMethodCallExpression)infos[0];
-    final List<InspectionGadgetsFix> result = new ArrayList();
-    final PsiReferenceExpression methodExpression =
-      methodCallExpression.getMethodExpression();
-    final PsiModifierListOwner annotatableQualifier =
-      NonNlsUtils.getAnnotatableQualifier(
-        methodExpression);
+    final PsiMethodCallExpression methodCallExpression = (PsiMethodCallExpression)infos[0];
+    final List<InspectionGadgetsFix> result = new ArrayList<>();
+    final PsiReferenceExpression methodExpression = methodCallExpression.getMethodExpression();
+    final PsiModifierListOwner annotatableQualifier = NonNlsUtils.getAnnotatableQualifier(methodExpression);
     if (annotatableQualifier != null) {
       final InspectionGadgetsFix fix =
-        createAddAnnotationFix(annotatableQualifier);
+        new DelegatingFix(new AddAnnotationPsiFix(AnnotationUtil.NON_NLS, annotatableQualifier, PsiNameValuePair.EMPTY_ARRAY));
       result.add(fix);
     }
-    final PsiModifierListOwner annotatableArgument =
-      NonNlsUtils.getAnnotatableArgument(
-        methodCallExpression);
+    final PsiModifierListOwner annotatableArgument = NonNlsUtils.getAnnotatableArgument(methodCallExpression);
     if (annotatableArgument != null) {
       final InspectionGadgetsFix fix =
-        createAddAnnotationFix(annotatableArgument);
+        new DelegatingFix(new AddAnnotationPsiFix(AnnotationUtil.NON_NLS, annotatableArgument, PsiNameValuePair.EMPTY_ARRAY));
       result.add(fix);
     }
     return result.toArray(new InspectionGadgetsFix[result.size()]);
   }
 
-  private static DelegatingFix createAddAnnotationFix(PsiModifierListOwner annotatableQualifier) {
-    return new DelegatingFix(new AddAnnotationPsiFix(
-      AnnotationUtil.NON_NLS, annotatableQualifier,PsiNameValuePair.EMPTY_ARRAY));
-  }
-
-  @Override
-  public BaseInspectionVisitor buildVisitor() {
-    return new StringEqualsVisitor();
-  }
-
-  private static class StringEqualsVisitor extends BaseInspectionVisitor {
+  private static class CallToSuspiciousStringMethodVisitor extends BaseInspectionVisitor {
 
     @Override
-    public void visitMethodCallExpression(
-      @NotNull PsiMethodCallExpression expression) {
-      super.visitMethodCallExpression(expression);
-      if (!MethodCallUtils.isEqualsCall(expression)) {
+    public void visitMethodCallExpression(PsiMethodCallExpression expression) {
+      if (!MethodCallUtils.isEqualsCall(expression) &&
+          !MethodCallUtils.isEqualsIgnoreCaseCall(expression) &&
+          !MethodCallUtils.isCompareToCall(expression) &&
+          !MethodCallUtils.isCompareToIgnoreCaseCall(expression)) {
         return;
       }
       final PsiMethod method = expression.resolveMethod();
       if (method == null) {
         return;
       }
-      final PsiParameterList paramList = method.getParameterList();
-      final PsiParameter[] parameters = paramList.getParameters();
-      final PsiType parameterType = parameters[0].getType();
-      if (!TypeUtils.isJavaLangObject(parameterType)) {
-        return;
-      }
       final PsiClass aClass = method.getContainingClass();
       if (aClass == null) {
         return;
@@ -116,22 +96,18 @@ public class StringEqualsInspection extends BaseInspection {
       if (!CommonClassNames.JAVA_LANG_STRING.equals(className)) {
         return;
       }
-      final PsiReferenceExpression methodExpression =
-        expression.getMethodExpression();
-      final PsiExpression qualifier =
-        methodExpression.getQualifierExpression();
+
+      final PsiReferenceExpression methodExpression = expression.getMethodExpression();
+      final PsiExpression qualifier = methodExpression.getQualifierExpression();
       if (NonNlsUtils.isNonNlsAnnotated(qualifier)) {
         return;
       }
       final PsiExpressionList argumentList = expression.getArgumentList();
       final PsiExpression[] arguments = argumentList.getExpressions();
-      if (arguments.length != 1) {
-        return;
-      }
-      if (NonNlsUtils.isNonNlsAnnotated(arguments[0])) {
+      if (arguments.length != 1 || NonNlsUtils.isNonNlsAnnotated(arguments[0])) {
         return;
       }
       registerMethodCallError(expression, expression);
     }
   }
-}
\ No newline at end of file
+}
diff --git a/plugins/InspectionGadgets/InspectionGadgetsAnalysis/src/com/siyeh/ig/internationalization/CallToSuspiciousStringMethodInspectionMerger.java b/plugins/InspectionGadgets/InspectionGadgetsAnalysis/src/com/siyeh/ig/internationalization/CallToSuspiciousStringMethodInspectionMerger.java
new file mode 100644
index 000000000000..44bbf9d4cc52
--- /dev/null
+++ b/plugins/InspectionGadgets/InspectionGadgetsAnalysis/src/com/siyeh/ig/internationalization/CallToSuspiciousStringMethodInspectionMerger.java
@@ -0,0 +1,47 @@
+/*
+ * Copyright 2000-2016 JetBrains s.r.o.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+package com.siyeh.ig.internationalization;
+
+import com.intellij.codeInspection.ex.InspectionElementsMerger;
+
+/**
+ * @author Bas Leijdekkers
+ */
+public class CallToSuspiciousStringMethodInspectionMerger extends InspectionElementsMerger {
+
+  @Override
+  public String getMergedToolName() {
+    return "CallToSuspiciousStringMethod";
+  }
+
+  @Override
+  public String[] getSourceToolNames() {
+    return new String[] {
+      "StringEquals",
+      "StringEqualsIgnoreCase",
+      "StringCompareTo"
+    };
+  }
+
+  @Override
+  public String[] getSuppressIds() {
+    return new String[] {
+      "CallToStringEquals",
+      "CallToStringEqualsIgnoreCase",
+      "CallToStringCompareTo"
+    };
+  }
+}
diff --git a/plugins/InspectionGadgets/InspectionGadgetsAnalysis/src/com/siyeh/ig/internationalization/NonNlsUtils.java b/plugins/InspectionGadgets/InspectionGadgetsAnalysis/src/com/siyeh/ig/internationalization/NonNlsUtils.java
index 41edbaa238bc..91ffdb08df6d 100644
--- a/plugins/InspectionGadgets/InspectionGadgetsAnalysis/src/com/siyeh/ig/internationalization/NonNlsUtils.java
+++ b/plugins/InspectionGadgets/InspectionGadgetsAnalysis/src/com/siyeh/ig/internationalization/NonNlsUtils.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2007-2015 Bas Leijdekkers
+ * Copyright 2007-2016 Bas Leijdekkers
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -22,9 +22,9 @@ import com.intellij.psi.util.PsiTreeUtil;
 import com.siyeh.ig.psiutils.MethodUtils;
 import org.jetbrains.annotations.Nullable;
 
-public class NonNlsUtils {
+class NonNlsUtils {
 
-  private static final Key<Boolean> KEY = new Key("IG_NON_NLS_ANNOTATED_USE");
+  private static final Key<Boolean> KEY = new Key<>("IG_NON_NLS_ANNOTATED_USE");
 
   private NonNlsUtils() {
   }
diff --git a/plugins/InspectionGadgets/InspectionGadgetsAnalysis/src/com/siyeh/ig/internationalization/StringCompareToInspection.java b/plugins/InspectionGadgets/InspectionGadgetsAnalysis/src/com/siyeh/ig/internationalization/StringCompareToInspection.java
deleted file mode 100644
index b149a722b7e8..000000000000
--- a/plugins/InspectionGadgets/InspectionGadgetsAnalysis/src/com/siyeh/ig/internationalization/StringCompareToInspection.java
+++ /dev/null
@@ -1,146 +0,0 @@
-/*
- * Copyright 2003-2010 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.
- * You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-package com.siyeh.ig.internationalization;
-
-import com.intellij.codeInsight.AnnotationUtil;
-import com.intellij.codeInsight.intention.AddAnnotationPsiFix;
-import com.intellij.psi.*;
-import com.siyeh.HardcodedMethodConstants;
-import com.siyeh.InspectionGadgetsBundle;
-import com.siyeh.ig.BaseInspection;
-import com.siyeh.ig.BaseInspectionVisitor;
-import com.siyeh.ig.DelegatingFix;
-import com.siyeh.ig.InspectionGadgetsFix;
-import com.siyeh.ig.psiutils.MethodUtils;
-import com.siyeh.ig.psiutils.TypeUtils;
-import org.intellij.lang.annotations.Pattern;
-import org.jetbrains.annotations.NotNull;
-
-import java.util.ArrayList;
-import java.util.List;
-
-public class StringCompareToInspection extends BaseInspection {
-
-  @Pattern(VALID_ID_PATTERN)
-  @Override
-  @NotNull
-  public String getID() {
-    return "CallToStringCompareTo";
-  }
-
-  @Override
-  @NotNull
-  public String getDisplayName() {
-    return InspectionGadgetsBundle.message(
-      "string.compareto.call.display.name");
-  }
-
-  @Override
-  @NotNull
-  public String buildErrorString(Object... infos) {
-    return InspectionGadgetsBundle.message(
-      "string.compareto.call.problem.descriptor");
-  }
-
-  @Override
-  @NotNull
-  protected InspectionGadgetsFix[] buildFixes(Object... infos) {
-    final PsiMethodCallExpression methodCallExpression =
-      (PsiMethodCallExpression)infos[0];
-    final List<InspectionGadgetsFix> result = new ArrayList<>();
-    final PsiReferenceExpression methodExpression =
-      methodCallExpression.getMethodExpression();
-    final PsiModifierListOwner annotatableQualifier =
-      NonNlsUtils.getAnnotatableQualifier(
-        methodExpression);
-    if (annotatableQualifier != null) {
-      final InspectionGadgetsFix fix = new DelegatingFix(
-        new AddAnnotationPsiFix(AnnotationUtil.NON_NLS,
-                             annotatableQualifier,PsiNameValuePair.EMPTY_ARRAY));
-      result.add(fix);
-    }
-    final PsiModifierListOwner annotatableArgument =
-      NonNlsUtils.getAnnotatableArgument(
-        methodCallExpression);
-    if (annotatableArgument != null) {
-      final InspectionGadgetsFix fix = new DelegatingFix(
-        new AddAnnotationPsiFix(AnnotationUtil.NON_NLS,
-                             annotatableArgument,PsiNameValuePair.EMPTY_ARRAY));
-      result.add(fix);
-    }
-    return result.toArray(new InspectionGadgetsFix[result.size()]);
-  }
-
-  @Override
-  public BaseInspectionVisitor buildVisitor() {
-    return new StringCompareToVisitor();
-  }
-
-  private static class StringCompareToVisitor extends BaseInspectionVisitor {
-
-    @Override
-    public void visitMethodCallExpression(
-      @NotNull PsiMethodCallExpression expression) {
-      super.visitMethodCallExpression(expression);
-      if (!isStringCompareTo(expression)) {
-        return;
-      }
-      final PsiReferenceExpression methodExpression =
-        expression.getMethodExpression();
-      final PsiExpression qualifier =
-        methodExpression.getQualifierExpression();
-      if (NonNlsUtils.isNonNlsAnnotated(qualifier)) {
-        return;
-      }
-      final PsiExpressionList argumentList = expression.getArgumentList();
-      final PsiExpression[] arguments = argumentList.getExpressions();
-      if (arguments.length != 1) {
-        return;
-      }
-      if (NonNlsUtils.isNonNlsAnnotated(arguments[0])) {
-        return;
-      }
-      registerMethodCallError(expression, expression);
-    }
-
-    private static boolean isStringCompareTo(
-      PsiMethodCallExpression expression) {
-      final PsiReferenceExpression methodExpression =
-        expression.getMethodExpression();
-      final String name = methodExpression.getReferenceName();
-      if (!HardcodedMethodConstants.COMPARE_TO.equals(name)) {
-        return false;
-      }
-      final PsiMethod method = expression.resolveMethod();
-      if (!MethodUtils.isCompareTo(method)) {
-        return false;
-      }
-      final PsiParameterList parameterList = method.getParameterList();
-      final PsiParameter[] parameters = parameterList.getParameters();
-      final PsiType parameterType = parameters[0].getType();
-      if (!TypeUtils.isJavaLangObject(parameterType) &&
-          !TypeUtils.isJavaLangString(parameterType)) {
-        return false;
-      }
-      final PsiClass aClass = method.getContainingClass();
-      if (aClass == null) {
-        return false;
-      }
-      final String className = aClass.getQualifiedName();
-      return CommonClassNames.JAVA_LANG_STRING.equals(className);
-    }
-  }
-}
\ No newline at end of file
diff --git a/plugins/InspectionGadgets/InspectionGadgetsAnalysis/src/com/siyeh/ig/internationalization/StringEqualsIgnoreCaseInspection.java b/plugins/InspectionGadgets/InspectionGadgetsAnalysis/src/com/siyeh/ig/internationalization/StringEqualsIgnoreCaseInspection.java
deleted file mode 100644
index c48ba1cd1824..000000000000
--- a/plugins/InspectionGadgets/InspectionGadgetsAnalysis/src/com/siyeh/ig/internationalization/StringEqualsIgnoreCaseInspection.java
+++ /dev/null
@@ -1,142 +0,0 @@
-/*
- * Copyright 2003-2010 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.
- * You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-package com.siyeh.ig.internationalization;
-
-import com.intellij.codeInsight.AnnotationUtil;
-import com.intellij.codeInsight.intention.AddAnnotationPsiFix;
-import com.intellij.psi.*;
-import com.siyeh.HardcodedMethodConstants;
-import com.siyeh.InspectionGadgetsBundle;
-import com.siyeh.ig.BaseInspection;
-import com.siyeh.ig.BaseInspectionVisitor;
-import com.siyeh.ig.DelegatingFix;
-import com.siyeh.ig.InspectionGadgetsFix;
-import com.siyeh.ig.psiutils.TypeUtils;
-import org.jetbrains.annotations.NotNull;
-
-import java.util.ArrayList;
-import java.util.List;
-
-public class StringEqualsIgnoreCaseInspection extends BaseInspection {
-
-  @Override
-  @NotNull
-  public String getID() {
-    return "CallToStringEqualsIgnoreCase";
-  }
-
-  @Override
-  @NotNull
-  public String getDisplayName() {
-    return InspectionGadgetsBundle.message(
-      "string.equalsignorecase.call.display.name");
-  }
-
-  @Override
-  @NotNull
-  public String buildErrorString(Object... infos) {
-    return InspectionGadgetsBundle.message(
-      "string.equalsignorecase.call.problem.descriptor");
-  }
-
-  @Override
-  @NotNull
-  protected InspectionGadgetsFix[] buildFixes(Object... infos) {
-    final PsiMethodCallExpression methodCallExpression =
-      (PsiMethodCallExpression)infos[0];
-    final List<InspectionGadgetsFix> result = new ArrayList();
-    final PsiReferenceExpression methodExpression =
-      methodCallExpression.getMethodExpression();
-    final PsiModifierListOwner annotatableQualifier =
-      NonNlsUtils.getAnnotatableQualifier(methodExpression);
-    if (annotatableQualifier != null) {
-      final InspectionGadgetsFix fix =
-        createAddAnnotationFix(annotatableQualifier);
-      result.add(fix);
-    }
-    final PsiModifierListOwner annotatableArgument =
-      NonNlsUtils.getAnnotatableArgument(
-        methodCallExpression);
-    if (annotatableArgument != null) {
-      final InspectionGadgetsFix fix =
-        createAddAnnotationFix(annotatableArgument);
-      result.add(fix);
-    }
-    return result.toArray(new InspectionGadgetsFix[result.size()]);
-  }
-
-  private static DelegatingFix createAddAnnotationFix(PsiModifierListOwner annotatableQualifier) {
-    return new DelegatingFix(new AddAnnotationPsiFix(
-      AnnotationUtil.NON_NLS, annotatableQualifier,PsiNameValuePair.EMPTY_ARRAY));
-  }
-
-  @Override
-  public BaseInspectionVisitor buildVisitor() {
-    return new StringEqualsIgnoreCaseVisitor();
-  }
-
-  private static class StringEqualsIgnoreCaseVisitor
-    extends BaseInspectionVisitor {
-
-    @Override
-    public void visitMethodCallExpression(
-      @NotNull PsiMethodCallExpression expression) {
-      super.visitMethodCallExpression(expression);
-      final PsiReferenceExpression methodExpression =
-        expression.getMethodExpression();
-      final String methodName = methodExpression.getReferenceName();
-      if (!HardcodedMethodConstants.EQUALS_IGNORE_CASE.equals(
-        methodName)) {
-        return;
-      }
-      final PsiMethod method = expression.resolveMethod();
-      if (method == null) {
-        return;
-      }
-      final PsiParameterList parameterList = method.getParameterList();
-      if (parameterList.getParametersCount() != 1) {
-        return;
-      }
-      final PsiParameter[] parameters = parameterList.getParameters();
-      final PsiType parameterType = parameters[0].getType();
-      if (!TypeUtils.isJavaLangString(parameterType)) {
-        return;
-      }
-      final PsiClass aClass = method.getContainingClass();
-      if (aClass == null) {
-        return;
-      }
-      final String className = aClass.getQualifiedName();
-      if (!CommonClassNames.JAVA_LANG_STRING.equals(className)) {
-        return;
-      }
-      final PsiExpression qualifier =
-        methodExpression.getQualifierExpression();
-      if (NonNlsUtils.isNonNlsAnnotated(qualifier)) {
-        return;
-      }
-      final PsiExpressionList argumentList = expression.getArgumentList();
-      final PsiExpression[] arguments = argumentList.getExpressions();
-      if (arguments.length != 1) {
-        return;
-      }
-      if (NonNlsUtils.isNonNlsAnnotated(arguments[0])) {
-        return;
-      }
-      registerMethodCallError(expression, expression);
-    }
-  }
-}
\ No newline at end of file
diff --git a/plugins/InspectionGadgets/src/inspectionDescriptions/CallToSuspiciousStringMethod.html b/plugins/InspectionGadgets/src/inspectionDescriptions/CallToSuspiciousStringMethod.html
new file mode 100644
index 000000000000..1535cf988163
--- /dev/null
+++ b/plugins/InspectionGadgets/src/inspectionDescriptions/CallToSuspiciousStringMethod.html
@@ -0,0 +1,9 @@
+<html>
+<body>
+Reports any call of <b>equals()</b>, <b>equalsIgnoreCase()</b>, <b>compareTo()</b> or <b>compareToIgnoreCase()</b> on <b>String</b> objects.
+Such calls are usually incorrect in an internationalized environment.
+<!-- tooltip end -->
+<p>
+
+</body>
+</html>
\ No newline at end of file
diff --git a/plugins/InspectionGadgets/src/inspectionDescriptions/StringCompareTo.html b/plugins/InspectionGadgets/src/inspectionDescriptions/StringCompareTo.html
deleted file mode 100644
index d4bf66f9ac8f..000000000000
--- a/plugins/InspectionGadgets/src/inspectionDescriptions/StringCompareTo.html
+++ /dev/null
@@ -1,9 +0,0 @@
-<html>
-<body>
-Reports any call of <b>compareTo()</b> on <b>String</b> objects. Such calls are usually
-incorrect in an internationalized environment.
-<!-- tooltip end -->
-<p>
-
-</body>
-</html>
\ No newline at end of file
diff --git a/plugins/InspectionGadgets/src/inspectionDescriptions/StringEquals.html b/plugins/InspectionGadgets/src/inspectionDescriptions/StringEquals.html
deleted file mode 100644
index d9ad1a0fb6bd..000000000000
--- a/plugins/InspectionGadgets/src/inspectionDescriptions/StringEquals.html
+++ /dev/null
@@ -1,9 +0,0 @@
-<html>
-<body>
-Reports any call of <b>equals()</b> on <b>String</b> objects. Such calls are usually
-incorrect in an internationalized environment.
-<!-- tooltip end -->
-<p>
-
-</body>
-</html>
\ No newline at end of file
diff --git a/plugins/InspectionGadgets/src/inspectionDescriptions/StringEqualsIgnoreCase.html b/plugins/InspectionGadgets/src/inspectionDescriptions/StringEqualsIgnoreCase.html
deleted file mode 100644
index 3556e6472e39..000000000000
--- a/plugins/InspectionGadgets/src/inspectionDescriptions/StringEqualsIgnoreCase.html
+++ /dev/null
@@ -1,9 +0,0 @@
-<html>
-<body>
-Reports any call of <b>equalsIgnoreCase()</b> on <b>String</b> objects. Such calls are usually
-incorrect in an internationalized environment.
-<!-- tooltip end -->
-<p>
-
-</body>
-</html>
\ No newline at end of file
diff --git a/plugins/InspectionGadgets/test/com/siyeh/igtest/internationalization/StringCompareToInspection.java b/plugins/InspectionGadgets/test/com/siyeh/igtest/internationalization/StringCompareToInspection.java
deleted file mode 100644
index df6da4d5e838..000000000000
--- a/plugins/InspectionGadgets/test/com/siyeh/igtest/internationalization/StringCompareToInspection.java
+++ /dev/null
@@ -1,13 +0,0 @@
-package com.siyeh.igtest.internationalization;
-
-public class StringCompareToInspection
-{
-    public StringCompareToInspection()
-    {
-    }
-
-    public void foo()
-    {
-        "foo".compareTo("bar");
-    }
-}
\ No newline at end of file
diff --git a/plugins/InspectionGadgets/test/com/siyeh/igtest/internationalization/StringEqualsIgnoreCaseInspection.java b/plugins/InspectionGadgets/test/com/siyeh/igtest/internationalization/StringEqualsIgnoreCaseInspection.java
deleted file mode 100644
index 1fab129ff45f..000000000000
--- a/plugins/InspectionGadgets/test/com/siyeh/igtest/internationalization/StringEqualsIgnoreCaseInspection.java
+++ /dev/null
@@ -1,13 +0,0 @@
-package com.siyeh.igtest.internationalization;
-
-public class StringEqualsIgnoreCaseInspection
-{
-    public StringEqualsIgnoreCaseInspection()
-    {
-    }
-
-    public void foo()
-    {
-        "foo".equalsIgnoreCase("bar");
-    }
-}
\ No newline at end of file
diff --git a/plugins/InspectionGadgets/test/com/siyeh/igtest/internationalization/StringEqualsInspection.java b/plugins/InspectionGadgets/test/com/siyeh/igtest/internationalization/StringEqualsInspection.java
deleted file mode 100644
index aa1754bdc48a..000000000000
--- a/plugins/InspectionGadgets/test/com/siyeh/igtest/internationalization/StringEqualsInspection.java
+++ /dev/null
@@ -1,13 +0,0 @@
-package com.siyeh.igtest.internationalization;
-
-public class StringEqualsInspection
-{
-    public StringEqualsInspection()
-    {
-    }
-
-    public void foo()
-    {
-        "foo".equals("bar");
-    }
-}
\ No newline at end of file
diff --git a/plugins/InspectionGadgets/test/com/siyeh/igtest/internationalization/call_to_suspicious_string_method/CallToSuspiciousStringMethod.java b/plugins/InspectionGadgets/test/com/siyeh/igtest/internationalization/call_to_suspicious_string_method/CallToSuspiciousStringMethod.java
new file mode 100644
index 000000000000..2404b3bd291f
--- /dev/null
+++ b/plugins/InspectionGadgets/test/com/siyeh/igtest/internationalization/call_to_suspicious_string_method/CallToSuspiciousStringMethod.java
@@ -0,0 +1,18 @@
+class CallToSuspiciousStringMethod {
+
+  void m(String a, String b) {
+    a.<warning descr="'String.equals()' called in internationalized context">equals</warning>(b);
+    a.<warning descr="'String.equalsIgnoreCase()' called in internationalized context">equalsIgnoreCase</warning>(b);
+    a.<warning descr="'String.compareTo()' called in internationalized context">compareTo</warning>(b);
+    a.<warning descr="'String.compareToIgnoreCase()' called in internationalized context">compareToIgnoreCase</warning>(b);
+  }
+
+  @SuppressWarnings({"CallToStringCompareTo", "CallToStringEquals", "CallToStringEqualsIgnoreCase"})
+  void n(String a, String b) {
+    a.equals(b);
+    a.equalsIgnoreCase(b);
+    a.compareTo(b);
+    //noinspection CallToSuspiciousStringMethod
+    a.compareToIgnoreCase(b);
+  }
+}
\ No newline at end of file
diff --git a/plugins/InspectionGadgets/testsrc/com/siyeh/ig/internationalization/CallToSuspiciousStringMethodInspectionTest.java b/plugins/InspectionGadgets/testsrc/com/siyeh/ig/internationalization/CallToSuspiciousStringMethodInspectionTest.java
new file mode 100644
index 000000000000..c9f4d22b0095
--- /dev/null
+++ b/plugins/InspectionGadgets/testsrc/com/siyeh/ig/internationalization/CallToSuspiciousStringMethodInspectionTest.java
@@ -0,0 +1,36 @@
+/*
+ * Copyright 2000-2016 JetBrains s.r.o.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+package com.siyeh.ig.internationalization;
+
+import com.intellij.codeInspection.InspectionProfileEntry;
+import com.siyeh.ig.LightInspectionTestCase;
+import org.jetbrains.annotations.Nullable;
+
+/**
+ * @author Bas Leijdekkers
+ */
+public class CallToSuspiciousStringMethodInspectionTest extends LightInspectionTestCase {
+
+  public void testCallToSuspiciousStringMethod() {
+    doTest();
+  }
+
+  @Nullable
+  @Override
+  protected InspectionProfileEntry getInspection() {
+    return new CallToSuspiciousStringMethodInspection();
+  }
+}
\ No newline at end of file