From 218d9da981efc90326066e18c3e63e2d5efdb911 Mon Sep 17 00:00:00 2001 From: Paul King Date: Tue, 3 May 2022 21:21:47 +1000 Subject: [PATCH] minor refactor (mostly formatting) --- .../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 bb8cd5d243c..63d811dbae7 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 @@ private GroovyClassDoc resolveInternalClassDocFromImport(GroovyRootDoc rootDoc, 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 = 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 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; }