Skip to content

Commit 2dfbb3f

Browse files
unv-unvunv-unv
authored
Localizing inspections (part 6) (#213)
* Localizing inspections (part 6). * Reformatting AutoUnboxingInspection.
1 parent f56f0e4 commit 2dfbb3f

51 files changed

Lines changed: 5113 additions & 5017 deletions

File tree

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

‎java-analysis-impl/src/main/java/com/siyeh/ig/psiutils/MethodCallUtils.java‎

Lines changed: 499 additions & 460 deletions
Large diffs are not rendered by default.

‎plugin/src/main/java/com/intellij/java/impl/ig/internationalization/MagicCharacterInspection.java‎

Lines changed: 49 additions & 52 deletions
Original file line numberDiff line numberDiff line change
@@ -24,66 +24,63 @@
2424
import com.siyeh.ig.psiutils.ExpressionUtils;
2525
import com.siyeh.localize.InspectionGadgetsLocalize;
2626
import consulo.annotation.component.ExtensionImpl;
27+
import consulo.localize.LocalizeValue;
2728
import jakarta.annotation.Nonnull;
2829

2930
@ExtensionImpl
3031
public class MagicCharacterInspection extends BaseInspection {
32+
@Nonnull
33+
@Override
34+
public LocalizeValue getDisplayName() {
35+
return InspectionGadgetsLocalize.magicCharacterDisplayName();
36+
}
3137

32-
@Override
33-
@Nonnull
34-
public String getDisplayName() {
35-
return InspectionGadgetsLocalize.magicCharacterDisplayName().get();
36-
}
37-
38-
@Override
39-
@Nonnull
40-
public String buildErrorString(Object... infos) {
41-
return InspectionGadgetsLocalize.magicCharacterProblemDescriptor().get();
42-
}
43-
44-
@Override
45-
protected InspectionGadgetsFix buildFix(Object... infos) {
46-
return new IntroduceConstantFix();
47-
}
48-
49-
@Override
50-
protected boolean buildQuickFixesOnlyForOnTheFlyErrors() {
51-
return true;
52-
}
38+
@Override
39+
@Nonnull
40+
public String buildErrorString(Object... infos) {
41+
return InspectionGadgetsLocalize.magicCharacterProblemDescriptor().get();
42+
}
5343

54-
@Override
55-
public BaseInspectionVisitor buildVisitor() {
56-
return new CharacterLiteralsShouldBeExplicitlyDeclaredVisitor();
57-
}
44+
@Override
45+
protected InspectionGadgetsFix buildFix(Object... infos) {
46+
return new IntroduceConstantFix();
47+
}
5848

59-
private static class CharacterLiteralsShouldBeExplicitlyDeclaredVisitor
60-
extends BaseInspectionVisitor {
49+
@Override
50+
protected boolean buildQuickFixesOnlyForOnTheFlyErrors() {
51+
return true;
52+
}
6153

6254
@Override
63-
public void visitLiteralExpression(
64-
@Nonnull PsiLiteralExpression expression) {
65-
super.visitLiteralExpression(expression);
66-
final PsiType type = expression.getType();
67-
if (type == null) {
68-
return;
69-
}
70-
if (!type.equals(PsiType.CHAR)) {
71-
return;
72-
}
73-
final String text = expression.getText();
74-
if (text == null) {
75-
return;
76-
}
77-
if (text.equals(" ")) {
78-
return;
79-
}
80-
if (ExpressionUtils.isDeclaredConstant(expression)) {
81-
return;
82-
}
83-
if (NonNlsUtils.isNonNlsAnnotatedUse(expression)) {
84-
return;
85-
}
86-
registerError(expression);
55+
public BaseInspectionVisitor buildVisitor() {
56+
return new CharacterLiteralsShouldBeExplicitlyDeclaredVisitor();
57+
}
58+
59+
private static class CharacterLiteralsShouldBeExplicitlyDeclaredVisitor extends BaseInspectionVisitor {
60+
@Override
61+
public void visitLiteralExpression(@Nonnull PsiLiteralExpression expression) {
62+
super.visitLiteralExpression(expression);
63+
final PsiType type = expression.getType();
64+
if (type == null) {
65+
return;
66+
}
67+
if (!type.equals(PsiType.CHAR)) {
68+
return;
69+
}
70+
final String text = expression.getText();
71+
if (text == null) {
72+
return;
73+
}
74+
if (text.equals(" ")) {
75+
return;
76+
}
77+
if (ExpressionUtils.isDeclaredConstant(expression)) {
78+
return;
79+
}
80+
if (NonNlsUtils.isNonNlsAnnotatedUse(expression)) {
81+
return;
82+
}
83+
registerError(expression);
84+
}
8785
}
88-
}
8986
}

‎plugin/src/main/java/com/intellij/java/impl/ig/internationalization/NumericToStringInspection.java‎

Lines changed: 50 additions & 49 deletions
Original file line numberDiff line numberDiff line change
@@ -22,62 +22,63 @@
2222
import com.siyeh.ig.BaseInspectionVisitor;
2323
import com.siyeh.localize.InspectionGadgetsLocalize;
2424
import consulo.annotation.component.ExtensionImpl;
25+
import consulo.localize.LocalizeValue;
2526
import jakarta.annotation.Nonnull;
27+
import org.intellij.lang.annotations.Pattern;
2628

2729
@ExtensionImpl
2830
public class NumericToStringInspection extends BaseInspection {
31+
@Nonnull
32+
@Override
33+
@Pattern(VALID_ID_PATTERN)
34+
public String getID() {
35+
return "CallToNumericToString";
36+
}
2937

30-
@Nonnull
31-
public String getID() {
32-
return "CallToNumericToString";
33-
}
34-
35-
@Nonnull
36-
public String getDisplayName() {
37-
return InspectionGadgetsLocalize.callToNumericTostringDisplayName().get();
38-
}
39-
40-
@Nonnull
41-
public String buildErrorString(Object... infos) {
42-
return InspectionGadgetsLocalize.callToNumericTostringProblemDescriptor().get();
43-
}
38+
@Nonnull
39+
@Override
40+
public LocalizeValue getDisplayName() {
41+
return InspectionGadgetsLocalize.callToNumericTostringDisplayName();
42+
}
4443

45-
public BaseInspectionVisitor buildVisitor() {
46-
return new NumericToStringVisitor();
47-
}
44+
@Nonnull
45+
public String buildErrorString(Object... infos) {
46+
return InspectionGadgetsLocalize.callToNumericTostringProblemDescriptor().get();
47+
}
4848

49-
private static class NumericToStringVisitor extends BaseInspectionVisitor {
49+
public BaseInspectionVisitor buildVisitor() {
50+
return new NumericToStringVisitor();
51+
}
5052

51-
@Override
52-
public void visitMethodCallExpression(
53-
@Nonnull PsiMethodCallExpression expression) {
54-
super.visitMethodCallExpression(expression);
55-
final PsiReferenceExpression methodExpression =
56-
expression.getMethodExpression();
57-
final String methodName = methodExpression.getReferenceName();
58-
if (!HardcodedMethodConstants.TO_STRING.equals(methodName)) {
59-
return;
60-
}
61-
final PsiMethod method = expression.resolveMethod();
62-
if (method == null) {
63-
return;
64-
}
65-
final PsiParameterList parameterList = method.getParameterList();
66-
if (parameterList.getParametersCount() != 0) {
67-
return;
68-
}
69-
final PsiClass aClass = method.getContainingClass();
70-
if (aClass == null) {
71-
return;
72-
}
73-
final String className = aClass.getQualifiedName();
74-
if (!TypeConversionUtil.isPrimitiveWrapper(className)) {
75-
return;
76-
}
77-
if (NonNlsUtils.isNonNlsAnnotatedUse(expression)) {
78-
return;
79-
}
80-
registerMethodCallError(expression);
53+
private static class NumericToStringVisitor extends BaseInspectionVisitor {
54+
@Override
55+
public void visitMethodCallExpression(@Nonnull PsiMethodCallExpression expression) {
56+
super.visitMethodCallExpression(expression);
57+
final PsiReferenceExpression methodExpression = expression.getMethodExpression();
58+
final String methodName = methodExpression.getReferenceName();
59+
if (!HardcodedMethodConstants.TO_STRING.equals(methodName)) {
60+
return;
61+
}
62+
final PsiMethod method = expression.resolveMethod();
63+
if (method == null) {
64+
return;
65+
}
66+
final PsiParameterList parameterList = method.getParameterList();
67+
if (parameterList.getParametersCount() != 0) {
68+
return;
69+
}
70+
final PsiClass aClass = method.getContainingClass();
71+
if (aClass == null) {
72+
return;
73+
}
74+
final String className = aClass.getQualifiedName();
75+
if (!TypeConversionUtil.isPrimitiveWrapper(className)) {
76+
return;
77+
}
78+
if (NonNlsUtils.isNonNlsAnnotatedUse(expression)) {
79+
return;
80+
}
81+
registerMethodCallError(expression);
82+
}
8183
}
82-
}
8384
}

‎plugin/src/main/java/com/intellij/java/impl/ig/internationalization/SimpleDateFormatWithoutLocaleInspection.java‎

Lines changed: 33 additions & 33 deletions
Original file line numberDiff line numberDiff line change
@@ -23,47 +23,47 @@
2323
import com.siyeh.ig.psiutils.ExpressionUtils;
2424
import com.siyeh.localize.InspectionGadgetsLocalize;
2525
import consulo.annotation.component.ExtensionImpl;
26+
import consulo.localize.LocalizeValue;
2627
import jakarta.annotation.Nonnull;
2728

2829
@ExtensionImpl
2930
public class SimpleDateFormatWithoutLocaleInspection extends BaseInspection {
31+
@Nonnull
32+
@Override
33+
public LocalizeValue getDisplayName() {
34+
return InspectionGadgetsLocalize.instantiatingSimpledateformatWithoutLocaleDisplayName();
35+
}
3036

31-
@Override
32-
@Nonnull
33-
public String getDisplayName() {
34-
return InspectionGadgetsLocalize.instantiatingSimpledateformatWithoutLocaleDisplayName().get();
35-
}
36-
37-
@Override
38-
@Nonnull
39-
public String buildErrorString(Object... infos) {
40-
return InspectionGadgetsLocalize.instantiatingSimpledateformatWithoutLocaleProblemDescriptor().get();
41-
}
37+
@Override
38+
@Nonnull
39+
public String buildErrorString(Object... infos) {
40+
return InspectionGadgetsLocalize.instantiatingSimpledateformatWithoutLocaleProblemDescriptor().get();
41+
}
4242

43-
@Override
44-
public BaseInspectionVisitor buildVisitor() {
45-
return new SimpleDateFormatWithoutLocaleVisitor();
46-
}
43+
@Override
44+
public BaseInspectionVisitor buildVisitor() {
45+
return new SimpleDateFormatWithoutLocaleVisitor();
46+
}
4747

48-
private static class SimpleDateFormatWithoutLocaleVisitor extends BaseInspectionVisitor {
48+
private static class SimpleDateFormatWithoutLocaleVisitor extends BaseInspectionVisitor {
4949

50-
@Override
51-
public void visitNewExpression(@Nonnull PsiNewExpression expression) {
52-
super.visitNewExpression(expression);
53-
if (!ExpressionUtils.hasType(expression, "java.text.SimpleDateFormat")) {
54-
return;
55-
}
56-
final PsiExpressionList argumentList = expression.getArgumentList();
57-
if (argumentList == null) {
58-
return;
59-
}
60-
final PsiExpression[] arguments = argumentList.getExpressions();
61-
for (PsiExpression argument : arguments) {
62-
if (ExpressionUtils.hasType(argument, "java.util.Locale")) {
63-
return;
50+
@Override
51+
public void visitNewExpression(@Nonnull PsiNewExpression expression) {
52+
super.visitNewExpression(expression);
53+
if (!ExpressionUtils.hasType(expression, "java.text.SimpleDateFormat")) {
54+
return;
55+
}
56+
final PsiExpressionList argumentList = expression.getArgumentList();
57+
if (argumentList == null) {
58+
return;
59+
}
60+
final PsiExpression[] arguments = argumentList.getExpressions();
61+
for (PsiExpression argument : arguments) {
62+
if (ExpressionUtils.hasType(argument, "java.util.Locale")) {
63+
return;
64+
}
65+
}
66+
registerError(expression);
6467
}
65-
}
66-
registerError(expression);
6768
}
68-
}
6969
}

0 commit comments

Comments
 (0)