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/b70c0920 Tree: http://git-wip-us.apache.org/repos/asf/groovy/tree/b70c0920 Diff: http://git-wip-us.apache.org/repos/asf/groovy/diff/b70c0920 Branch: refs/heads/GROOVY_2_6_X Commit: b70c092083457840ff8fae909f60f832e5c930f6 Parents: 092beef Author: Mikko Värri <[email protected]> Authored: Sun Mar 12 03:48:40 2017 +0200 Committer: paulk <[email protected]> Committed: Sat Apr 22 16:07:39 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/b70c0920/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 678f2e3..b7ce2b1 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 @@ -742,7 +742,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("/")) { @@ -750,7 +750,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; }
