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

I18nInspection: support parentheses when check for suppression on equals()

Browse Source
This commit is contained in:
Tagir Valeev
2018-07-11 14:43:41 +07:00
parent d749bc6013
commit fc9ed3f447
4 changed files with 43 additions and 32 deletions
Download Patch File Download Diff File Expand all files Collapse all files
plugins/java-i18n/src/com/intellij/codeInspection/i18n/I18nInspection.java
+10 -32
View File
@@ -20,8 +20,6 @@ import com.intellij.openapi.util.WriteExternalException;
import com.intellij.openapi.util.text.StringUtil;
import com.intellij.psi.*;
import com.intellij.psi.search.GlobalSearchScope;
import com.intellij.psi.util.MethodSignature;
import com.intellij.psi.util.MethodSignatureUtil;
import com.intellij.psi.util.PsiTreeUtil;
import com.intellij.psi.util.PsiUtil;
import com.intellij.refactoring.introduceField.IntroduceConstantHandler;
@@ -31,6 +29,8 @@ import com.intellij.ui.FieldPanel;
import com.intellij.ui.ScrollPaneFactory;
import com.intellij.util.containers.ContainerUtil;
import com.siyeh.ig.psiutils.ExceptionUtils;
import com.siyeh.ig.psiutils.ExpressionUtils;
import com.siyeh.ig.psiutils.MethodCallUtils;
import gnu.trove.THashSet;
import org.jdom.Element;
import org.jetbrains.annotations.NonNls;
@@ -725,40 +725,18 @@ public class I18nInspection extends AbstractBaseJavaLocalInspectionTool implemen
}
private static boolean isInNonNlsEquals(PsiExpression expression, final Set<PsiModifierListOwner> nonNlsTargets) {
if (!(expression.getParent().getParent() instanceof PsiMethodCallExpression)) {
return false;
}
final PsiMethodCallExpression call = (PsiMethodCallExpression)expression.getParent().getParent();
final PsiReferenceExpression methodExpression = call.getMethodExpression();
final PsiExpression qualifier = methodExpression.getQualifierExpression();
if (qualifier != expression) {
return false;
}
if (!"equals".equals(methodExpression.getReferenceName())) {
return false;
}
final PsiElement resolved = methodExpression.resolve();
if (!(resolved instanceof PsiMethod)) {
return false;
}
PsiType objectType = PsiType.getJavaLangObject(resolved.getManager(), resolved.getResolveScope());
MethodSignature equalsSignature = MethodSignatureUtil.createMethodSignature("equals",
new PsiType[]{objectType},
PsiTypeParameter.EMPTY_ARRAY,
PsiSubstitutor.EMPTY);
if (!equalsSignature.equals(((PsiMethod)resolved).getSignature(PsiSubstitutor.EMPTY))) {
return false;
}
final PsiMethodCallExpression call = ExpressionUtils.getCallForQualifier(expression);
if (call == null || !MethodCallUtils.isEqualsCall(call)) return false;
final PsiExpression[] expressions = call.getArgumentList().getExpressions();
if (expressions.length != 1) {
return false;
}
final PsiExpression arg = expressions[0];
if (expressions.length != 1) return false;
final PsiExpression arg = PsiUtil.skipParenthesizedExprDown(expressions[0]);
PsiReferenceExpression ref = null;
if (arg instanceof PsiReferenceExpression) {
ref = (PsiReferenceExpression)arg;
}
else if (arg instanceof PsiMethodCallExpression) ref = ((PsiMethodCallExpression)arg).getMethodExpression();
else if (arg instanceof PsiMethodCallExpression) {
ref = ((PsiMethodCallExpression)arg).getMethodExpression();
}
if (ref != null) {
final PsiElement resolvedEntity = ref.resolve();
if (resolvedEntity instanceof PsiModifierListOwner) {
@@ -813,7 +791,7 @@ public class I18nInspection extends AbstractBaseJavaLocalInspectionTool implemen
private static boolean isNonNlsCall(PsiMethodCallExpression grParent, Set<PsiModifierListOwner> nonNlsTargets) {
final PsiReferenceExpression methodExpression = grParent.getMethodExpression();
final PsiExpression qualifier = methodExpression.getQualifierExpression();
final PsiExpression qualifier = PsiUtil.skipParenthesizedExprDown(methodExpression.getQualifierExpression());
if (qualifier instanceof PsiReferenceExpression) {
final PsiElement resolved = ((PsiReferenceExpression)qualifier).resolve();
if (resolved instanceof PsiModifierListOwner) {
plugins/java-i18n/testData/inspections/i18n/nonNlsEquals/expected.xml
+22
View File
@@ -0,0 +1,22 @@
<?xml version="1.0" encoding="UTF-8"?>
<problems>
<problem>
<file>Test.java</file>
<line>4</line>
<module>testNonNlsEquals</module>
<package>&lt;default&gt;</package>
<entry_point TYPE="method" FQNAME="Foo void test(java.lang.String s, java.lang.String s1)" />
<problem_class severity="WARNING" attribute_key="WARNING_ATTRIBUTES">Hard coded strings</problem_class>
<description>Hard coded string literal: &quot;bar&quot;</description>
</problem>
<problem>
<file>Test.java</file>
<line>6</line>
<module>testNonNlsEquals</module>
<package>&lt;default&gt;</package>
<entry_point TYPE="method" FQNAME="Foo void test(java.lang.String s, java.lang.String s1)" />
<problem_class severity="WARNING" attribute_key="WARNING_ATTRIBUTES">Hard coded strings</problem_class>
<description>Hard coded string literal: &quot;bar&quot;</description>
</problem>
</problems>
plugins/java-i18n/testData/inspections/i18n/nonNlsEquals/src/Test.java
+10
View File
@@ -0,0 +1,10 @@
class Foo {
void test(@org.jetbrains.annotations.NonNls String s, String s1) {
if (s.equals("bar")) {}
if (s1.equals("bar")) {}
if ("bar".equals(s)) {}
if ("bar".equals(s1)) {}
if (("bar").equals((s))) {}
if ((s).equals(("bar"))) {}
}
}
plugins/java-i18n/testSrc/com/intellij/codeInspection/i18n/I18NInspectionTest.java
+1
View File
@@ -44,6 +44,7 @@ public class I18NInspectionTest extends LightCodeInsightFixtureTestCase {
public void testVarargNonNlsParameter() { doTest(); }
public void testInitializerInAnonymousClass() { doTest(); }
public void testNonNlsArray() { doTest(); }
public void testNonNlsEquals() { doTest(); }
public void testParameterInNewAnonymousClass() { doTest(); }
public void testConstructorCallOfNonNlsVariable() { doTest(); }
public void testSwitchOnNonNlsString() { doTest(); }