You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@groovy.apache.org by pa...@apache.org on 2020/05/23 03:05:46 UTC
[groovy] branch GROOVY_3_0_X updated: GROOVY-9548: groovydoc: use
property modifiers (closes #1252)
This is an automated email from the ASF dual-hosted git repository.
paulk pushed a commit to branch GROOVY_3_0_X
in repository https://gitbox.apache.org/repos/asf/groovy.git
The following commit(s) were added to refs/heads/GROOVY_3_0_X by this push:
new 6e49425 GROOVY-9548: groovydoc: use property modifiers (closes #1252)
6e49425 is described below
commit 6e4942551f37ff71c3d0534abdd03734cd230223
Author: Mikko Värri <vm...@linuxbox.fi>
AuthorDate: Fri May 22 16:40:02 2020 +0300
GROOVY-9548: groovydoc: use property modifiers (closes #1252)
The property seems to contain the correct modifiers (public vs private
that the field has).
---
.../org/apache/groovy/antlr/GroovydocVisitor.java | 2 +-
.../groovy/tools/groovydoc/GroovyDocToolTest.java | 24 ++++++++++++++++++++++
2 files changed, 25 insertions(+), 1 deletion(-)
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 c51689f..6f62ffc 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
@@ -281,7 +281,7 @@ public class GroovydocVisitor extends ClassCodeVisitorSupport {
String name = node.getName();
SimpleGroovyFieldDoc fieldDoc = new SimpleGroovyFieldDoc(name, currentClassDoc);
fieldDoc.setType(new SimpleGroovyType(makeType(node.getType())));
- int mods = node.getField().getModifiers();
+ int mods = node.getModifiers();
if (!hasAnno(node.getField(), "PackageScope")) {
processModifiers(fieldDoc, node.getField(), mods);
Groovydoc groovydoc = node.getGroovydoc();
diff --git a/subprojects/groovy-groovydoc/src/test/groovy/org/codehaus/groovy/tools/groovydoc/GroovyDocToolTest.java b/subprojects/groovy-groovydoc/src/test/groovy/org/codehaus/groovy/tools/groovydoc/GroovyDocToolTest.java
index 6c1ebe8..b28e7d5 100644
--- a/subprojects/groovy-groovydoc/src/test/groovy/org/codehaus/groovy/tools/groovydoc/GroovyDocToolTest.java
+++ b/subprojects/groovy-groovydoc/src/test/groovy/org/codehaus/groovy/tools/groovydoc/GroovyDocToolTest.java
@@ -1065,6 +1065,30 @@ public class GroovyDocToolTest extends GroovyTestCase {
assertFalse("Private ctor should not be listed", matcher.find());
}
+ public void testProperty() throws Exception {
+ final String base = "org/codehaus/groovy/tools/groovydoc/testfiles";
+ htmlTool.add(Arrays.asList(
+ base + "/Alias.groovy"
+ ));
+
+ final MockOutputTool output = new MockOutputTool();
+ htmlTool.renderToOutput(output, MOCK_DIR);
+
+ final String groovydoc = output.getText(MOCK_DIR + "/" + base + "/Alias.html");
+
+ final Matcher summary = Pattern.compile(Pattern.quote(
+ "<code><strong><a href='https://docs.oracle.com/javase/8/docs/api/java/util/ArrayList.html' " +
+ "title='ArrayList'>ArrayList</a></strong></code>"
+ )).matcher(groovydoc);
+ final Matcher detail = Pattern.compile(Pattern.quote(
+ "<h4><a href='https://docs.oracle.com/javase/8/docs/api/java/util/ArrayList.html' " +
+ "title='ArrayList'>ArrayList</a> <strong>arrayList</strong></h4>"
+ )).matcher(groovydoc);
+
+ assertTrue("Property summary should be found", summary.find());
+ assertTrue("Property detail should be found", detail.find());
+ }
+
public void testScript() throws Exception {
List<String> srcList = new ArrayList<String>();
srcList.add("org/codehaus/groovy/tools/groovydoc/testfiles/Script.groovy");