Java: enable "Anonymous class can be replaced with inner class" inspection by default at information level (IDEA-341832)

GitOrigin-RevId: 4d5616004282fba912228d4afd082dfd0aeb92eb
This commit is contained in:
Bas Leijdekkers
2023-12-28 17:40:15 +00:00
committed by intellij-monorepo-bot
parent f60c642158
commit 06bfde0897
4 changed files with 24 additions and 16 deletions
@@ -788,7 +788,7 @@ junit.test.class.naming.convention.element.description=Test class
junit.test.suite.naming.convention.element.description=Test suite
method.coupling.display.name=Overly coupled method
collections.must.have.initial.capacity.display.name=Collection without initial capacity
anonymous.inner.class.display.name=Anonymous inner class can be replaced with inner class
anonymous.inner.class.display.name=Anonymous class can be replaced with inner class
negated.conditional.display.name=Conditional expression with negated condition
non.reproducible.math.call.display.name=Non-reproducible call to 'Math'
multiple.top.level.classes.in.file.display.name=Multiple top level classes in single file
@@ -883,7 +883,7 @@ empty.class.problem.descriptor=Class <code>#ref</code> is empty #loc
empty.enum.problem.descriptor=Enum <code>#ref</code> is empty #loc
empty.class.file.without.class.problem.descriptor=Java file does not declare any class #loc
empty.anonymous.class.problem.descriptor=Anonymous class is empty #loc
anonymous.inner.class.problem.descriptor=Anonymous inner class <code>#ref</code> #loc
anonymous.inner.class.problem.descriptor=Anonymous class <code>#ref</code> #loc
limited.scope.inner.class.problem.descriptor=Local class <code>#ref</code> #loc
final.method.problem.descriptor=Method declared <code>#ref</code> #loc
class.initializer.problem.descriptor=Non-'static' initializer #loc
@@ -411,8 +411,8 @@
<!--group.names.class.structure-->
<localInspection groupPath="Java" language="JAVA" shortName="AnonymousInnerClass" bundle="messages.InspectionGadgetsBundle" key="anonymous.inner.class.display.name"
groupBundle="messages.InspectionsBundle" groupKey="group.names.class.structure" enabledByDefault="false"
level="WARNING" implementationClass="com.siyeh.ig.classlayout.AnonymousInnerClassInspection"/>
groupBundle="messages.InspectionsBundle" groupKey="group.names.class.structure" enabledByDefault="true"
level="INFORMATION" implementationClass="com.siyeh.ig.classlayout.AnonymousInnerClassInspection"/>
<localInspection groupPath="Java" language="JAVA" suppressId="NonStaticInitializer" shortName="ClassInitializer" bundle="messages.InspectionGadgetsBundle"
key="class.initializer.display.name" groupBundle="messages.InspectionsBundle" groupKey="group.names.class.structure"
enabledByDefault="false" level="WARNING" implementationClass="com.siyeh.ig.classlayout.ClassInitializerInspection"/>
@@ -1,5 +1,5 @@
/*
* Copyright 2003-2008 Dave Griffith, Bas Leijdekkers
* Copyright 2003-2023 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.
@@ -17,7 +17,7 @@ package com.siyeh.ig.classlayout;
import com.intellij.codeInspection.LocalQuickFix;
import com.intellij.psi.PsiAnonymousClass;
import com.intellij.psi.PsiClass;
import com.intellij.psi.PsiElement;
import com.intellij.psi.PsiEnumConstantInitializer;
import com.siyeh.InspectionGadgetsBundle;
import com.siyeh.ig.BaseInspection;
@@ -35,8 +35,7 @@ public final class AnonymousInnerClassInspection extends BaseInspection {
@Override
@NotNull
protected String buildErrorString(Object... infos) {
return InspectionGadgetsBundle.message(
"anonymous.inner.class.problem.descriptor");
return InspectionGadgetsBundle.message("anonymous.inner.class.problem.descriptor");
}
@Override
@@ -49,13 +48,7 @@ public final class AnonymousInnerClassInspection extends BaseInspection {
return new AnonymousInnerClassVisitor();
}
private static class AnonymousInnerClassVisitor
extends BaseInspectionVisitor {
@Override
public void visitClass(@NotNull PsiClass aClass) {
//no call to super here, to avoid double counting
}
private static class AnonymousInnerClassVisitor extends BaseInspectionVisitor {
@Override
public void visitAnonymousClass(@NotNull PsiAnonymousClass aClass) {
@@ -63,7 +56,16 @@ public final class AnonymousInnerClassInspection extends BaseInspection {
if (aClass instanceof PsiEnumConstantInitializer) {
return;
}
registerClassError(aClass);
if (isVisibleHighlight(aClass)) {
registerClassError(aClass);
}
else {
final PsiElement lBrace = aClass.getLBrace();
assert lBrace != null;
int length = aClass.getStartOffsetInParent() + lBrace.getStartOffsetInParent();
PsiElement newExpression = aClass.getParent();
registerErrorAtOffset(newExpression, 0, length);
}
}
}
}
@@ -16,8 +16,10 @@
package com.siyeh.ig.fixes;
import com.intellij.codeInspection.util.IntentionFamilyName;
import com.intellij.psi.PsiAnonymousClass;
import com.intellij.psi.PsiClass;
import com.intellij.psi.PsiElement;
import com.intellij.psi.PsiNewExpression;
import com.intellij.refactoring.JavaRefactoringActionHandlerFactory;
import com.intellij.refactoring.RefactoringActionHandler;
import com.siyeh.InspectionGadgetsBundle;
@@ -49,6 +51,10 @@ public class MoveAnonymousToInnerClassFix extends RefactoringInspectionGadgetsFi
@Override
public PsiElement getElementToRefactor(PsiElement element) {
if (element instanceof PsiNewExpression newExpression) {
PsiAnonymousClass anonymousClass = newExpression.getAnonymousClass();
if (anonymousClass != null) return anonymousClass;
}
return element instanceof PsiClass ? element : element.getParent();
}
}