(groovy) branch master updated: GROOVY-11269: GroovyClassDoc has empty 'enumConstants'

[paulk]

This is an automated email from the ASF dual-hosted git repository.

paulk pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/groovy.git


The following commit(s) were added to refs/heads/master by this push:
     new 57b764f493 GROOVY-11269: GroovyClassDoc has empty 'enumConstants'
57b764f493 is described below

commit 57b764f493d2ff4933fd8cec750ebb9f4f386a2d
Author: Paul King <pa...@asert.com.au>
AuthorDate: Thu Jan 11 14:18:13 2024 +1000

    GROOVY-11269: GroovyClassDoc has empty 'enumConstants'
---
 .../src/main/groovy/org.apache.groovy-documented.gradle       |  4 ++--
 .../main/java/org/apache/groovy/antlr/GroovydocVisitor.java   | 11 +++++++----
 2 files changed, 9 insertions(+), 6 deletions(-)

diff --git a/build-logic/src/main/groovy/org.apache.groovy-documented.gradle 
b/build-logic/src/main/groovy/org.apache.groovy-documented.gradle
index 59a67e8ef1..6be381533c 100644
--- a/build-logic/src/main/groovy/org.apache.groovy-documented.gradle
+++ b/build-logic/src/main/groovy/org.apache.groovy-documented.gradle
@@ -56,7 +56,7 @@ tasks.withType(Javadoc).configureEach {
         encoding = 'UTF-8'
         version = true
         overview = 
project.relativePath(rootProject.file('src/main/java/overviewj.html'))
-        bottom = 'Copyright &copy; 2003-2022 The Apache Software Foundation. 
All rights reserved.'
+        bottom = 'Copyright &copy; 2003-2024 The Apache Software Foundation. 
All rights reserved.'
         source = sharedConfiguration.targetJavaVersion.get()
         links('https://docs.oracle.com/en/java/javase/11/docs/api/',
                 'https://docs.oracle.com/javaee/7/api/',
@@ -75,7 +75,7 @@ tasks.withType(Groovydoc).configureEach {
     windowTitle = "Groovy ${versions.groovy}"
     docTitle = "Groovy ${versions.groovy}"
     header = "Groovy ${versions.groovy}"
-    footer = 'Copyright &copy; 2003-2022 The Apache Software Foundation. All 
rights reserved.'
+    footer = 'Copyright &copy; 2003-2024 The Apache Software Foundation. All 
rights reserved.'
     overviewText = 
rootProject.resources.text.fromFile('src/main/java/overview.html')
     access = GroovydocAccess.PROTECTED
     link 'https://docs.oracle.com/javaee/7/api/', 'javax.servlet.', 
'javax.management.'
diff --git 
a/subprojects/groovy-groovydoc/src/main/java/org/apache/groovy/antlr/GroovydocVisitor.java
 
b/subprojects/groovy-groovydoc/src/main/java/org/apache/groovy/antlr/GroovydocVisitor.java
index 4369f03bcf..12b1257c9c 100644
--- 
a/subprojects/groovy-groovydoc/src/main/java/org/apache/groovy/antlr/GroovydocVisitor.java
+++ 
b/subprojects/groovy-groovydoc/src/main/java/org/apache/groovy/antlr/GroovydocVisitor.java
@@ -135,7 +135,7 @@ public class GroovydocVisitor extends 
ClassCodeVisitorSupport {
         }
         currentClassDoc.setRawCommentText(getDocContent(node.getGroovydoc()));
         currentClassDoc.setNameWithTypeArgs(name + 
genericTypesAsString(node.getGenericsTypes()));
-        if (!node.isInterface() && node.getSuperClass() != null) {
+        if (!node.isInterface() && !node.isEnum() && node.getSuperClass() != 
null) {
             String superName = makeType(node.getSuperClass());
             currentClassDoc.setSuperClassName(superName);
             String superSimpleName = 
node.getSuperClass().getNameWithoutPackage();
@@ -322,8 +322,7 @@ public class GroovydocVisitor extends 
ClassCodeVisitorSupport {
         final ClassNode cn = node.isArray() ? node.getComponentType() : node;
         return cn.getName().replace('.', '/').replace('$', '.')
             + genericTypesAsString(cn.getGenericsTypes())
-            + (node.isArray() ? "[]" : "")
-            ;
+            + (node.isArray() ? "[]" : "");
     }
 
     @Override
@@ -377,7 +376,11 @@ public class GroovydocVisitor extends 
ClassCodeVisitorSupport {
         processModifiers(fieldDoc, node, node.getModifiers());
         processAnnotations(fieldDoc, node);
         fieldDoc.setRawCommentText(getDocContent(node.getGroovydoc()));
-        currentClassDoc.add(fieldDoc);
+        if (currentClassDoc.isEnum()) {
+            currentClassDoc.addEnumConstant(fieldDoc);
+        } else {
+            currentClassDoc.add(fieldDoc);
+        }
         super.visitField(node);
     }