GROOVY-8117: Do not resolve aliased imports early.
Project: http://git-wip-us.apache.org/repos/asf/groovy/repo Commit: http://git-wip-us.apache.org/repos/asf/groovy/commit/a69a2ce3 Tree: http://git-wip-us.apache.org/repos/asf/groovy/tree/a69a2ce3 Diff: http://git-wip-us.apache.org/repos/asf/groovy/diff/a69a2ce3 Branch: refs/heads/GROOVY_2_4_X Commit: a69a2ce31fa577dda818ebe11d56a76171538c0b Parents: 28152a9 Author: Mikko Värri <[email protected]> Authored: Sun Mar 12 03:48:40 2017 +0200 Committer: paulk <[email protected]> Committed: Sat Apr 22 16:11:34 2017 +1000 ---------------------------------------------------------------------- .../groovy/tools/groovydoc/SimpleGroovyClassDocAssembler.java | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/groovy/blob/a69a2ce3/subprojects/groovy-groovydoc/src/main/java/org/codehaus/groovy/tools/groovydoc/SimpleGroovyClassDocAssembler.java ---------------------------------------------------------------------- diff --git a/subprojects/groovy-groovydoc/src/main/java/org/codehaus/groovy/tools/groovydoc/SimpleGroovyClassDocAssembler.java b/subprojects/groovy-groovydoc/src/main/java/org/codehaus/groovy/tools/groovydoc/SimpleGroovyClassDocAssembler.java index 0901dca..d31daef 100644 --- a/subprojects/groovy-groovydoc/src/main/java/org/codehaus/groovy/tools/groovydoc/SimpleGroovyClassDocAssembler.java +++ b/subprojects/groovy-groovydoc/src/main/java/org/codehaus/groovy/tools/groovydoc/SimpleGroovyClassDocAssembler.java @@ -678,7 +678,7 @@ public class SimpleGroovyClassDocAssembler extends VisitorAdapter implements Gro return returnValue; } - // preempt resolve as info is partially available here (star imports won't match here) + // preempt resolve as info is partially available here (aliases and star imports won't match here) private String extractName(GroovySourceAST typeNode) { String typeName = buildName(typeNode); if (!typeName.contains("/")) { @@ -686,7 +686,7 @@ public class SimpleGroovyClassDocAssembler extends VisitorAdapter implements Gro // Groovy currently resolves this to last found so traverse in reverse order for (int i = importedClassesAndPackages.size() - 1; i >= 0; i--) { String name = importedClassesAndPackages.get(i); - if (name.endsWith(slashName)) { + if (!aliases.containsValue(name) && name.endsWith(slashName)) { typeName = name; break; }
