From 537df61000fb39f4ceff4132313301bc22737e53 Mon Sep 17 00:00:00 2001 From: Andreas Dangel Date: Fri, 29 Sep 2023 14:11:31 +0200 Subject: [PATCH 1/7] Bump org.scala-lang:scala-library from 2.12.17 to 2.12.18 --- pmd-scala-modules/pmd-scala_2.12/pom.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pmd-scala-modules/pmd-scala_2.12/pom.xml b/pmd-scala-modules/pmd-scala_2.12/pom.xml index d469b60e45..40a6c1628d 100644 --- a/pmd-scala-modules/pmd-scala_2.12/pom.xml +++ b/pmd-scala-modules/pmd-scala_2.12/pom.xml @@ -28,7 +28,7 @@ org.scala-lang scala-library - ${scalaVersion}.17 + ${scalaVersion}.18 org.scalameta From 5bab32ad8cbd9fa726cf883bf051a70fe4cee3cc Mon Sep 17 00:00:00 2001 From: Andreas Dangel Date: Fri, 29 Sep 2023 14:12:31 +0200 Subject: [PATCH 2/7] Bump org.scalameta:* from 4.6.0 to 4.8.11 --- pmd-scala-modules/pmd-scala-common/pom.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pmd-scala-modules/pmd-scala-common/pom.xml b/pmd-scala-modules/pmd-scala-common/pom.xml index 1b2dd79036..85501038fa 100644 --- a/pmd-scala-modules/pmd-scala-common/pom.xml +++ b/pmd-scala-modules/pmd-scala-common/pom.xml @@ -13,7 +13,7 @@ - 4.6.0 + 4.8.11 From fcaa79a718e986eeb0ff6fa521908f2ad22f52ac Mon Sep 17 00:00:00 2001 From: Andreas Dangel Date: Fri, 29 Sep 2023 14:13:07 +0200 Subject: [PATCH 3/7] Bump org.scala-lang:scala-library from 2.13.9 to 2.13.12 --- pmd-scala-modules/pmd-scala_2.13/pom.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pmd-scala-modules/pmd-scala_2.13/pom.xml b/pmd-scala-modules/pmd-scala_2.13/pom.xml index 2663300d8b..4244c31537 100644 --- a/pmd-scala-modules/pmd-scala_2.13/pom.xml +++ b/pmd-scala-modules/pmd-scala_2.13/pom.xml @@ -28,7 +28,7 @@ org.scala-lang scala-library - ${scalaVersion}.9 + ${scalaVersion}.12 org.scalameta From 21238e2a3677711d9174b1d78cf46ca6e003f96c Mon Sep 17 00:00:00 2001 From: Andreas Dangel Date: Fri, 29 Sep 2023 14:17:20 +0200 Subject: [PATCH 4/7] Bump org.scala-lang:scala-reflect from 2.13.3 to 2.13.12 --- pom.xml | 7 +++++++ 1 file changed, 7 insertions(+) diff --git a/pom.xml b/pom.xml index a2e59dabd0..b0e46d14ab 100644 --- a/pom.xml +++ b/pom.xml @@ -758,6 +758,13 @@ 32.0.1-jre + + + org.scala-lang + scala-reflect + 2.13.12 + + net.sourceforge.pmd From f6f9e55c7830a3df8d27c799dd3f7564de80a507 Mon Sep 17 00:00:00 2001 From: Andreas Dangel Date: Fri, 29 Sep 2023 15:29:37 +0200 Subject: [PATCH 5/7] [scala] Add additional AST nodes after scala-meta upgrade --- .../scala/ast/ASTMemberParamClauseGroup.java | 22 + .../pmd/lang/scala/ast/ASTPatArgClause.java | 22 + .../pmd/lang/scala/ast/ASTTermArgClause.java | 22 + .../lang/scala/ast/ASTTermParamClause.java | 22 + .../pmd/lang/scala/ast/ASTTypeArgClause.java | 22 + .../scala/ast/ASTTypeFuncParamClause.java | 22 + .../lang/scala/ast/ASTTypeParamClause.java | 22 + .../pmd/lang/scala/ast/ScalaTreeBuilder.java | 8 + .../pmd/lang/scala/rule/ScalaRuleTest.java | 2 +- .../pmd/lang/scala/ast/ScalaTreeTests.kt | 5 + .../pmd/lang/scala/ast/testdata/List.txt | 1220 ++++++++++------- .../pmd/lang/scala/ast/testdata/package.txt | 52 +- 12 files changed, 960 insertions(+), 481 deletions(-) create mode 100644 pmd-scala-modules/pmd-scala-common/src/main/java/net/sourceforge/pmd/lang/scala/ast/ASTMemberParamClauseGroup.java create mode 100644 pmd-scala-modules/pmd-scala-common/src/main/java/net/sourceforge/pmd/lang/scala/ast/ASTPatArgClause.java create mode 100644 pmd-scala-modules/pmd-scala-common/src/main/java/net/sourceforge/pmd/lang/scala/ast/ASTTermArgClause.java create mode 100644 pmd-scala-modules/pmd-scala-common/src/main/java/net/sourceforge/pmd/lang/scala/ast/ASTTermParamClause.java create mode 100644 pmd-scala-modules/pmd-scala-common/src/main/java/net/sourceforge/pmd/lang/scala/ast/ASTTypeArgClause.java create mode 100644 pmd-scala-modules/pmd-scala-common/src/main/java/net/sourceforge/pmd/lang/scala/ast/ASTTypeFuncParamClause.java create mode 100644 pmd-scala-modules/pmd-scala-common/src/main/java/net/sourceforge/pmd/lang/scala/ast/ASTTypeParamClause.java diff --git a/pmd-scala-modules/pmd-scala-common/src/main/java/net/sourceforge/pmd/lang/scala/ast/ASTMemberParamClauseGroup.java b/pmd-scala-modules/pmd-scala-common/src/main/java/net/sourceforge/pmd/lang/scala/ast/ASTMemberParamClauseGroup.java new file mode 100644 index 0000000000..0ef6b67e2e --- /dev/null +++ b/pmd-scala-modules/pmd-scala-common/src/main/java/net/sourceforge/pmd/lang/scala/ast/ASTMemberParamClauseGroup.java @@ -0,0 +1,22 @@ +/* + * BSD-style license; for more info see http://pmd.sourceforge.net/license.html + */ + +package net.sourceforge.pmd.lang.scala.ast; + +import scala.meta.Member; + +/** + * The ASTMemberParamClauseGroup node implementation. + */ +public final class ASTMemberParamClauseGroup extends AbstractScalaNode { + + ASTMemberParamClauseGroup(Member.ParamClauseGroup scalaNode) { + super(scalaNode); + } + + @Override + protected R acceptVisitor(ScalaParserVisitor visitor, P data) { + return visitor.visit(this, data); + } +} diff --git a/pmd-scala-modules/pmd-scala-common/src/main/java/net/sourceforge/pmd/lang/scala/ast/ASTPatArgClause.java b/pmd-scala-modules/pmd-scala-common/src/main/java/net/sourceforge/pmd/lang/scala/ast/ASTPatArgClause.java new file mode 100644 index 0000000000..3344e572f9 --- /dev/null +++ b/pmd-scala-modules/pmd-scala-common/src/main/java/net/sourceforge/pmd/lang/scala/ast/ASTPatArgClause.java @@ -0,0 +1,22 @@ +/* + * BSD-style license; for more info see http://pmd.sourceforge.net/license.html + */ + +package net.sourceforge.pmd.lang.scala.ast; + +import scala.meta.Pat; + +/** + * The ASTPatArgClause node implementation. + */ +public final class ASTPatArgClause extends AbstractScalaNode { + + ASTPatArgClause(Pat.ArgClause scalaNode) { + super(scalaNode); + } + + @Override + protected R acceptVisitor(ScalaParserVisitor visitor, P data) { + return visitor.visit(this, data); + } +} diff --git a/pmd-scala-modules/pmd-scala-common/src/main/java/net/sourceforge/pmd/lang/scala/ast/ASTTermArgClause.java b/pmd-scala-modules/pmd-scala-common/src/main/java/net/sourceforge/pmd/lang/scala/ast/ASTTermArgClause.java new file mode 100644 index 0000000000..68df06adcf --- /dev/null +++ b/pmd-scala-modules/pmd-scala-common/src/main/java/net/sourceforge/pmd/lang/scala/ast/ASTTermArgClause.java @@ -0,0 +1,22 @@ +/* + * BSD-style license; for more info see http://pmd.sourceforge.net/license.html + */ + +package net.sourceforge.pmd.lang.scala.ast; + +import scala.meta.Term; + +/** + * The ASTTermArgClause node implementation. + */ +public final class ASTTermArgClause extends AbstractScalaNode { + + ASTTermArgClause(Term.ArgClause scalaNode) { + super(scalaNode); + } + + @Override + protected R acceptVisitor(ScalaParserVisitor visitor, P data) { + return visitor.visit(this, data); + } +} diff --git a/pmd-scala-modules/pmd-scala-common/src/main/java/net/sourceforge/pmd/lang/scala/ast/ASTTermParamClause.java b/pmd-scala-modules/pmd-scala-common/src/main/java/net/sourceforge/pmd/lang/scala/ast/ASTTermParamClause.java new file mode 100644 index 0000000000..6cf316d3d7 --- /dev/null +++ b/pmd-scala-modules/pmd-scala-common/src/main/java/net/sourceforge/pmd/lang/scala/ast/ASTTermParamClause.java @@ -0,0 +1,22 @@ +/* + * BSD-style license; for more info see http://pmd.sourceforge.net/license.html + */ + +package net.sourceforge.pmd.lang.scala.ast; + +import scala.meta.Term; + +/** + * The ASTTermParamClause node implementation. + */ +public final class ASTTermParamClause extends AbstractScalaNode { + + ASTTermParamClause(Term.ParamClause scalaNode) { + super(scalaNode); + } + + @Override + protected R acceptVisitor(ScalaParserVisitor visitor, P data) { + return visitor.visit(this, data); + } +} diff --git a/pmd-scala-modules/pmd-scala-common/src/main/java/net/sourceforge/pmd/lang/scala/ast/ASTTypeArgClause.java b/pmd-scala-modules/pmd-scala-common/src/main/java/net/sourceforge/pmd/lang/scala/ast/ASTTypeArgClause.java new file mode 100644 index 0000000000..94b2e38707 --- /dev/null +++ b/pmd-scala-modules/pmd-scala-common/src/main/java/net/sourceforge/pmd/lang/scala/ast/ASTTypeArgClause.java @@ -0,0 +1,22 @@ +/* + * BSD-style license; for more info see http://pmd.sourceforge.net/license.html + */ + +package net.sourceforge.pmd.lang.scala.ast; + +import scala.meta.Type; + +/** + * The ASTTypeArgClause node implementation. + */ +public final class ASTTypeArgClause extends AbstractScalaNode { + + ASTTypeArgClause(Type.ArgClause scalaNode) { + super(scalaNode); + } + + @Override + protected R acceptVisitor(ScalaParserVisitor visitor, P data) { + return visitor.visit(this, data); + } +} diff --git a/pmd-scala-modules/pmd-scala-common/src/main/java/net/sourceforge/pmd/lang/scala/ast/ASTTypeFuncParamClause.java b/pmd-scala-modules/pmd-scala-common/src/main/java/net/sourceforge/pmd/lang/scala/ast/ASTTypeFuncParamClause.java new file mode 100644 index 0000000000..9b22266984 --- /dev/null +++ b/pmd-scala-modules/pmd-scala-common/src/main/java/net/sourceforge/pmd/lang/scala/ast/ASTTypeFuncParamClause.java @@ -0,0 +1,22 @@ +/* + * BSD-style license; for more info see http://pmd.sourceforge.net/license.html + */ + +package net.sourceforge.pmd.lang.scala.ast; + +import scala.meta.Type; + +/** + * The ASTTypeFuncParamClause node implementation. + */ +public final class ASTTypeFuncParamClause extends AbstractScalaNode { + + ASTTypeFuncParamClause(Type.FuncParamClause scalaNode) { + super(scalaNode); + } + + @Override + protected R acceptVisitor(ScalaParserVisitor visitor, P data) { + return visitor.visit(this, data); + } +} diff --git a/pmd-scala-modules/pmd-scala-common/src/main/java/net/sourceforge/pmd/lang/scala/ast/ASTTypeParamClause.java b/pmd-scala-modules/pmd-scala-common/src/main/java/net/sourceforge/pmd/lang/scala/ast/ASTTypeParamClause.java new file mode 100644 index 0000000000..54538f0f86 --- /dev/null +++ b/pmd-scala-modules/pmd-scala-common/src/main/java/net/sourceforge/pmd/lang/scala/ast/ASTTypeParamClause.java @@ -0,0 +1,22 @@ +/* + * BSD-style license; for more info see http://pmd.sourceforge.net/license.html + */ + +package net.sourceforge.pmd.lang.scala.ast; + +import scala.meta.Type; + +/** + * The ASTTypeParamClause node implementation. + */ +public final class ASTTypeParamClause extends AbstractScalaNode { + + ASTTypeParamClause(Type.ParamClause scalaNode) { + super(scalaNode); + } + + @Override + protected R acceptVisitor(ScalaParserVisitor visitor, P data) { + return visitor.visit(this, data); + } +} diff --git a/pmd-scala-modules/pmd-scala-common/src/main/java/net/sourceforge/pmd/lang/scala/ast/ScalaTreeBuilder.java b/pmd-scala-modules/pmd-scala-common/src/main/java/net/sourceforge/pmd/lang/scala/ast/ScalaTreeBuilder.java index 39f4f09301..3c8c96c7c1 100644 --- a/pmd-scala-modules/pmd-scala-common/src/main/java/net/sourceforge/pmd/lang/scala/ast/ScalaTreeBuilder.java +++ b/pmd-scala-modules/pmd-scala-common/src/main/java/net/sourceforge/pmd/lang/scala/ast/ScalaTreeBuilder.java @@ -21,6 +21,7 @@ import scala.meta.Importee; import scala.meta.Importer; import scala.meta.Init; import scala.meta.Lit; +import scala.meta.Member; import scala.meta.Mod; import scala.meta.Name; import scala.meta.Pat; @@ -79,6 +80,7 @@ class ScalaTreeBuilder { register(Lit.String.class, ASTLitString.class); register(Lit.Symbol.class, ASTLitSymbol.class); register(Lit.Unit.class, ASTLitUnit.class); + register(Member.ParamClauseGroup.class, ASTMemberParamClauseGroup.class); register(Mod.Abstract.class, ASTModAbstract.class); register(Mod.Annot.class, ASTModAnnot.class); register(Mod.Case.class, ASTModCase.class); @@ -97,6 +99,7 @@ class ScalaTreeBuilder { register(Name.Anonymous.class, ASTNameAnonymous.class); register(Name.Indeterminate.class, ASTNameIndeterminate.class); register(Pat.Alternative.class, ASTPatAlternative.class); + register(Pat.ArgClause.class, ASTPatArgClause.class); register(Pat.Bind.class, ASTPatBind.class); register(Pat.Extract.class, ASTPatExtract.class); register(Pat.ExtractInfix.class, ASTPatExtractInfix.class); @@ -118,6 +121,7 @@ class ScalaTreeBuilder { register(Term.ApplyInfix.class, ASTTermApplyInfix.class); register(Term.ApplyType.class, ASTTermApplyType.class); register(Term.ApplyUnary.class, ASTTermApplyUnary.class); + register(Term.ArgClause.class, ASTTermArgClause.class); register(Term.Ascribe.class, ASTTermAscribe.class); register(Term.Assign.class, ASTTermAssign.class); register(Term.Block.class, ASTTermBlock.class); @@ -133,6 +137,7 @@ class ScalaTreeBuilder { register(Term.NewAnonymous.class, ASTTermNewAnonymous.class); register(Term.New.class, ASTTermNew.class); register(Term.Param.class, ASTTermParam.class); + register(Term.ParamClause.class, ASTTermParamClause.class); register(Term.PartialFunction.class, ASTTermPartialFunction.class); register(Term.Placeholder.class, ASTTermPlaceholder.class); register(Term.Repeated.class, ASTTermRepeated.class); @@ -150,9 +155,11 @@ class ScalaTreeBuilder { register(Type.Annotate.class, ASTTypeAnnotate.class); register(Type.Apply.class, ASTTypeApply.class); register(Type.ApplyInfix.class, ASTTypeApplyInfix.class); + register(Type.ArgClause.class, ASTTypeArgClause.class); register(Type.Bounds.class, ASTTypeBounds.class); register(Type.ByName.class, ASTTypeByName.class); register(Type.Existential.class, ASTTypeExistential.class); + register(Type.FuncParamClause.class, ASTTypeFuncParamClause.class); register(Type.Function.class, ASTTypeFunction.class); register(Type.ImplicitFunction.class, ASTTypeImplicitFunction.class); register(Type.Lambda.class, ASTTypeLambda.class); @@ -160,6 +167,7 @@ class ScalaTreeBuilder { register(Type.Name.class, ASTTypeName.class); register(Type.Or.class, ASTTypeOr.class); register(Type.Param.class, ASTTypeParam.class); + register(Type.ParamClause.class, ASTTypeParamClause.class); register(Type.Placeholder.class, ASTTypePlaceholder.class); register(Type.Project.class, ASTTypeProject.class); register(Type.Refine.class, ASTTypeRefine.class); diff --git a/pmd-scala-modules/pmd-scala-common/src/test/java/net/sourceforge/pmd/lang/scala/rule/ScalaRuleTest.java b/pmd-scala-modules/pmd-scala-common/src/test/java/net/sourceforge/pmd/lang/scala/rule/ScalaRuleTest.java index 3f05e611a9..144593dfef 100644 --- a/pmd-scala-modules/pmd-scala-common/src/test/java/net/sourceforge/pmd/lang/scala/rule/ScalaRuleTest.java +++ b/pmd-scala-modules/pmd-scala-common/src/test/java/net/sourceforge/pmd/lang/scala/rule/ScalaRuleTest.java @@ -35,7 +35,7 @@ class ScalaRuleTest extends BaseScalaTest { }; ASTSource root = scala.parseResource(SCALA_TEST); rule.apply(root, null); - assertEquals(12, visited.get()); + assertEquals(13, visited.get()); } @Test diff --git a/pmd-scala-modules/pmd-scala-common/src/test/kotlin/net/sourceforge/pmd/lang/scala/ast/ScalaTreeTests.kt b/pmd-scala-modules/pmd-scala-common/src/test/kotlin/net/sourceforge/pmd/lang/scala/ast/ScalaTreeTests.kt index c2ca1ab78b..70dd763e4c 100644 --- a/pmd-scala-modules/pmd-scala-common/src/test/kotlin/net/sourceforge/pmd/lang/scala/ast/ScalaTreeTests.kt +++ b/pmd-scala-modules/pmd-scala-common/src/test/kotlin/net/sourceforge/pmd/lang/scala/ast/ScalaTreeTests.kt @@ -30,6 +30,11 @@ class Foo { it::isImplicit shouldBe false } + child { + it.assertPosition(bline = 1, bcol = 11, eline = 1, ecol = 11) // node has zero length + it::isImplicit shouldBe true + } + child { it.assertPosition(bline = 1, bcol = 11, eline = 1, ecol = 11) // node has zero length it::isImplicit shouldBe true diff --git a/pmd-scala-modules/pmd-scala-common/src/test/resources/net/sourceforge/pmd/lang/scala/ast/testdata/List.txt b/pmd-scala-modules/pmd-scala-common/src/test/resources/net/sourceforge/pmd/lang/scala/ast/testdata/List.txt index 52f77880f0..18a538a8ff 100644 --- a/pmd-scala-modules/pmd-scala-common/src/test/resources/net/sourceforge/pmd/lang/scala/ast/testdata/List.txt +++ b/pmd-scala-modules/pmd-scala-common/src/test/resources/net/sourceforge/pmd/lang/scala/ast/testdata/List.txt @@ -51,59 +51,71 @@ | | +- Init | | +- TypeName | | +- NameAnonymous - | | +- LitLong + | | +- TermArgClause + | | +- LitLong | +- ModSealed | +- ModAbstract | +- TypeName - | +- TypeParam - | | +- ModCovariant - | | +- TypeName - | | +- TypeBounds + | +- TypeParamClause + | | +- TypeParam + | | +- ModCovariant + | | +- TypeName + | | +- TypeParamClause + | | +- TypeBounds | +- CtorPrimary | | +- NameAnonymous | +- Template | +- Init | | +- TypeApply | | | +- TypeName - | | | +- TypeName - | | +- NameAnonymous - | +- Init - | | +- TypeApply - | | | +- TypeName - | | | +- TypeName - | | +- NameAnonymous - | +- Init - | | +- TypeApply - | | | +- TypeName - | | | +- TypeName - | | | +- TypeName - | | | +- TypeApply - | | | +- TypeName + | | | +- TypeArgClause | | | +- TypeName | | +- NameAnonymous | +- Init | | +- TypeApply | | | +- TypeName - | | | +- TypeName - | | | +- TypeName - | | | +- TypeApply - | | | +- TypeName + | | | +- TypeArgClause | | | +- TypeName | | +- NameAnonymous | +- Init | | +- TypeApply | | | +- TypeName - | | | +- TypeName - | | | +- TypeName - | | | +- TypeApply + | | | +- TypeArgClause | | | +- TypeName | | | +- TypeName + | | | +- TypeApply + | | | +- TypeName + | | | +- TypeArgClause + | | | +- TypeName | | +- NameAnonymous | +- Init | | +- TypeApply | | | +- TypeName + | | | +- TypeArgClause + | | | +- TypeName + | | | +- TypeName + | | | +- TypeApply + | | | +- TypeName + | | | +- TypeArgClause + | | | +- TypeName + | | +- NameAnonymous + | +- Init + | | +- TypeApply | | | +- TypeName + | | | +- TypeArgClause + | | | +- TypeName + | | | +- TypeName + | | | +- TypeApply + | | | +- TypeName + | | | +- TypeArgClause + | | | +- TypeName + | | +- NameAnonymous + | +- Init + | | +- TypeApply | | | +- TypeName + | | | +- TypeArgClause + | | | +- TypeName + | | | +- TypeName | | +- NameAnonymous | +- Init | | +- TypeName @@ -115,25 +127,34 @@ | | +- TermName | | +- TypeApply | | | +- TypeName - | | | +- TypeName + | | | +- TypeArgClause + | | | +- TypeName | | +- TermName | +- DefnDef | | +- ModOverride | | +- TermName - | | +- TermParam - | | | +- TermName - | | | +- TypeName + | | +- MemberParamClauseGroup + | | | +- TypeParamClause + | | | +- TermParamClause + | | | +- TermParam + | | | +- TermName + | | | +- TypeName | | +- TypeApply | | | +- TypeName - | | | +- TypeName + | | | +- TypeArgClause + | | | +- TypeName | | +- TermIf | | +- TermApplyInfix | | | +- TermName | | | +- TermName - | | | +- TermApplyInfix - | | | +- TermName - | | | +- TermName - | | | +- LitInt + | | | +- TypeArgClause + | | | +- TermArgClause + | | | +- TermApplyInfix + | | | +- TermName + | | | +- TermName + | | | +- TypeArgClause + | | | +- TermArgClause + | | | +- LitInt | | +- TermName | | +- TermBlock | | +- DefnVal @@ -143,8 +164,9 @@ | | | +- Init | | | +- TypeName | | | +- NameAnonymous - | | | +- TermName - | | | +- TermName + | | | +- TermArgClause + | | | +- TermName + | | | +- TermName | | +- DefnVar | | | +- PatVar | | | | +- TermName @@ -170,12 +192,16 @@ | | | | +- TermApplyInfix | | | | +- TermName | | | | +- TermName - | | | | +- TermName + | | | | +- TypeArgClause + | | | | +- TermArgClause + | | | | +- TermName | | | +- TermBlock | | | +- TermApplyInfix | | | | +- TermName | | | | +- TermName - | | | | +- LitInt + | | | | +- TypeArgClause + | | | | +- TermArgClause + | | | | +- LitInt | | | +- DefnVal | | | | +- PatVar | | | | | +- TermName @@ -183,10 +209,11 @@ | | | | +- Init | | | | +- TypeName | | | | +- NameAnonymous - | | | | +- TermSelect - | | | | | +- TermName - | | | | | +- TermName - | | | | +- TermName + | | | | +- TermArgClause + | | | | +- TermSelect + | | | | | +- TermName + | | | | | +- TermName + | | | | +- TermName | | | +- TermAssign | | | | +- TermSelect | | | | | +- TermName @@ -202,19 +229,24 @@ | | | +- TermName | | +- TermApply | | | +- TermName + | | | +- TermArgClause | | +- TermName | +- DefnDef | | +- ModOverride | | +- TermName - | | +- TermParam - | | | +- TermName - | | | +- TypeName - | | +- TermParam - | | | +- TermName - | | | +- TypeName + | | +- MemberParamClauseGroup + | | | +- TypeParamClause + | | | +- TermParamClause + | | | +- TermParam + | | | | +- TermName + | | | | +- TypeName + | | | +- TermParam + | | | +- TermName + | | | +- TypeName | | +- TypeApply | | | +- TypeName - | | | +- TypeName + | | | +- TypeArgClause + | | | +- TypeName | | +- TermBlock | | +- DefnVal | | | +- PatVar @@ -225,37 +257,52 @@ | | | | | +- TermName | | | | | +- TermName | | | | +- TermName - | | | +- TermName - | | | +- LitInt + | | | +- TermArgClause + | | | +- TermName + | | | +- LitInt | | +- TermIf | | +- TermApplyInfix | | | +- TermApplyInfix | | | | +- TermName | | | | +- TermName - | | | | +- TermName - | | | +- TermName + | | | | +- TypeArgClause + | | | | +- TermArgClause + | | | | +- TermName | | | +- TermName + | | | +- TypeArgClause + | | | +- TermArgClause + | | | +- TermName | | +- TermName | | +- TermApplyInfix | | +- TermApplyInfix | | | +- TermThis | | | | +- NameAnonymous | | | +- TermName - | | | +- TermName + | | | +- TypeArgClause + | | | +- TermArgClause + | | | +- TermName | | +- TermName - | | +- TermApplyInfix - | | +- TermName - | | +- TermName - | | +- TermName + | | +- TypeArgClause + | | +- TermArgClause + | | +- TermApplyInfix + | | +- TermName + | | +- TermName + | | +- TypeArgClause + | | +- TermArgClause + | | +- TermName | +- DefnDef | | +- ModOverride | | +- TermName - | | +- TermParam - | | | +- TermName - | | | +- TypeName + | | +- MemberParamClauseGroup + | | | +- TypeParamClause + | | | +- TermParamClause + | | | +- TermParam + | | | +- TermName + | | | +- TypeName | | +- TypeApply | | | +- TypeName - | | | +- TypeName + | | | +- TypeArgClause + | | | +- TypeName | | +- TermBlock | | +- DefnDef | | | +- ModAnnot @@ -263,19 +310,25 @@ | | | | +- TypeName | | | | +- NameAnonymous | | | +- TermName - | | | +- TermParam - | | | | +- TermName - | | | | +- TypeApply - | | | | +- TypeName - | | | | +- TypeName - | | | +- TermParam - | | | | +- TermName - | | | | +- TypeApply - | | | | +- TypeName - | | | | +- TypeName + | | | +- MemberParamClauseGroup + | | | | +- TypeParamClause + | | | | +- TermParamClause + | | | | +- TermParam + | | | | | +- TermName + | | | | | +- TypeApply + | | | | | +- TypeName + | | | | | +- TypeArgClause + | | | | | +- TypeName + | | | | +- TermParam + | | | | +- TermName + | | | | +- TypeApply + | | | | +- TypeName + | | | | +- TypeArgClause + | | | | +- TypeName | | | +- TypeApply | | | | +- TypeName - | | | | +- TypeName + | | | | +- TypeArgClause + | | | | +- TypeName | | | +- TermMatch | | | +- TermName | | | +- Case @@ -285,34 +338,43 @@ | | | +- PatExtractInfix | | | | +- PatWildcard | | | | +- TermName - | | | | +- PatVar - | | | | +- TermName + | | | | +- PatArgClause + | | | | +- PatVar + | | | | +- TermName | | | +- TermApply | | | +- TermName - | | | +- TermName - | | | +- TermSelect - | | | +- TermName + | | | +- TermArgClause | | | +- TermName + | | | +- TermSelect + | | | +- TermName + | | | +- TermName | | +- TermApply | | +- TermName - | | +- TermApply - | | | +- TermName - | | | +- TermName - | | +- TermThis - | | +- NameAnonymous + | | +- TermArgClause + | | +- TermApply + | | | +- TermName + | | | +- TermArgClause + | | | +- TermName + | | +- TermThis + | | +- NameAnonymous | +- DefnDef | | +- ModOverride | | +- TermName - | | +- TermParam - | | | +- TermName - | | | +- TypeName + | | +- MemberParamClauseGroup + | | | +- TypeParamClause + | | | +- TermParamClause + | | | +- TermParam + | | | +- TermName + | | | +- TypeName | | +- TypeTuple | | | +- TypeApply | | | | +- TypeName - | | | | +- TypeName + | | | | +- TypeArgClause + | | | | +- TypeName | | | +- TypeApply | | | +- TypeName - | | | +- TypeName + | | | +- TypeArgClause + | | | +- TypeName | | +- TermBlock | | +- DefnVal | | | +- PatVar @@ -321,7 +383,8 @@ | | | +- Init | | | +- TypeApply | | | | +- TypeName - | | | | +- TypeName + | | | | +- TypeArgClause + | | | | +- TypeName | | | +- NameAnonymous | | +- DefnVar | | | +- PatVar @@ -340,21 +403,29 @@ | | | | | +- TermName | | | | | +- TermName | | | | +- TermName - | | | | +- TermApplyInfix - | | | | +- TermName - | | | | +- TermName - | | | | +- TermName + | | | | +- TypeArgClause + | | | | +- TermArgClause + | | | | +- TermApplyInfix + | | | | +- TermName + | | | | +- TermName + | | | | +- TypeArgClause + | | | | +- TermArgClause + | | | | +- TermName | | | +- TermBlock | | | +- TermApplyInfix | | | | +- TermName | | | | +- TermName - | | | | +- LitInt + | | | | +- TypeArgClause + | | | | +- TermArgClause + | | | | +- LitInt | | | +- TermApplyInfix | | | | +- TermName | | | | +- TermName - | | | | +- TermSelect - | | | | +- TermName - | | | | +- TermName + | | | | +- TypeArgClause + | | | | +- TermArgClause + | | | | +- TermSelect + | | | | +- TermName + | | | | +- TermName | | | +- TermAssign | | | +- TermName | | | +- TermSelect @@ -368,19 +439,24 @@ | +- DefnDef | | +- ModOverride | | +- TermName - | | +- TypeParam - | | | +- TypeName - | | | +- TypeBounds - | | | +- TypeName - | | +- TermParam - | | | +- TermName - | | | +- TypeName - | | +- TermParam - | | | +- TermName - | | | +- TypeName + | | +- MemberParamClauseGroup + | | | +- TypeParamClause + | | | | +- TypeParam + | | | | +- TypeName + | | | | +- TypeParamClause + | | | | +- TypeBounds + | | | | +- TypeName + | | | +- TermParamClause + | | | +- TermParam + | | | | +- TermName + | | | | +- TypeName + | | | +- TermParam + | | | +- TermName + | | | +- TypeName | | +- TypeApply | | | +- TypeName - | | | +- TypeName + | | | +- TypeArgClause + | | | +- TypeName | | +- TermBlock | | +- DefnVar | | | +- PatVar @@ -398,28 +474,37 @@ | | | +- TermSelect | | | | +- TermName | | | | +- TermName - | | | +- TypeName + | | | +- TypeArgClause + | | | +- TypeName | | +- TermWhile | | | +- TermApplyInfix | | | | +- TermApplyInfix | | | | | +- TermName | | | | | +- TermName - | | | | | +- TermName + | | | | | +- TypeArgClause + | | | | | +- TermArgClause + | | | | | +- TermName | | | | +- TermName - | | | | +- TermSelect - | | | | +- TermName - | | | | +- TermName + | | | | +- TypeArgClause + | | | | +- TermArgClause + | | | | +- TermSelect + | | | | +- TermName + | | | | +- TermName | | | +- TermBlock | | | +- TermApplyInfix | | | | +- TermName | | | | +- TermName - | | | | +- LitInt + | | | | +- TypeArgClause + | | | | +- TermArgClause + | | | | +- LitInt | | | +- TermApplyInfix | | | | +- TermName | | | | +- TermName - | | | | +- TermSelect - | | | | +- TermName - | | | | +- TermName + | | | | +- TypeArgClause + | | | | +- TermArgClause + | | | | +- TermSelect + | | | | +- TermName + | | | | +- TermName | | | +- TermAssign | | | +- TermName | | | +- TermSelect @@ -430,63 +515,83 @@ | | | +- TermApplyInfix | | | | +- TermName | | | | +- TermName - | | | | +- TermName + | | | | +- TypeArgClause + | | | | +- TermArgClause + | | | | +- TermName | | | +- TermName - | | | +- TermSelect - | | | +- TermName - | | | +- TermName + | | | +- TypeArgClause + | | | +- TermArgClause + | | | +- TermSelect + | | | +- TermName + | | | +- TermName | | +- TermBlock | | | +- TermApply | | | +- TermSelect | | | | +- TermName | | | | +- TermName - | | | +- TermApplyInfix - | | | +- TermName - | | | +- TermName - | | | +- TermSelect + | | | +- TermArgClause + | | | +- TermApplyInfix | | | +- TermName | | | +- TermName + | | | +- TypeArgClause + | | | +- TermArgClause + | | | +- TermSelect + | | | +- TermName + | | | +- TermName | | +- TermBlock | | +- TermThrow | | +- TermNew | | +- Init | | +- TypeName | | +- NameAnonymous - | | +- TermInterpolate - | | +- TermName - | | +- LitString - | | +- LitString - | | +- LitString - | | +- TermName - | | +- TermApplyInfix + | | +- TermArgClause + | | +- TermInterpolate | | +- TermName + | | +- LitString + | | +- LitString + | | +- LitString | | +- TermName | | +- TermApplyInfix | | +- TermName | | +- TermName - | | +- LitInt + | | +- TypeArgClause + | | +- TermArgClause + | | +- TermApplyInfix + | | +- TermName + | | +- TermName + | | +- TypeArgClause + | | +- TermArgClause + | | +- LitInt | +- DefnDef | | +- ModFinal | | +- ModOverride | | +- TermName - | | +- TypeParam - | | | +- TypeName - | | | +- TypeBounds - | | +- TermParam - | | | +- TermName - | | | +- TypeFunction - | | | +- TypeName - | | | +- TypeName + | | +- MemberParamClauseGroup + | | | +- TypeParamClause + | | | | +- TypeParam + | | | | +- TypeName + | | | | +- TypeParamClause + | | | | +- TypeBounds + | | | +- TermParamClause + | | | +- TermParam + | | | +- TermName + | | | +- TypeFunction + | | | +- TypeFuncParamClause + | | | | +- TypeName + | | | +- TypeName | | +- TypeApply | | | +- TypeName - | | | +- TypeName + | | | +- TypeArgClause + | | | +- TypeName | | +- TermBlock | | +- TermIf | | +- TermApplyInfix | | | +- TermThis | | | | +- NameAnonymous | | | +- TermName - | | | +- TermName + | | | +- TypeArgClause + | | | +- TermArgClause + | | | +- TermName | | +- TermName | | +- TermBlock | | +- DefnVal @@ -496,18 +601,22 @@ | | | +- Init | | | +- TypeApply | | | | +- TypeName - | | | | +- TypeName + | | | | +- TypeArgClause + | | | | +- TypeName | | | +- NameAnonymous - | | | +- TermApply - | | | | +- TermName - | | | | +- TermName - | | | +- TermName + | | | +- TermArgClause + | | | +- TermApply + | | | | +- TermName + | | | | +- TermArgClause + | | | | +- TermName + | | | +- TermName | | +- DefnVar | | | +- PatVar | | | | +- TermName | | | +- TypeApply | | | | +- TypeName - | | | | +- TypeName + | | | | +- TypeArgClause + | | | | +- TypeName | | | +- TermName | | +- DefnVar | | | +- PatVar @@ -517,7 +626,9 @@ | | | +- TermApplyInfix | | | | +- TermName | | | | +- TermName - | | | | +- TermName + | | | | +- TypeArgClause + | | | | +- TermArgClause + | | | | +- TermName | | | +- TermBlock | | | +- DefnVal | | | | +- PatVar @@ -526,12 +637,14 @@ | | | | +- Init | | | | +- TypeName | | | | +- NameAnonymous - | | | | +- TermApply - | | | | | +- TermName - | | | | | +- TermSelect - | | | | | +- TermName - | | | | | +- TermName - | | | | +- TermName + | | | | +- TermArgClause + | | | | +- TermApply + | | | | | +- TermName + | | | | | +- TermArgClause + | | | | | +- TermSelect + | | | | | +- TermName + | | | | | +- TermName + | | | | +- TermName | | | +- TermAssign | | | | +- TermSelect | | | | | +- TermName @@ -547,30 +660,39 @@ | | | +- TermName | | +- TermApply | | | +- TermName + | | | +- TermArgClause | | +- TermName | +- DefnDef | | +- ModFinal | | +- ModOverride | | +- TermName - | | +- TypeParam - | | | +- TypeName - | | | +- TypeBounds - | | +- TermParam - | | | +- TermName - | | | +- TypeApply - | | | +- TypeName - | | | +- TypeName - | | | +- TypeName + | | +- MemberParamClauseGroup + | | | +- TypeParamClause + | | | | +- TypeParam + | | | | +- TypeName + | | | | +- TypeParamClause + | | | | +- TypeBounds + | | | +- TermParamClause + | | | +- TermParam + | | | +- TermName + | | | +- TypeApply + | | | +- TypeName + | | | +- TypeArgClause + | | | +- TypeName + | | | +- TypeName | | +- TypeApply | | | +- TypeName - | | | +- TypeName + | | | +- TypeArgClause + | | | +- TypeName | | +- TermBlock | | +- TermIf | | +- TermApplyInfix | | | +- TermThis | | | | +- NameAnonymous | | | +- TermName - | | | +- TermName + | | | +- TypeArgClause + | | | +- TermArgClause + | | | +- TermName | | +- TermName | | +- TermBlock | | +- DefnVar @@ -583,7 +705,8 @@ | | | | +- TermName | | | +- TypeApply | | | | +- TypeName - | | | | +- TypeName + | | | | +- TypeArgClause + | | | | +- TypeName | | | +- LitNull | | +- DefnVar | | | +- PatVar @@ -594,7 +717,9 @@ | | | +- TermApplyInfix | | | | +- TermName | | | | +- TermName - | | | | +- LitNull + | | | | +- TypeArgClause + | | | | +- TermArgClause + | | | | +- LitNull | | | +- TermBlock | | | +- TermAssign | | | | +- TermName @@ -602,35 +727,41 @@ | | | | +- TermSelect | | | | | +- TermName | | | | | +- TermName - | | | | +- TermSelect - | | | | | +- TermName - | | | | | +- TermName - | | | | +- TermSelect - | | | | +- TermName - | | | | +- TermName + | | | | +- TermArgClause + | | | | +- TermSelect + | | | | | +- TermName + | | | | | +- TermName + | | | | +- TermSelect + | | | | +- TermName + | | | | +- TermName | | | +- TermIf | | | | +- TermApplyInfix | | | | | +- TermApplyType | | | | | | +- TermSelect | | | | | | | +- TermName | | | | | | | +- TermName - | | | | | | +- TypeName + | | | | | | +- TypeArgClause + | | | | | | +- TypeName | | | | | +- TermName - | | | | | +- TermSelect - | | | | | +- TermName - | | | | | +- TermName + | | | | | +- TypeArgClause + | | | | | +- TermArgClause + | | | | | +- TermSelect + | | | | | +- TermName + | | | | | +- TermName | | | | +- TermAssign | | | | | +- TermName | | | | | +- TermNew | | | | | +- Init | | | | | +- TypeName | | | | | +- NameAnonymous - | | | | | +- TermApplyType - | | | | | | +- TermSelect - | | | | | | | +- TermName - | | | | | | | +- TermName - | | | | | | +- TypeName - | | | | | +- TermName + | | | | | +- TermArgClause + | | | | | +- TermApplyType + | | | | | | +- TermSelect + | | | | | | | +- TermName + | | | | | | | +- TermName + | | | | | | +- TypeArgClause + | | | | | | +- TypeName + | | | | | +- TermName | | | | +- LitUnit | | | +- TermAssign | | | | +- TermName @@ -641,13 +772,17 @@ | | | +- TermApplyInfix | | | | +- TermName | | | | +- TermName - | | | | +- TermName + | | | | +- TypeArgClause + | | | | +- TermArgClause + | | | | +- TermName | | | +- TermReturn | | | | +- TermIf | | | | +- TermApplyInfix | | | | | +- TermName | | | | | +- TermName - | | | | | +- LitNull + | | | | | +- TypeArgClause + | | | | | +- TermArgClause + | | | | | +- LitNull | | | | +- TermName | | | | +- TermName | | | +- LitUnit @@ -659,7 +794,9 @@ | | | +- TermApplyInfix | | | | +- TermName | | | | +- TermName - | | | | +- TermName + | | | | +- TypeArgClause + | | | | +- TermArgClause + | | | | +- TermName | | | +- TermBlock | | | +- TermAssign | | | | +- TermName @@ -667,23 +804,27 @@ | | | | +- TermSelect | | | | | +- TermName | | | | | +- TermName - | | | | +- TermSelect - | | | | | +- TermName - | | | | | +- TermName - | | | | +- TermSelect - | | | | +- TermName - | | | | +- TermName + | | | | +- TermArgClause + | | | | +- TermSelect + | | | | | +- TermName + | | | | | +- TermName + | | | | +- TermSelect + | | | | +- TermName + | | | | +- TermName | | | +- TermIf | | | | +- TermApplyInfix | | | | | +- TermApplyType | | | | | | +- TermSelect | | | | | | | +- TermName | | | | | | | +- TermName - | | | | | | +- TypeName + | | | | | | +- TypeArgClause + | | | | | | +- TypeName | | | | | +- TermName - | | | | | +- TermSelect - | | | | | +- TermName - | | | | | +- TermName + | | | | | +- TypeArgClause + | | | | | +- TermArgClause + | | | | | +- TermSelect + | | | | | +- TermName + | | | | | +- TermName | | | | +- TermBlock | | | | | +- DefnVal | | | | | | +- PatVar @@ -692,12 +833,14 @@ | | | | | | +- Init | | | | | | +- TypeName | | | | | | +- NameAnonymous - | | | | | | +- TermApplyType - | | | | | | | +- TermSelect - | | | | | | | | +- TermName - | | | | | | | | +- TermName - | | | | | | | +- TypeName - | | | | | | +- TermName + | | | | | | +- TermArgClause + | | | | | | +- TermApplyType + | | | | | | | +- TermSelect + | | | | | | | | +- TermName + | | | | | | | | +- TermName + | | | | | | | +- TypeArgClause + | | | | | | | +- TypeName + | | | | | | +- TermName | | | | | +- TermAssign | | | | | | +- TermSelect | | | | | | | +- TermName @@ -714,24 +857,32 @@ | | | +- TermName | | +- TermApply | | | +- TermName + | | | +- TermArgClause | | +- TermName | +- DefnDef | | +- ModFinal | | +- ModOverride | | +- TermName - | | +- TypeParam - | | | +- TypeName - | | | +- TypeBounds - | | +- TermParam - | | | +- TermName - | | | +- TypeFunction - | | | +- TypeName - | | | +- TypeApply - | | | +- TypeName - | | | +- TypeName + | | +- MemberParamClauseGroup + | | | +- TypeParamClause + | | | | +- TypeParam + | | | | +- TypeName + | | | | +- TypeParamClause + | | | | +- TypeBounds + | | | +- TermParamClause + | | | +- TermParam + | | | +- TermName + | | | +- TypeFunction + | | | +- TypeFuncParamClause + | | | | +- TypeName + | | | +- TypeApply + | | | +- TypeName + | | | +- TypeArgClause + | | | +- TypeName | | +- TypeApply | | | +- TypeName - | | | +- TypeName + | | | +- TypeArgClause + | | | +- TypeName | | +- TermBlock | | +- DefnVar | | | +- PatVar @@ -743,20 +894,24 @@ | | | | +- TermName | | | +- TypeApply | | | | +- TypeName - | | | | +- TypeName + | | | | +- TypeArgClause + | | | | +- TypeName | | | +- LitNull | | +- DefnVar | | | +- PatVar | | | | +- TermName | | | +- TypeApply | | | | +- TypeName - | | | | +- TypeName + | | | | +- TypeArgClause + | | | | +- TypeName | | | +- LitNull | | +- TermWhile | | | +- TermApplyInfix | | | | +- TermName | | | | +- TermName - | | | | +- TermName + | | | | +- TypeArgClause + | | | | +- TermArgClause + | | | | +- TermName | | | +- TermBlock | | | +- DefnVal | | | | +- PatVar @@ -764,9 +919,10 @@ | | | | +- TermSelect | | | | +- TermApply | | | | | +- TermName - | | | | | +- TermSelect - | | | | | +- TermName - | | | | | +- TermName + | | | | | +- TermArgClause + | | | | | +- TermSelect + | | | | | +- TermName + | | | | | +- TermName | | | | +- TermName | | | +- TermWhile | | | | +- TermSelect @@ -780,16 +936,20 @@ | | | | | +- Init | | | | | +- TypeName | | | | | +- NameAnonymous - | | | | | +- TermApply - | | | | | | +- TermSelect - | | | | | | +- TermName - | | | | | | +- TermName - | | | | | +- TermName + | | | | | +- TermArgClause + | | | | | +- TermApply + | | | | | | +- TermSelect + | | | | | | | +- TermName + | | | | | | | +- TermName + | | | | | | +- TermArgClause + | | | | | +- TermName | | | | +- TermIf | | | | | +- TermApplyInfix | | | | | | +- TermName | | | | | | +- TermName - | | | | | | +- LitNull + | | | | | | +- TypeArgClause + | | | | | | +- TermArgClause + | | | | | | +- LitNull | | | | | +- TermBlock | | | | | | +- TermAssign | | | | | | +- TermName @@ -812,11 +972,14 @@ | | +- TermApplyInfix | | | +- TermName | | | +- TermName - | | | +- LitNull + | | | +- TypeArgClause + | | | +- TermArgClause + | | | +- LitNull | | +- TermName | | +- TermBlock | | +- TermApply | | | +- TermName + | | | +- TermArgClause | | +- TermName | +- DefnDef | | +- ModAnnot @@ -826,14 +989,19 @@ | | +- ModFinal | | +- ModOverride | | +- TermName - | | +- TermParam - | | | +- TermName - | | | +- TypeFunction - | | | +- TypeName - | | | +- TypeName + | | +- MemberParamClauseGroup + | | | +- TypeParamClause + | | | +- TermParamClause + | | | +- TermParam + | | | +- TermName + | | | +- TypeFunction + | | | +- TypeFuncParamClause + | | | | +- TypeName + | | | +- TypeName | | +- TypeApply | | | +- TypeName - | | | +- TypeName + | | | +- TypeArgClause + | | | +- TypeName | | +- TermBlock | | +- DefnVal | | | +- PatVar @@ -842,7 +1010,8 @@ | | | +- Init | | | +- TypeApply | | | | +- TypeName - | | | | +- TypeName + | | | | +- TypeArgClause + | | | | +- TypeName | | | +- NameAnonymous | | +- DefnVar | | | +- PatVar @@ -857,18 +1026,23 @@ | | | | | +- TermName | | | | | +- TermName | | | | +- TermName - | | | | +- TermApply - | | | | +- TermName - | | | | +- TermSelect - | | | | +- TermName + | | | | +- TypeArgClause + | | | | +- TermArgClause + | | | | +- TermApply | | | | +- TermName + | | | | +- TermArgClause + | | | | +- TermSelect + | | | | +- TermName + | | | | +- TermName | | | +- TermBlock | | | +- TermApplyInfix | | | | +- TermName | | | | +- TermName - | | | | +- TermSelect - | | | | +- TermName - | | | | +- TermName + | | | | +- TypeArgClause + | | | | +- TermArgClause + | | | | +- TermSelect + | | | | +- TermName + | | | | +- TermName | | | +- TermAssign | | | +- TermName | | | +- TermSelect @@ -885,18 +1059,24 @@ | | +- ModFinal | | +- ModOverride | | +- TermName - | | +- TermParam - | | | +- TermName - | | | +- TypeFunction - | | | +- TypeName - | | | +- TypeName + | | +- MemberParamClauseGroup + | | | +- TypeParamClause + | | | +- TermParamClause + | | | +- TermParam + | | | +- TermName + | | | +- TypeFunction + | | | +- TypeFuncParamClause + | | | | +- TypeName + | | | +- TypeName | | +- TypeTuple | | | +- TypeApply | | | | +- TypeName - | | | | +- TypeName + | | | | +- TypeArgClause + | | | | +- TypeName | | | +- TypeApply | | | +- TypeName - | | | +- TypeName + | | | +- TypeArgClause + | | | +- TypeName | | +- TermBlock | | +- DefnVal | | | +- PatVar @@ -905,7 +1085,8 @@ | | | +- Init | | | +- TypeApply | | | | +- TypeName - | | | | +- TypeName + | | | | +- TypeArgClause + | | | | +- TypeName | | | +- NameAnonymous | | +- DefnVar | | | +- PatVar @@ -920,18 +1101,23 @@ | | | | | +- TermName | | | | | +- TermName | | | | +- TermName - | | | | +- TermApply - | | | | +- TermName - | | | | +- TermSelect - | | | | +- TermName + | | | | +- TypeArgClause + | | | | +- TermArgClause + | | | | +- TermApply | | | | +- TermName + | | | | +- TermArgClause + | | | | +- TermSelect + | | | | +- TermName + | | | | +- TermName | | | +- TermBlock | | | +- TermApplyInfix | | | | +- TermName | | | | +- TermName - | | | | +- TermSelect - | | | | +- TermName - | | | | +- TermName + | | | | +- TypeArgClause + | | | | +- TermArgClause + | | | | +- TermSelect + | | | | +- TermName + | | | | +- TermName | | | +- TermAssign | | | +- TermName | | | +- TermSelect @@ -950,14 +1136,19 @@ | | +- ModFinal | | +- ModOverride | | +- TermName - | | +- TypeParam - | | | +- TypeName - | | | +- TypeBounds - | | +- TermParam - | | | +- TermName - | | | +- TypeFunction - | | | +- TypeName - | | | +- TypeName + | | +- MemberParamClauseGroup + | | | +- TypeParamClause + | | | | +- TypeParam + | | | | +- TypeName + | | | | +- TypeParamClause + | | | | +- TypeBounds + | | | +- TermParamClause + | | | +- TermParam + | | | +- TermName + | | | +- TypeFunction + | | | +- TypeFuncParamClause + | | | | +- TypeName + | | | +- TypeName | | +- TypeName | | +- TermBlock | | +- DefnVar @@ -974,9 +1165,10 @@ | | +- TermBlock | | +- TermApply | | | +- TermName - | | | +- TermSelect - | | | +- TermName - | | | +- TermName + | | | +- TermArgClause + | | | +- TermSelect + | | | +- TermName + | | | +- TermName | | +- TermAssign | | +- TermName | | +- TermSelect @@ -988,14 +1180,16 @@ | | +- TermName | | +- TypeApply | | | +- TypeName - | | | +- TypeName + | | | +- TypeArgClause + | | | +- TypeName | | +- TermBlock | | +- DefnVar | | | +- PatVar | | | | +- TermName | | | +- TypeApply | | | | +- TypeName - | | | | +- TypeName + | | | | +- TypeArgClause + | | | | +- TypeName | | | +- TermName | | +- DefnVar | | | +- PatVar @@ -1016,7 +1210,9 @@ | | | | | +- TermName | | | | | +- TermName | | | | +- TermName - | | | | +- TermName + | | | | +- TypeArgClause + | | | | +- TermArgClause + | | | | +- TermName | | | +- TermAssign | | | +- TermName | | | +- TermSelect @@ -1027,18 +1223,24 @@ | | +- ModFinal | | +- ModOverride | | +- TermName - | | +- TypeParam - | | | +- TypeName - | | | +- TypeBounds - | | +- TermParam - | | | +- TermName - | | | +- TypeName - | | +- TermParam - | | | +- TermName - | | | +- TypeFunction - | | | +- TypeName - | | | +- TypeName - | | | +- TypeName + | | +- MemberParamClauseGroup + | | | +- TypeParamClause + | | | | +- TypeParam + | | | | +- TypeName + | | | | +- TypeParamClause + | | | | +- TypeBounds + | | | +- TermParamClause + | | | | +- TermParam + | | | | +- TermName + | | | | +- TypeName + | | | +- TermParamClause + | | | +- TermParam + | | | +- TermName + | | | +- TypeFunction + | | | +- TypeFuncParamClause + | | | | +- TypeName + | | | | +- TypeName + | | | +- TypeName | | +- TypeName | | +- TermBlock | | +- DefnVar @@ -1050,7 +1252,8 @@ | | | | +- TermName | | | +- TypeApply | | | | +- TypeName - | | | | +- TypeName + | | | | +- TypeArgClause + | | | | +- TypeName | | | +- TermName | | +- TermWhile | | | +- TermApplyUnary @@ -1063,10 +1266,11 @@ | | | | +- TermName | | | | +- TermApply | | | | +- TermName - | | | | +- TermSelect - | | | | | +- TermName - | | | | | +- TermName - | | | | +- TermName + | | | | +- TermArgClause + | | | | +- TermSelect + | | | | | +- TermName + | | | | | +- TermName + | | | | +- TermName | | | +- TermAssign | | | +- TermName | | | +- TermSelect @@ -1098,7 +1302,9 @@ | | | +- TermApplyInfix | | | | +- TermName | | | | +- TermName - | | | | +- LitInt + | | | | +- TypeArgClause + | | | | +- TermArgClause + | | | | +- LitInt | | | +- TermAssign | | | +- TermName | | | +- TermSelect @@ -1109,9 +1315,12 @@ | | +- ModOverride | | +- ModFinal | | +- TermName - | | +- TermParam - | | | +- TermName - | | | +- TypeName + | | +- MemberParamClauseGroup + | | | +- TypeParamClause + | | | +- TermParamClause + | | | +- TermParam + | | | +- TermName + | | | +- TypeName | | +- TypeName | | +- TermBlock | | +- DefnDef @@ -1120,21 +1329,27 @@ | | | | +- TypeName | | | | +- NameAnonymous | | | +- TermName - | | | +- TermParam - | | | | +- TermName - | | | | +- TypeName - | | | +- TermParam - | | | | +- TermName - | | | | +- TypeApply - | | | | +- TypeName - | | | | +- TypeName + | | | +- MemberParamClauseGroup + | | | | +- TypeParamClause + | | | | +- TermParamClause + | | | | +- TermParam + | | | | | +- TermName + | | | | | +- TypeName + | | | | +- TermParam + | | | | +- TermName + | | | | +- TypeApply + | | | | +- TypeName + | | | | +- TypeArgClause + | | | | +- TypeName | | | +- TypeName | | | +- TermBlock | | | +- TermIf | | | +- TermApplyInfix | | | | +- TermName | | | | +- TermName - | | | | +- TermName + | | | | +- TypeArgClause + | | | | +- TermArgClause + | | | | +- TermName | | | +- TermIf | | | | +- TermSelect | | | | | +- TermName @@ -1148,32 +1363,42 @@ | | | +- LitInt | | | +- TermApply | | | +- TermName - | | | +- TermApplyInfix - | | | | +- TermName - | | | | +- TermName - | | | | +- LitInt - | | | +- TermSelect - | | | +- TermName - | | | +- TermName + | | | +- TermArgClause + | | | +- TermApplyInfix + | | | | +- TermName + | | | | +- TermName + | | | | +- TypeArgClause + | | | | +- TermArgClause + | | | | +- LitInt + | | | +- TermSelect + | | | +- TermName + | | | +- TermName | | +- TermIf | | +- TermApplyInfix | | | +- TermName | | | +- TermName - | | | +- LitInt + | | | +- TypeArgClause + | | | +- TermArgClause + | | | +- LitInt | | +- LitInt | | +- TermApply | | +- TermName - | | +- LitInt - | | +- TermName + | | +- TermArgClause + | | +- LitInt + | | +- TermName | +- DefnDef | | +- ModOverride | | +- ModFinal | | +- TermName - | | +- TermParam - | | | +- TermName - | | | +- TypeFunction - | | | +- TypeName - | | | +- TypeName + | | +- MemberParamClauseGroup + | | | +- TypeParamClause + | | | +- TermParamClause + | | | +- TermParam + | | | +- TermName + | | | +- TypeFunction + | | | +- TypeFuncParamClause + | | | | +- TypeName + | | | +- TypeName | | +- TypeName | | +- TermBlock | | +- DefnVar @@ -1181,7 +1406,8 @@ | | | | +- TermName | | | +- TypeApply | | | | +- TypeName - | | | | +- TypeName + | | | | +- TypeArgClause + | | | | +- TypeName | | | +- TermThis | | | +- NameAnonymous | | +- TermWhile @@ -1196,6 +1422,54 @@ | | | | | +- TermName | | | | | +- TermApply | | | | | +- TermName + | | | | | +- TermArgClause + | | | | | +- TermSelect + | | | | | +- TermName + | | | | | +- TermName + | | | | +- TermReturn + | | | | | +- LitBoolean + | | | | +- LitUnit + | | | +- TermAssign + | | | +- TermName + | | | +- TermSelect + | | | +- TermName + | | | +- TermName + | | +- LitBoolean + | +- DefnDef + | | +- ModOverride + | | +- ModFinal + | | +- TermName + | | +- MemberParamClauseGroup + | | | +- TypeParamClause + | | | +- TermParamClause + | | | +- TermParam + | | | +- TermName + | | | +- TypeFunction + | | | +- TypeFuncParamClause + | | | | +- TypeName + | | | +- TypeName + | | +- TypeName + | | +- TermBlock + | | +- DefnVar + | | | +- PatVar + | | | | +- TermName + | | | +- TypeApply + | | | | +- TypeName + | | | | +- TypeArgClause + | | | | +- TypeName + | | | +- TermThis + | | | +- NameAnonymous + | | +- TermWhile + | | | +- TermApplyUnary + | | | | +- TermName + | | | | +- TermSelect + | | | | +- TermName + | | | | +- TermName + | | | +- TermBlock + | | | +- TermIf + | | | | +- TermApply + | | | | | +- TermName + | | | | | +- TermArgClause | | | | | +- TermSelect | | | | | +- TermName | | | | | +- TermName @@ -1212,11 +1486,17 @@ | | +- ModOverride | | +- ModFinal | | +- TermName - | | +- TermParam - | | | +- TermName - | | | +- TypeFunction - | | | +- TypeName - | | | +- TypeName + | | +- MemberParamClauseGroup + | | | +- TypeParamClause + | | | | +- TypeParam + | | | | +- TypeName + | | | | +- TypeParamClause + | | | | +- TypeBounds + | | | | +- TypeName + | | | +- TermParamClause + | | | +- TermParam + | | | +- TermName + | | | +- TypeName | | +- TypeName | | +- TermBlock | | +- DefnVar @@ -1224,50 +1504,8 @@ | | | | +- TermName | | | +- TypeApply | | | | +- TypeName - | | | | +- TypeName - | | | +- TermThis - | | | +- NameAnonymous - | | +- TermWhile - | | | +- TermApplyUnary - | | | | +- TermName - | | | | +- TermSelect - | | | | +- TermName - | | | | +- TermName - | | | +- TermBlock - | | | +- TermIf - | | | | +- TermApply - | | | | | +- TermName - | | | | | +- TermSelect - | | | | | +- TermName - | | | | | +- TermName - | | | | +- TermReturn - | | | | | +- LitBoolean - | | | | +- LitUnit - | | | +- TermAssign - | | | +- TermName - | | | +- TermSelect - | | | +- TermName - | | | +- TermName - | | +- LitBoolean - | +- DefnDef - | | +- ModOverride - | | +- ModFinal - | | +- TermName - | | +- TypeParam - | | | +- TypeName - | | | +- TypeBounds - | | | +- TypeName - | | +- TermParam - | | | +- TermName - | | | +- TypeName - | | +- TypeName - | | +- TermBlock - | | +- DefnVar - | | | +- PatVar - | | | | +- TermName - | | | +- TypeApply - | | | | +- TypeName - | | | | +- TypeName + | | | | +- TypeArgClause + | | | | +- TypeName | | | +- TermThis | | | +- NameAnonymous | | +- TermWhile @@ -1283,7 +1521,9 @@ | | | | | | +- TermName | | | | | | +- TermName | | | | | +- TermName - | | | | | +- TermName + | | | | | +- TypeArgClause + | | | | | +- TermArgClause + | | | | | +- TermName | | | | +- TermReturn | | | | | +- LitBoolean | | | | +- LitUnit @@ -1297,21 +1537,27 @@ | +- ModOverride | +- ModFinal | +- TermName - | +- TermParam - | | +- TermName - | | +- TypeFunction - | | +- TypeName - | | +- TypeName + | +- MemberParamClauseGroup + | | +- TypeParamClause + | | +- TermParamClause + | | +- TermParam + | | +- TermName + | | +- TypeFunction + | | +- TypeFuncParamClause + | | | +- TypeName + | | +- TypeName | +- TypeApply | | +- TypeName - | | +- TypeName + | | +- TypeArgClause + | | +- TypeName | +- TermBlock | +- DefnVar | | +- PatVar | | | +- TermName | | +- TypeApply | | | +- TypeName - | | | +- TypeName + | | | +- TypeArgClause + | | | +- TypeName | | +- TermThis | | +- NameAnonymous | +- TermWhile @@ -1324,15 +1570,17 @@ | | +- TermIf | | | +- TermApply | | | | +- TermName - | | | | +- TermSelect - | | | | +- TermName - | | | | +- TermName - | | | +- TermReturn - | | | | +- TermApply - | | | | +- TermName + | | | | +- TermArgClause | | | | +- TermSelect | | | | +- TermName | | | | +- TermName + | | | +- TermReturn + | | | | +- TermApply + | | | | +- TermName + | | | | +- TermArgClause + | | | | +- TermSelect + | | | | +- TermName + | | | | +- TermName | | | +- LitUnit | | +- TermAssign | | +- TermName @@ -1344,55 +1592,64 @@ | +- ModFinal | +- ModCase | +- TypeName - | +- TypeParam - | | +- ModCovariant - | | +- TypeName - | | +- TypeBounds + | +- TypeParamClause + | | +- TypeParam + | | +- ModCovariant + | | +- TypeName + | | +- TypeParamClause + | | +- TypeBounds | +- CtorPrimary | | +- NameAnonymous - | | +- TermParam - | | | +- ModOverride - | | | +- ModValParam - | | | +- TermName - | | | +- TypeName - | | +- TermParam - | | +- ModPrivate - | | | +- NameIndeterminate - | | +- ModVarParam - | | +- TermName - | | +- TypeApply - | | +- TypeName - | | +- TypeAnnotate + | | +- TermParamClause + | | +- TermParam + | | | +- ModOverride + | | | +- ModValParam + | | | +- TermName + | | | +- TypeName + | | +- TermParam + | | +- ModPrivate + | | | +- NameIndeterminate + | | +- ModVarParam + | | +- TermName + | | +- TypeApply | | +- TypeName - | | +- ModAnnot - | | +- Init + | | +- TypeArgClause + | | +- TypeAnnotate | | +- TypeName - | | +- NameAnonymous + | | +- ModAnnot + | | +- Init + | | +- TypeName + | | +- NameAnonymous | +- Template | +- Init | | +- TypeApply | | | +- TypeName - | | | +- TypeName + | | | +- TypeArgClause + | | | +- TypeName | | +- NameAnonymous | +- Self | | +- NameAnonymous | +- TermApply | | +- TermName + | | +- TermArgClause | +- DefnDef | | +- ModOverride | | +- TermName | | +- TypeApply | | | +- TypeName - | | | +- TypeName + | | | +- TypeArgClause + | | | +- TypeName | | +- TermApply | | +- TermName - | | +- TermName + | | +- TermArgClause + | | +- TermName | +- DefnDef | +- ModOverride | +- TermName | +- TypeApply | | +- TypeName - | | +- TypeName + | | +- TypeArgClause + | | +- TypeName | +- TermName +- DefnObject | +- ModCase @@ -1401,7 +1658,8 @@ | +- Init | | +- TypeApply | | | +- TypeName - | | | +- TypeName + | | | +- TypeArgClause + | | | +- TypeName | | +- NameAnonymous | +- Self | | +- NameAnonymous @@ -1414,7 +1672,8 @@ | | +- Init | | +- TypeName | | +- NameAnonymous - | | +- LitString + | | +- TermArgClause + | | +- LitString | +- DefnDef | | +- ModOverride | | +- TermName @@ -1430,7 +1689,8 @@ | | +- Init | | +- TypeName | | +- NameAnonymous - | | +- LitString + | | +- TermArgClause + | | +- LitString | +- DefnDef | | +- ModOverride | | +- TermName @@ -1440,7 +1700,8 @@ | | +- Init | | +- TypeName | | +- NameAnonymous - | | +- LitString + | | +- TermArgClause + | | +- LitString | +- DefnDef | | +- ModOverride | | +- TermName @@ -1450,7 +1711,8 @@ | | +- Init | | +- TypeName | | +- NameAnonymous - | | +- LitString + | | +- TermArgClause + | | +- LitString | +- DefnDef | | +- ModOverride | | +- TermName @@ -1461,34 +1723,44 @@ | | +- TermName | | +- TypeApply | | | +- TypeName - | | | +- TypeName + | | | +- TypeArgClause + | | | +- TypeName | | +- TermSelect | | +- TermName | | +- TermName | +- DefnDef | | +- ModOverride | | +- TermName - | | +- TypeParam - | | | +- TypeName - | | | +- TypeBounds - | | +- TypeParam - | | | +- TypeName - | | | +- TypeBounds - | | +- TermParam - | | | +- ModImplicit - | | | +- TermName - | | | +- TypeFunction - | | | +- TypeName - | | | +- TypeTuple - | | | +- TypeName - | | | +- TypeName + | | +- MemberParamClauseGroup + | | | +- TypeParamClause + | | | | +- TypeParam + | | | | | +- TypeName + | | | | | +- TypeParamClause + | | | | | +- TypeBounds + | | | | +- TypeParam + | | | | +- TypeName + | | | | +- TypeParamClause + | | | | +- TypeBounds + | | | +- TermParamClause + | | | +- TermParam + | | | | +- ModImplicit + | | | | +- TermName + | | | | +- TypeFunction + | | | | +- TypeFuncParamClause + | | | | | +- TypeName + | | | | +- TypeTuple + | | | | +- TypeName + | | | | +- TypeName + | | | +- ModImplicit | | +- TypeTuple | | | +- TypeApply | | | | +- TypeName - | | | | +- TypeName + | | | | +- TypeArgClause + | | | | +- TypeName | | | +- TypeApply | | | +- TypeName - | | | +- TypeName + | | | +- TypeArgClause + | | | +- TypeName | | +- TermName | +- DefnVal | +- ModAnnot @@ -1508,13 +1780,15 @@ | +- Init | +- TypeName | +- NameAnonymous - | +- LitLong + | +- TermArgClause + | +- LitLong +- TermName +- Template +- Init | +- TypeApply | | +- TypeName - | | +- TypeName + | | +- TypeArgClause + | | +- TypeName | +- NameAnonymous +- Self | +- NameAnonymous @@ -1528,19 +1802,25 @@ | +- TermName +- DefnDef | +- TermName - | +- TypeParam - | | +- TypeName - | | +- TypeBounds - | +- TermParam - | | +- TermName - | | +- TypeApply - | | +- TypeSelect - | | | +- TermName - | | | +- TypeName - | | +- TypeName + | +- MemberParamClauseGroup + | | +- TypeParamClause + | | | +- TypeParam + | | | +- TypeName + | | | +- TypeParamClause + | | | +- TypeBounds + | | +- TermParamClause + | | +- TermParam + | | +- TermName + | | +- TypeApply + | | +- TypeSelect + | | | +- TermName + | | | +- TypeName + | | +- TypeArgClause + | | +- TypeName | +- TypeApply | | +- TypeName - | | +- TypeName + | | +- TypeArgClause + | | +- TypeName | +- TermMatch | +- TermName | +- Case @@ -1549,7 +1829,8 @@ | | | | +- TermName | | | +- TypeApply | | | +- TypeName - | | | +- TypeName + | | | +- TypeArgClause + | | | +- TypeName | | +- TermName | +- Case | | +- PatWildcard @@ -1558,17 +1839,21 @@ | | | | +- TermName | | | | +- TermName | | | +- TermName - | | | +- LitInt + | | | +- TypeArgClause + | | | +- TermArgClause + | | | +- LitInt | | +- TermApplyType | | +- TermName - | | +- TypeName + | | +- TypeArgClause + | | +- TypeName | +- Case | | +- PatTyped | | | +- PatVar | | | | +- TermName | | | +- TypeApply | | | +- TypeName - | | | +- TypeName + | | | +- TypeArgClause + | | | +- TypeName | | +- TermSelect | | +- TermName | | +- TermName @@ -1579,31 +1864,42 @@ | | +- TermSelect | | | +- TermName | | | +- TermName - | | +- TermName + | | +- TermArgClause + | | +- TermName | +- TermName +- DefnDef | +- TermName - | +- TypeParam - | | +- TypeName - | | +- TypeBounds + | +- MemberParamClauseGroup + | | +- TypeParamClause + | | +- TypeParam + | | +- TypeName + | | +- TypeParamClause + | | +- TypeBounds | +- TypeApply | | +- TypeName - | | +- TypeName - | | +- TypeApply - | | +- TypeName + | | +- TypeArgClause | | +- TypeName + | | +- TypeApply + | | +- TypeName + | | +- TypeArgClause + | | +- TypeName | +- TermNew | +- Init | +- TypeName | +- NameAnonymous + | +- TermArgClause +- DefnDef | +- TermName - | +- TypeParam - | | +- TypeName - | | +- TypeBounds + | +- MemberParamClauseGroup + | | +- TypeParamClause + | | +- TypeParam + | | +- TypeName + | | +- TypeParamClause + | | +- TypeBounds | +- TypeApply | | +- TypeName - | | +- TypeName + | | +- TypeArgClause + | | +- TypeName | +- TermName +- DefnVal +- ModAnnot @@ -1619,16 +1915,20 @@ +- Init | +- TypeApply | | +- TypeName - | | +- TypeName - | | +- TypeName + | | +- TypeArgClause + | | +- TypeName + | | +- TypeName | +- NameAnonymous +- Self | +- NameAnonymous +- DefnDef +- TermName - +- TermParam - | +- TermName - | +- TypeName + +- MemberParamClauseGroup + | +- TypeParamClause + | +- TermParamClause + | +- TermParam + | +- TermName + | +- TypeName +- TypeName +- TermThis +- NameAnonymous diff --git a/pmd-scala-modules/pmd-scala-common/src/test/resources/net/sourceforge/pmd/lang/scala/ast/testdata/package.txt b/pmd-scala-modules/pmd-scala-common/src/test/resources/net/sourceforge/pmd/lang/scala/ast/testdata/package.txt index fc088d5b3e..0226a70022 100644 --- a/pmd-scala-modules/pmd-scala-common/src/test/resources/net/sourceforge/pmd/lang/scala/ast/testdata/package.txt +++ b/pmd-scala-modules/pmd-scala-common/src/test/resources/net/sourceforge/pmd/lang/scala/ast/testdata/package.txt @@ -10,6 +10,7 @@ | +- NameAnonymous +- DefnType | +- TypeName + | +- TypeParamClause | +- TypeSelect | | +- TermSelect | | | +- TermName @@ -26,6 +27,7 @@ | +- TermName +- DefnType | +- TypeName + | +- TypeParamClause | +- TypeSelect | | +- TermSelect | | | +- TermName @@ -45,24 +47,29 @@ | | +- Init | | +- TypeName | | +- NameAnonymous - | | +- LitString - | | +- LitString + | | +- TermArgClause + | | +- LitString + | | +- LitString | +- TypeName - | +- TypeParam - | | +- ModCovariant - | | +- TypeName - | | +- TypeBounds + | +- TypeParamClause + | | +- TypeParam + | | +- ModCovariant + | | +- TypeName + | | +- TypeParamClause + | | +- TypeBounds | +- TypeApply | | +- TypeName - | | +- TypeName + | | +- TypeArgClause + | | +- TypeName | +- TypeBounds +- DefnVal | +- ModAnnot | | +- Init | | +- TypeName | | +- NameAnonymous - | | +- LitString - | | +- LitString + | | +- TermArgClause + | | +- LitString + | | +- LitString | +- PatVar | | +- TermName | +- TermName @@ -71,16 +78,20 @@ | +- Init | +- TypeName | +- NameAnonymous - | +- LitString - | +- LitString + | +- TermArgClause + | +- LitString + | +- LitString +- TypeName - +- TypeParam - | +- TypeName - | +- TypeBounds - +- TypeParam - | +- ModCovariant - | +- TypeName - | +- TypeBounds + +- TypeParamClause + | +- TypeParam + | | +- TypeName + | | +- TypeParamClause + | | +- TypeBounds + | +- TypeParam + | +- ModCovariant + | +- TypeName + | +- TypeParamClause + | +- TypeBounds +- TypeApply | +- TypeSelect | | +- TermSelect @@ -89,6 +100,7 @@ | | | | +- TermName | | | +- TermName | | +- TypeName - | +- TypeName - | +- TypeName + | +- TypeArgClause + | +- TypeName + | +- TypeName +- TypeBounds From 06d190d1d30aa0026ef1a53decd92d5f9e7a72fa Mon Sep 17 00:00:00 2001 From: Andreas Dangel Date: Fri, 29 Sep 2023 15:31:14 +0200 Subject: [PATCH 6/7] Add @eugenepugach as a contributor --- .all-contributorsrc | 9 +++++++ docs/pages/pmd/projectdocs/credits.md | 39 ++++++++++++++------------- 2 files changed, 29 insertions(+), 19 deletions(-) diff --git a/.all-contributorsrc b/.all-contributorsrc index 5574756b7c..4ab0d8cef0 100644 --- a/.all-contributorsrc +++ b/.all-contributorsrc @@ -7250,6 +7250,15 @@ "contributions": [ "bug" ] + }, + { + "login": "eugenepugach", + "name": "eugenepugach", + "avatar_url": "https://avatars.githubusercontent.com/u/133967768?v=4", + "profile": "https://github.com/eugenepugach", + "contributions": [ + "bug" + ] } ], "contributorsPerLine": 7, diff --git a/docs/pages/pmd/projectdocs/credits.md b/docs/pages/pmd/projectdocs/credits.md index a52f81d5d5..514bedd7d5 100644 --- a/docs/pages/pmd/projectdocs/credits.md +++ b/docs/pages/pmd/projectdocs/credits.md @@ -854,174 +854,175 @@ Thanks goes to these wonderful people ([emoji key](https://allcontributors.org/d
eant60
🐛
ekkirala
🐛
emersonmoura
🐛 +
eugenepugach
🐛
fairy
🐛
filiprafalowicz
💻
foxmason
🐛 -
frankegabor
🐛 +
frankegabor
🐛
frankl
🐛
freafrea
🐛
fsapatin
🐛
gracia19
🐛
guo fei
🐛
gurmsc5
🐛 -
gwilymatgearset
💻 🐛 +
gwilymatgearset
💻 🐛
haigsn
🐛
hemanshu070
🐛
henrik242
🐛
hongpuwu
🐛
hvbtup
💻 🐛
igniti GmbH
🐛 -
ilovezfs
🐛 +
ilovezfs
🐛
itaigilo
🐛
jakivey32
🐛
jbennett2091
🐛
jcamerin
🐛
jkeener1
🐛
jmetertea
🐛 -
johnra2
💻 +
johnra2
💻
josemanuelrolon
💻 🐛
kabroxiko
💻 🐛
karwer
🐛
kaulonline
🐛
kdaemonv
🐛
kdebski85
🐛 💻 -
kenji21
💻 🐛 +
kenji21
💻 🐛
kfranic
🐛
khalidkh
🐛
koalalam
🐛
krzyk
🐛
lasselindqvist
🐛
lgemeinhardt
🐛 -
lihuaib
🐛 +
lihuaib
🐛
lonelyma1021
🐛
lpeddy
🐛
lujiefsi
💻
lukelukes
💻
lyriccoder
🐛
marcelmore
🐛 -
matchbox
🐛 +
matchbox
🐛
matthiaskraaz
🐛
meandonlyme
🐛
mikesive
🐛
milossesic
🐛
mluckam
💻
mohan-chinnappan-n
💻 -
mriddell95
🐛 +
mriddell95
🐛
mrlzh
🐛
msloan
🐛
mucharlaravalika
🐛
mvenneman
🐛
nareshl119
🐛
nicolas-harraudeau-sonarsource
🐛 -
noerremark
🐛 +
noerremark
🐛
novsirion
🐛
nwcm
📖 🐛
oggboy
🐛
oinume
🐛
orimarko
💻 🐛
pacvz
💻 -
pallavi agarwal
🐛 +
pallavi agarwal
🐛
parksungrin
🐛
patpatpat123
🐛
patriksevallius
🐛
pbrajesh1
🐛
phoenix384
🐛
piotrszymanski-sc
💻 -
plan3d
🐛 +
plan3d
🐛
poojasix
🐛
prabhushrikant
🐛
pujitha8783
🐛
r-r-a-j
🐛
raghujayjunk
🐛
rajeshveera
🐛 -
rajeswarreddy88
🐛 +
rajeswarreddy88
🐛
recdevs
🐛
reudismam
💻 🐛
rijkt
🐛
rillig-tk
🐛
rmohan20
💻 🐛
rnveach
🐛 -
rxmicro
🐛 +
rxmicro
🐛
ryan-gustafson
💻 🐛
sabi0
🐛
scais
🐛
sebbASF
🐛
sergeygorbaty
💻
shilko2013
🐛 -
shiomiyan
📖 +
shiomiyan
📖
simeonKondr
🐛
snajberk
🐛
sniperrifle2004
🐛
snuyanzin
🐛 💻
sratz
🐛
stonio
🐛 -
sturton
💻 🐛 +
sturton
💻 🐛
sudharmohan
🐛
suruchidawar
🐛
svenfinitiv
🐛
tashiscool
🐛
test-git-hook
🐛
testation21
💻 🐛 -
thanosa
🐛 +
thanosa
🐛
tiandiyixian
🐛
tobwoerk
🐛
tprouvot
🐛 💻
trentchilders
🐛
triandicAnt
🐛
trishul14
🐛 -
tsui
🐛 +
tsui
🐛
winhkey
🐛
witherspore
🐛
wjljack
🐛
wuchiuwong
🐛
xingsong
🐛
xioayuge
🐛 -
xnYi9wRezm
💻 🐛 +
xnYi9wRezm
💻 🐛
xuanuy
🐛
xyf0921
🐛
yalechen-cyw3
🐛
yasuharu-sato
🐛
zenglian
🐛
zgrzyt93
💻 🐛 -
zh3ng
🐛 +
zh3ng
🐛
zt_soft
🐛
ztt79
🐛
zzzzfeng
🐛 From c21bf43cc22a7a9f05dc8bc6f21de8353a2010f3 Mon Sep 17 00:00:00 2001 From: Andreas Dangel Date: Fri, 29 Sep 2023 15:31:47 +0200 Subject: [PATCH 7/7] [doc] Update release notes (#4691) --- docs/pages/release_notes.md | 2 ++ 1 file changed, 2 insertions(+) diff --git a/docs/pages/release_notes.md b/docs/pages/release_notes.md index db3870af6b..10186cffd0 100644 --- a/docs/pages/release_notes.md +++ b/docs/pages/release_notes.md @@ -78,6 +78,7 @@ Note: Support for Java 19 preview language features have been removed. The versi * miscellaneous * [#4582](https://github.com/pmd/pmd/issues/4582): \[dist] Download link broken + * [#4691](https://github.com/pmd/pmd/issues/4691): \[CVEs] Critical and High CEVs reported on PMD and PMD dependencies * core * [#1204](https://github.com/pmd/pmd/issues/1204): \[core] Allow numeric properties in XML to be within an unbounded range * [#3919](https://github.com/pmd/pmd/issues/3919): \[core] Merge CPD and PMD language @@ -633,6 +634,7 @@ See also [Detailed Release Notes for PMD 7]({{ baseurl }}pmd_release_notes_pmd7. * [#4462](https://github.com/pmd/pmd/issues/4462): Provide Software Bill of Materials (SBOM) * [#4460](https://github.com/pmd/pmd/pull/4460): Fix assembly-plugin warnings * [#4582](https://github.com/pmd/pmd/issues/4582): \[dist] Download link broken + * [#4691](https://github.com/pmd/pmd/issues/4691): \[CVEs] Critical and High CEVs reported on PMD and PMD dependencies * ant * [#4080](https://github.com/pmd/pmd/issues/4080): \[ant] Split off Ant integration into a new submodule * core