IDEA-160207 Redundant default parameter value assignment doesn’t catch unnecessary array assignments

This commit is contained in:
Dmitry Avdeev
2016-08-25 12:10:53 +03:00
parent c6d7c4eda0
commit 03d53cc1d5
3 changed files with 43 additions and 2 deletions

View File

@@ -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;
}
}

View File

@@ -0,0 +1,10 @@
// "Remove redundant parameter" "true"
@interface Anno {
String[] foo() default {"One", "Two"};
}
@Anno()
class Foo {
}

View File

@@ -0,0 +1,10 @@
// "Remove redundant parameter" "true"
@interface Anno {
String[] foo() default {"One", "Two"};
}
@Anno(foo = {"One", <caret>"Two"})
class Foo {
}