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

[java] Cleanup in designer bindings

Browse Source
This commit is contained in:
Clément Fournier
2022-07-26 16:43:45 +02:00
parent 9602343b0b
commit ceddb93fb5
1 changed files with 6 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

16
pmd-java/src/main/java/net/sourceforge/pmd/lang/java/internal/JavaDesignerBindings.java
View File

@ -16,6 +16,7 @@ import org.checkerframework.checker.nullness.qual.NonNull;
import net.sourceforge.pmd.lang.ast.Node;
import net.sourceforge.pmd.lang.java.ast.ASTAnnotation;
import net.sourceforge.pmd.lang.java.ast.ASTAnyTypeDeclaration;
import net.sourceforge.pmd.lang.java.ast.ASTAssignableExpr.ASTNamedReferenceExpr;
import net.sourceforge.pmd.lang.java.ast.ASTClassOrInterfaceType;
import net.sourceforge.pmd.lang.java.ast.ASTCompactConstructorDeclaration;
import net.sourceforge.pmd.lang.java.ast.ASTConstructorDeclaration;
@ -35,8 +36,8 @@ import net.sourceforge.pmd.lang.java.ast.JModifier;
import net.sourceforge.pmd.lang.java.ast.JavaNode;
import net.sourceforge.pmd.lang.java.ast.JavaVisitorBase;
import net.sourceforge.pmd.lang.java.ast.TypeNode;
import net.sourceforge.pmd.lang.java.symbols.JVariableSymbol;
import net.sourceforge.pmd.lang.java.types.JTypeMirror;
import net.sourceforge.pmd.lang.java.types.JVariableSig;
import net.sourceforge.pmd.lang.rule.xpath.Attribute;
import net.sourceforge.pmd.util.designerbindings.DesignerBindings.DefaultDesignerBindings;
import net.sourceforge.pmd.util.designerbindings.RelatedNodesSelector;
@ -118,15 +119,10 @@ public final class JavaDesignerBindings extends DefaultDesignerBindings {
@Override
public RelatedNodesSelector getRelatedNodesSelector() {
return n -> {
if (n instanceof ASTVariableAccess) {
// poor man's reference search
JVariableSig var = ((JavaNode) n).getSymbolTable()
.variables()
.resolveFirst(n.getImage());
if (var != null) {
return n.getRoot().descendants(ASTVariableDeclaratorId.class)
.filter(it -> it.getSymbol().equals(var.getSymbol()))
.toList(it -> it);
if (n instanceof ASTNamedReferenceExpr) {
JVariableSymbol sym = ((ASTNamedReferenceExpr) n).getReferencedSym();
if (sym != null && sym.tryGetNode() != null) {
return Collections.unmodifiableList(sym.tryGetNode().getLocalUsages());
}
}