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

Merge branch 'java-grammar' into typeres-jtypes

Browse Source
This commit is contained in:
Clément Fournier
2020-08-23 20:05:43 +02:00
parent 2795af335e 30466cd793
commit 77f8c554ad
2 changed files with 12 additions and 18 deletions
Download Patch File Download Diff File Expand all files Collapse all files

15
pmd-java/src/test/java/net/sourceforge/pmd/lang/java/JavaAttributesPrinter.java
View File

@@ -4,7 +4,6 @@
package net.sourceforge.pmd.lang.java; package net.sourceforge.pmd.lang.java;
import java.util.ArrayList;
import java.util.List; import java.util.List;
import java.util.Set; import java.util.Set;
import java.util.stream.Collectors; import java.util.stream.Collectors;
@@ -23,19 +22,13 @@ import net.sourceforge.pmd.lang.rule.xpath.Attribute;
*/ */
public class JavaAttributesPrinter extends RelevantAttributePrinter { public class JavaAttributesPrinter extends RelevantAttributePrinter {
@Override @Override
protected @NonNull Iterable<AttributeInfo> getAttributes(@NonNull Node node) { protected void fillAttributes(@NonNull Node node, @NonNull List<AttributeInfo> result) {
super.fillAttributes(node, result);
if (node instanceof ASTModifierList) { if (node instanceof ASTModifierList) {
List<AttributeInfo> attributes = new ArrayList<>(); result.add(getModifierAttr("EffectiveModifiers", ((ASTModifierList) node).getEffectiveModifiers()));
super.getAttributes(node).forEach(attributes::add); result.add(getModifierAttr("ExplicitModifiers", ((ASTModifierList) node).getExplicitModifiers()));
attributes.add(getModifierAttr("EffectiveModifiers", ((ASTModifierList) node).getEffectiveModifiers()));
attributes.add(getModifierAttr("ExplicitModifiers", ((ASTModifierList) node).getExplicitModifiers()));
return attributes;
} }
return super.getAttributes(node);
} }
@Override @Override

15
pmd-lang-test/src/main/kotlin/net/sourceforge/pmd/lang/ast/test/NodePrinters.kt
View File

@@ -42,18 +42,19 @@ open class BaseNodeAttributePrinter : TextTreeRenderer(true, -1) {
protected open fun ignoreAttribute(node: Node, attribute: Attribute): Boolean = true protected open fun ignoreAttribute(node: Node, attribute: Attribute): Boolean = true
protected open fun getAttributes(node: Node): Iterable<AttributeInfo> = protected open fun fillAttributes(node: Node, result: MutableList<AttributeInfo>) {
node.xPathAttributesIterator node.xPathAttributesIterator
.asSequence() .asSequence()
.filterNot { ignoreAttribute(node, it) } .filterNot { ignoreAttribute(node, it) }
.map { AttributeInfo(it.name, it.value?.toString()) } .map { AttributeInfo(it.name, it.value?.toString()) }
.asIterable() .forEach { result += it }
}
override fun appendNodeInfoLn(out: Appendable, node: Node) { override fun appendNodeInfoLn(out: Appendable, node: Node) {
out.append(node.xPathNodeName) out.append(node.xPathNodeName)
val attrs = getAttributes(node).toMutableList() val attrs = mutableListOf<AttributeInfo>().also { fillAttributes(node, it) }
// sort to get deterministic results // sort to get deterministic results
attrs.sortBy { it.name } attrs.sortBy { it.name }