Skip to content

Commit 0710ed7

Browse files
unv-unvunv-unv
committed
Localizing inspections (part 5).
1 parent 637c7cd commit 0710ed7

50 files changed

Lines changed: 3800 additions & 3798 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.

‎plugin/src/main/java/com/intellij/java/impl/ig/errorhandling/InstanceofCatchParameterInspection.java‎

Lines changed: 35 additions & 37 deletions
Original file line numberDiff line numberDiff line change
@@ -22,49 +22,47 @@
2222
import com.siyeh.localize.InspectionGadgetsLocalize;
2323
import consulo.annotation.component.ExtensionImpl;
2424
import consulo.language.psi.PsiElement;
25+
import consulo.localize.LocalizeValue;
2526
import jakarta.annotation.Nonnull;
2627

2728
@ExtensionImpl
2829
public class InstanceofCatchParameterInspection extends BaseInspection {
30+
@Nonnull
31+
@Override
32+
public LocalizeValue getDisplayName() {
33+
return InspectionGadgetsLocalize.instanceofCatchParameterDisplayName();
34+
}
2935

30-
@Nonnull
31-
public String getDisplayName() {
32-
return InspectionGadgetsLocalize.instanceofCatchParameterDisplayName().get();
33-
}
34-
35-
@Nonnull
36-
protected String buildErrorString(Object... infos) {
37-
return InspectionGadgetsLocalize.instanceofCatchParameterProblemDescriptor().get();
38-
}
39-
40-
public BaseInspectionVisitor buildVisitor() {
41-
return new InstanceofCatchParameterVisitor();
42-
}
36+
@Nonnull
37+
protected String buildErrorString(Object... infos) {
38+
return InspectionGadgetsLocalize.instanceofCatchParameterProblemDescriptor().get();
39+
}
4340

44-
private static class InstanceofCatchParameterVisitor
45-
extends BaseInspectionVisitor {
41+
public BaseInspectionVisitor buildVisitor() {
42+
return new InstanceofCatchParameterVisitor();
43+
}
4644

47-
@Override
48-
public void visitInstanceOfExpression(
49-
@Nonnull PsiInstanceOfExpression exp) {
50-
super.visitInstanceOfExpression(exp);
51-
if (!ControlFlowUtils.isInCatchBlock(exp)) {
52-
return;
53-
}
54-
final PsiExpression operand = exp.getOperand();
55-
if (!(operand instanceof PsiReferenceExpression)) {
56-
return;
57-
}
58-
final PsiReferenceExpression ref = (PsiReferenceExpression)operand;
59-
final PsiElement referent = ref.resolve();
60-
if (!(referent instanceof PsiParameter)) {
61-
return;
62-
}
63-
final PsiParameter parameter = (PsiParameter)referent;
64-
if (!(parameter.getDeclarationScope() instanceof PsiCatchSection)) {
65-
return;
66-
}
67-
registerError(exp);
45+
private static class InstanceofCatchParameterVisitor extends BaseInspectionVisitor {
46+
@Override
47+
public void visitInstanceOfExpression(@Nonnull PsiInstanceOfExpression exp) {
48+
super.visitInstanceOfExpression(exp);
49+
if (!ControlFlowUtils.isInCatchBlock(exp)) {
50+
return;
51+
}
52+
final PsiExpression operand = exp.getOperand();
53+
if (!(operand instanceof PsiReferenceExpression)) {
54+
return;
55+
}
56+
final PsiReferenceExpression ref = (PsiReferenceExpression) operand;
57+
final PsiElement referent = ref.resolve();
58+
if (!(referent instanceof PsiParameter)) {
59+
return;
60+
}
61+
final PsiParameter parameter = (PsiParameter) referent;
62+
if (!(parameter.getDeclarationScope() instanceof PsiCatchSection)) {
63+
return;
64+
}
65+
registerError(exp);
66+
}
6867
}
69-
}
7068
}

‎plugin/src/main/java/com/intellij/java/impl/ig/errorhandling/NestedTryStatementInspection.java‎

Lines changed: 48 additions & 47 deletions
Original file line numberDiff line numberDiff line change
@@ -15,64 +15,65 @@
1515
*/
1616
package com.intellij.java.impl.ig.errorhandling;
1717

18-
import com.siyeh.localize.InspectionGadgetsLocalize;
19-
import jakarta.annotation.Nonnull;
20-
2118
import com.intellij.java.language.psi.PsiCodeBlock;
2219
import com.intellij.java.language.psi.PsiMethod;
2320
import com.intellij.java.language.psi.PsiTryStatement;
24-
import consulo.annotation.component.ExtensionImpl;
25-
import consulo.language.psi.util.PsiTreeUtil;
26-
import com.siyeh.InspectionGadgetsBundle;
2721
import com.siyeh.ig.BaseInspection;
2822
import com.siyeh.ig.BaseInspectionVisitor;
23+
import com.siyeh.localize.InspectionGadgetsLocalize;
24+
import consulo.annotation.component.ExtensionImpl;
25+
import consulo.language.psi.util.PsiTreeUtil;
26+
import consulo.localize.LocalizeValue;
27+
import jakarta.annotation.Nonnull;
2928

3029
@ExtensionImpl
3130
public class NestedTryStatementInspection extends BaseInspection {
31+
@Nonnull
32+
@Override
33+
public LocalizeValue getDisplayName() {
34+
return InspectionGadgetsLocalize.nestedTryStatementDisplayName();
35+
}
3236

33-
@Nonnull
34-
public String getDisplayName() {
35-
return InspectionGadgetsLocalize.nestedTryStatementDisplayName().get();
36-
}
37-
38-
@Nonnull
39-
protected String buildErrorString(Object... infos) {
40-
return InspectionGadgetsLocalize.nestedTryStatementProblemDescriptor().get();
41-
}
37+
@Nonnull
38+
protected String buildErrorString(Object... infos) {
39+
return InspectionGadgetsLocalize.nestedTryStatementProblemDescriptor().get();
40+
}
4241

43-
public BaseInspectionVisitor buildVisitor() {
44-
return new NestedTryStatementVisitor();
45-
}
42+
public BaseInspectionVisitor buildVisitor() {
43+
return new NestedTryStatementVisitor();
44+
}
4645

47-
private static class NestedTryStatementVisitor
48-
extends BaseInspectionVisitor {
46+
private static class NestedTryStatementVisitor
47+
extends BaseInspectionVisitor {
4948

50-
@Override
51-
public void visitTryStatement(@Nonnull PsiTryStatement statement) {
52-
super.visitTryStatement(statement);
53-
final PsiTryStatement parentTry =
54-
PsiTreeUtil.getParentOfType(statement,
55-
PsiTryStatement.class);
56-
if (parentTry == null) {
57-
return;
58-
}
59-
final PsiCodeBlock tryBlock = parentTry.getTryBlock();
60-
if (tryBlock == null) {
61-
return;
62-
}
63-
if (!PsiTreeUtil.isAncestor(tryBlock, statement, true)) {
64-
return;
65-
}
66-
final PsiMethod containingMethod =
67-
PsiTreeUtil.getParentOfType(statement, PsiMethod.class);
68-
final PsiMethod containingContainingMethod =
69-
PsiTreeUtil.getParentOfType(parentTry, PsiMethod.class);
70-
if (containingMethod == null ||
71-
containingContainingMethod == null ||
72-
!containingMethod.equals(containingContainingMethod)) {
73-
return;
74-
}
75-
registerStatementError(statement);
49+
@Override
50+
public void visitTryStatement(@Nonnull PsiTryStatement statement) {
51+
super.visitTryStatement(statement);
52+
final PsiTryStatement parentTry =
53+
PsiTreeUtil.getParentOfType(
54+
statement,
55+
PsiTryStatement.class
56+
);
57+
if (parentTry == null) {
58+
return;
59+
}
60+
final PsiCodeBlock tryBlock = parentTry.getTryBlock();
61+
if (tryBlock == null) {
62+
return;
63+
}
64+
if (!PsiTreeUtil.isAncestor(tryBlock, statement, true)) {
65+
return;
66+
}
67+
final PsiMethod containingMethod =
68+
PsiTreeUtil.getParentOfType(statement, PsiMethod.class);
69+
final PsiMethod containingContainingMethod =
70+
PsiTreeUtil.getParentOfType(parentTry, PsiMethod.class);
71+
if (containingMethod == null ||
72+
containingContainingMethod == null ||
73+
!containingMethod.equals(containingContainingMethod)) {
74+
return;
75+
}
76+
registerStatementError(statement);
77+
}
7678
}
77-
}
7879
}

‎plugin/src/main/java/com/intellij/java/impl/ig/errorhandling/NewExceptionWithoutArgumentsInspection.java‎

Lines changed: 65 additions & 66 deletions
Original file line numberDiff line numberDiff line change
@@ -25,85 +25,84 @@
2525
import consulo.language.psi.PsiElement;
2626
import consulo.localize.LocalizeValue;
2727
import jakarta.annotation.Nonnull;
28-
import org.jetbrains.annotations.Nls;
2928

3029
import javax.swing.*;
3130

3231
@ExtensionImpl
3332
public class NewExceptionWithoutArgumentsInspection extends BaseInspection {
33+
@SuppressWarnings("PublicField")
34+
public boolean ignoreWithoutParameters = false;
3435

35-
@SuppressWarnings("PublicField")
36-
public boolean ignoreWithoutParameters = false;
37-
38-
@Nls
39-
@Nonnull
40-
@Override
41-
public String getDisplayName() {
42-
return InspectionGadgetsLocalize.newExceptionWithoutArgumentsDisplayName().get();
43-
}
44-
45-
@Nonnull
46-
@Override
47-
protected String buildErrorString(Object... infos) {
48-
return InspectionGadgetsLocalize.newExceptionWithoutArgumentsProblemDescriptor().get();
49-
}
50-
51-
@Override
52-
public JComponent createOptionsPanel() {
53-
LocalizeValue message = InspectionGadgetsLocalize.newExceptionWithoutArgumentsIgnoreOption();
54-
return new SingleCheckboxOptionsPanel(message.get(), this, "ignoreWithoutParameters");
55-
}
36+
@Nonnull
37+
@Override
38+
public LocalizeValue getDisplayName() {
39+
return InspectionGadgetsLocalize.newExceptionWithoutArgumentsDisplayName();
40+
}
5641

57-
@Override
58-
public BaseInspectionVisitor buildVisitor() {
59-
return new NewExceptionWithoutArgumentsVisitor();
60-
}
42+
@Nonnull
43+
@Override
44+
protected String buildErrorString(Object... infos) {
45+
return InspectionGadgetsLocalize.newExceptionWithoutArgumentsProblemDescriptor().get();
46+
}
6147

62-
private class NewExceptionWithoutArgumentsVisitor extends BaseInspectionVisitor {
48+
@Override
49+
public JComponent createOptionsPanel() {
50+
LocalizeValue message = InspectionGadgetsLocalize.newExceptionWithoutArgumentsIgnoreOption();
51+
return new SingleCheckboxOptionsPanel(message.get(), this, "ignoreWithoutParameters");
52+
}
6353

6454
@Override
65-
public void visitNewExpression(PsiNewExpression expression) {
66-
super.visitNewExpression(expression);
67-
final PsiExpressionList argumentList = expression.getArgumentList();
68-
if (argumentList == null) {
69-
return;
70-
}
71-
final PsiExpression[] expressions = argumentList.getExpressions();
72-
if (expressions.length != 0) {
73-
return;
74-
}
75-
final PsiJavaCodeReferenceElement classReference = expression.getClassReference();
76-
if (classReference == null) {
77-
return;
78-
}
79-
final PsiElement target = classReference.resolve();
80-
if (!(target instanceof PsiClass)) {
81-
return;
82-
}
83-
final PsiClass aClass = (PsiClass)target;
84-
if (!InheritanceUtil.isInheritor(aClass, CommonClassNames.JAVA_LANG_EXCEPTION)) {
85-
return;
86-
}
87-
if (ignoreWithoutParameters) {
88-
if (!hasAccessibleConstructorWithParameters(aClass, expression)) return;
89-
}
90-
registerNewExpressionError(expression);
55+
public BaseInspectionVisitor buildVisitor() {
56+
return new NewExceptionWithoutArgumentsVisitor();
9157
}
9258

93-
private boolean hasAccessibleConstructorWithParameters(PsiClass aClass, PsiElement context) {
94-
final PsiMethod[] constructors = aClass.getConstructors();
95-
for (PsiMethod constructor : constructors) {
96-
final PsiParameterList parameterList = constructor.getParameterList();
97-
final int count = parameterList.getParametersCount();
98-
if (count <= 0) {
99-
continue;
59+
private class NewExceptionWithoutArgumentsVisitor extends BaseInspectionVisitor {
60+
61+
@Override
62+
public void visitNewExpression(PsiNewExpression expression) {
63+
super.visitNewExpression(expression);
64+
final PsiExpressionList argumentList = expression.getArgumentList();
65+
if (argumentList == null) {
66+
return;
67+
}
68+
final PsiExpression[] expressions = argumentList.getExpressions();
69+
if (expressions.length != 0) {
70+
return;
71+
}
72+
final PsiJavaCodeReferenceElement classReference = expression.getClassReference();
73+
if (classReference == null) {
74+
return;
75+
}
76+
final PsiElement target = classReference.resolve();
77+
if (!(target instanceof PsiClass)) {
78+
return;
79+
}
80+
final PsiClass aClass = (PsiClass) target;
81+
if (!InheritanceUtil.isInheritor(aClass, CommonClassNames.JAVA_LANG_EXCEPTION)) {
82+
return;
83+
}
84+
if (ignoreWithoutParameters) {
85+
if (!hasAccessibleConstructorWithParameters(aClass, expression)) {
86+
return;
87+
}
88+
}
89+
registerNewExpressionError(expression);
10090
}
101-
final PsiResolveHelper resolveHelper = JavaPsiFacade.getInstance(context.getProject()).getResolveHelper();
102-
if (resolveHelper.isAccessible(constructor, context, aClass)) {
103-
return true;
91+
92+
private boolean hasAccessibleConstructorWithParameters(PsiClass aClass, PsiElement context) {
93+
final PsiMethod[] constructors = aClass.getConstructors();
94+
for (PsiMethod constructor : constructors) {
95+
final PsiParameterList parameterList = constructor.getParameterList();
96+
final int count = parameterList.getParametersCount();
97+
if (count <= 0) {
98+
continue;
99+
}
100+
final PsiResolveHelper resolveHelper = JavaPsiFacade.getInstance(context.getProject()).getResolveHelper();
101+
if (resolveHelper.isAccessible(constructor, context, aClass)) {
102+
return true;
103+
}
104+
}
105+
return false;
104106
}
105-
}
106-
return false;
107107
}
108-
}
109108
}

0 commit comments

Comments
 (0)