mirror of
https://gitflic.ru/project/openide/openide.git
synced 2026-05-06 05:10:22 +07:00
IDEA-160207 Redundant default parameter value assignment doesn’t catch unnecessary array assignments
This commit is contained in:
@@ -33,14 +33,14 @@ public class DefaultAnnotationParamInspection extends BaseJavaBatchLocalInspecti
|
||||
@Override
|
||||
public void visitNameValuePair(final PsiNameValuePair pair) {
|
||||
PsiAnnotationMemberValue value = pair.getValue();
|
||||
if (!(value instanceof PsiLiteralExpression)) return;
|
||||
if (!(value instanceof PsiLiteralExpression) && !(value instanceof PsiArrayInitializerMemberValue)) return;
|
||||
PsiReference reference = pair.getReference();
|
||||
if (reference == null) return;
|
||||
PsiElement element = reference.resolve();
|
||||
if (!(element instanceof PsiAnnotationMethod)) return;
|
||||
PsiAnnotationMemberValue defaultValue = ((PsiAnnotationMethod)element).getDefaultValue();
|
||||
if (defaultValue == null) return;
|
||||
if (value.getText().equals(defaultValue.getText())) {
|
||||
if (areEqual(value, defaultValue)) {
|
||||
holder.registerProblem(value, "Redundant default parameter value assignment", ProblemHighlightType.LIKE_UNUSED_SYMBOL, new LocalQuickFix() {
|
||||
@Nls
|
||||
@NotNull
|
||||
@@ -67,4 +67,25 @@ public class DefaultAnnotationParamInspection extends BaseJavaBatchLocalInspecti
|
||||
}
|
||||
};
|
||||
}
|
||||
|
||||
private static boolean areEqual(PsiAnnotationMemberValue value, PsiAnnotationMemberValue defaultValue) {
|
||||
if (value instanceof PsiLiteralExpression && defaultValue instanceof PsiLiteralExpression) {
|
||||
return value.getText().equals(defaultValue.getText());
|
||||
}
|
||||
|
||||
if (value instanceof PsiArrayInitializerMemberValue && defaultValue instanceof PsiArrayInitializerMemberValue) {
|
||||
PsiAnnotationMemberValue[] initializers = ((PsiArrayInitializerMemberValue)value).getInitializers();
|
||||
PsiAnnotationMemberValue[] defaults = ((PsiArrayInitializerMemberValue)defaultValue).getInitializers();
|
||||
if (initializers.length != defaults.length) {
|
||||
return false;
|
||||
}
|
||||
for (int i = 0; i < initializers.length; i++) {
|
||||
if (!areEqual(initializers[i], defaults[i])) {
|
||||
return false;
|
||||
}
|
||||
}
|
||||
return true;
|
||||
}
|
||||
return false;
|
||||
}
|
||||
}
|
||||
|
||||
@@ -0,0 +1,10 @@
|
||||
// "Remove redundant parameter" "true"
|
||||
|
||||
@interface Anno {
|
||||
String[] foo() default {"One", "Two"};
|
||||
}
|
||||
|
||||
@Anno()
|
||||
class Foo {
|
||||
|
||||
}
|
||||
@@ -0,0 +1,10 @@
|
||||
// "Remove redundant parameter" "true"
|
||||
|
||||
@interface Anno {
|
||||
String[] foo() default {"One", "Two"};
|
||||
}
|
||||
|
||||
@Anno(foo = {"One", <caret>"Two"})
|
||||
class Foo {
|
||||
|
||||
}
|
||||
Reference in New Issue
Block a user