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 2022/05/03 11:21:58 UTC
[groovy] 02/02: minor refactor (mostly formatting)
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
commit 218d9da981efc90326066e18c3e63e2d5efdb911
Author: Paul King <pa...@asert.com.au>
AuthorDate: Tue May 3 21:21:47 2022 +1000
minor refactor (mostly formatting)
---
.../groovy/tools/groovydoc/SimpleGroovyClassDoc.java | 16 +++++++++-------
1 file changed, 9 insertions(+), 7 deletions(-)
diff --git a/subprojects/groovy-groovydoc/src/main/java/org/codehaus/groovy/tools/groovydoc/SimpleGroovyClassDoc.java b/subprojects/groovy-groovydoc/src/main/java/org/codehaus/groovy/tools/groovydoc/SimpleGroovyClassDoc.java
index bb8cd5d243..63d811dbae 100644
--- a/subprojects/groovy-groovydoc/src/main/java/org/codehaus/groovy/tools/groovydoc/SimpleGroovyClassDoc.java
+++ b/subprojects/groovy-groovydoc/src/main/java/org/codehaus/groovy/tools/groovydoc/SimpleGroovyClassDoc.java
@@ -695,14 +695,16 @@ public class SimpleGroovyClassDoc extends SimpleGroovyAbstractableElementDoc imp
targetClassName = importName.substring(0, importName.length() - 1) + baseName;
}
// need this for correct resolution of static imports
- if (targetClassName != null){
+ if (targetClassName != null) {
GroovyClassDoc doc = null;
- Optional<Name> name = new JavaParser().parseName(targetClassName.replace('/','.')).getResult();
- String staticPart = "";
- while (doc == null && name.isPresent()) {
- doc = ((SimpleGroovyRootDoc)rootDoc).classNamedExact(name.get().asString().replace('.','/')+staticPart);
- staticPart = "."+name.get().getIdentifier()+staticPart;
- name = name.get().getQualifier();
+ Optional<Name> maybeName = new JavaParser().parseName(targetClassName.replace('/', '.')).getResult();
+ StringBuilder staticPart = new StringBuilder();
+ while (doc == null && maybeName.isPresent()) {
+ Name name = maybeName.get();
+ doc = ((SimpleGroovyRootDoc) rootDoc).classNamedExact(name.asString().replace('.', '/') + staticPart.toString());
+ staticPart.insert(0, name.getIdentifier());
+ staticPart.insert(0, ".");
+ maybeName = name.getQualifier();
}
if (doc != null) return doc;
}