phoedos/pmd
1
1 Fork 1
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

fix AvoidFieldNameMatchingMethodName without enum

Browse Source
This commit is contained in:
Scrsloota committed 2022-05-28 00:17:11 +08:00
1 parent 51fa5e400f
commit 1a62ddffad
1 file changed
+32 -22
Download Patch File Download Diff File Expand all files Collapse all files
pmd-java/src/main/java/net/sourceforge/pmd/lang/java/rule/errorprone/AvoidFieldNameMatchingMethodNameRule.java
+32 -22
View File
@@ -13,8 +13,11 @@ import java.util.Set;
import net.sourceforge.pmd.lang.ast.Node;
import net.sourceforge.pmd.lang.java.ast.ASTClassOrInterfaceBody;
import net.sourceforge.pmd.lang.java.ast.ASTClassOrInterfaceDeclaration;
import net.sourceforge.pmd.lang.java.ast.ASTEnumBody;
import net.sourceforge.pmd.lang.java.ast.ASTEnumDeclaration;
import net.sourceforge.pmd.lang.java.ast.ASTFieldDeclaration;
import net.sourceforge.pmd.lang.java.ast.ASTMethodDeclaration;
import net.sourceforge.pmd.lang.java.ast.JavaNode;
import net.sourceforge.pmd.lang.java.rule.AbstractJavaRule;
public class AvoidFieldNameMatchingMethodNameRule extends AbstractJavaRule {
@@ -28,29 +31,36 @@ public class AvoidFieldNameMatchingMethodNameRule extends AbstractJavaRule {
}
@Override
public Object visit(ASTClassOrInterfaceBody node, Object data) {
int n = node.getNumChildren();
List<ASTFieldDeclaration> fields = new ArrayList<>();
Set<String> methodNames = new HashSet<>();
for (int i = 0; i < n; i++) {
Node child = node.getChild(i);
if (child.getNumChildren() == 0) {
continue;
}
child = child.getChild(child.getNumChildren() - 1);
if (child instanceof ASTFieldDeclaration) {
fields.add((ASTFieldDeclaration) child);
} else if (child instanceof ASTMethodDeclaration) {
methodNames.add(((ASTMethodDeclaration) child).getName().toLowerCase(Locale.ROOT));
}
}
for (ASTFieldDeclaration field : fields) {
String varName = field.getVariableName().toLowerCase(Locale.ROOT);
if (methodNames.contains(varName)) {
addViolation(data, field, field.getVariableName());
}
}
public Object visit(ASTEnumDeclaration node, Object data) {
return super.visit(node, data);
}
@Override
public Object visit(JavaNode node, Object data) {
if (node instanceof ASTClassOrInterfaceBody || node instanceof ASTEnumBody) {
int n = node.getNumChildren();
List<ASTFieldDeclaration> fields = new ArrayList<>();
Set<String> methodNames = new HashSet<>();
for (int i = 0; i < n; i++) {
Node child = node.getChild(i);
if (child.getNumChildren() == 0) {
continue;
}
child = child.getChild(child.getNumChildren() - 1);
if (child instanceof ASTFieldDeclaration) {
fields.add((ASTFieldDeclaration) child);
} else if (child instanceof ASTMethodDeclaration) {
methodNames.add(((ASTMethodDeclaration) child).getName().toLowerCase(Locale.ROOT));
}
}
for (ASTFieldDeclaration field : fields) {
String varName = field.getVariableName().toLowerCase(Locale.ROOT);
if (methodNames.contains(varName)) {
addViolation(data, field, field.getVariableName());
}
}
return super.visit(node, data);
}
return super.visit(node, data);
}
}