This is an automated email from the ASF dual-hosted git repository. blackdrag pushed a commit to branch feature/GROOVY-8299/default_methods in repository https://gitbox.apache.org/repos/asf/groovy.git
commit 5575766d8fb1f0d5525eb44624cc53a53301e0f7 Author: Jochen Theodorou <blackd...@gmx.org> AuthorDate: Mon Sep 11 15:16:33 2023 +0200 GROOVY-8299: restore trait marker in AstBuilder or traits won't work --- src/main/java/org/apache/groovy/parser/antlr4/AstBuilder.java | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/src/main/java/org/apache/groovy/parser/antlr4/AstBuilder.java b/src/main/java/org/apache/groovy/parser/antlr4/AstBuilder.java index add2787794..c5d32f6894 100644 --- a/src/main/java/org/apache/groovy/parser/antlr4/AstBuilder.java +++ b/src/main/java/org/apache/groovy/parser/antlr4/AstBuilder.java @@ -1313,6 +1313,10 @@ public class AstBuilder extends GroovyParserBaseVisitor<Object> { } else if (isNonSealed) { classNode.addAnnotation(makeAnnotationNode(NonSealed.class)); } + if (asBoolean(ctx.TRAIT())) { + classNode.addAnnotation(makeAnnotationNode(Trait.class)); + } + classNode.addAnnotations(modifierManager.getAnnotations()); if (isRecord && classNode.getAnnotations().stream().noneMatch(a ->