Repository: groovy Updated Branches: refs/heads/master 2b918f8e6 -> ebdfa1938
Trivial refactoring: extract variable Project: http://git-wip-us.apache.org/repos/asf/groovy/repo Commit: http://git-wip-us.apache.org/repos/asf/groovy/commit/ebdfa193 Tree: http://git-wip-us.apache.org/repos/asf/groovy/tree/ebdfa193 Diff: http://git-wip-us.apache.org/repos/asf/groovy/diff/ebdfa193 Branch: refs/heads/master Commit: ebdfa19389e75066154c433e272a0083350a15cf Parents: 2b918f8 Author: danielsun1106 <[email protected]> Authored: Fri Apr 6 14:46:13 2018 +0800 Committer: danielsun1106 <[email protected]> Committed: Fri Apr 6 14:46:13 2018 +0800 ---------------------------------------------------------------------- .../java/org/codehaus/groovy/control/ResolveVisitor.java | 10 ++++++---- 1 file changed, 6 insertions(+), 4 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/groovy/blob/ebdfa193/src/main/java/org/codehaus/groovy/control/ResolveVisitor.java ---------------------------------------------------------------------- diff --git a/src/main/java/org/codehaus/groovy/control/ResolveVisitor.java b/src/main/java/org/codehaus/groovy/control/ResolveVisitor.java index 6065a6d..bc3630f 100644 --- a/src/main/java/org/codehaus/groovy/control/ResolveVisitor.java +++ b/src/main/java/org/codehaus/groovy/control/ResolveVisitor.java @@ -368,15 +368,17 @@ public class ResolveVisitor extends ClassCodeExpressionTransformer { // test if vanilla name is current class name if (currentClass == type) return true; - if (genericParameterNames.get(type.getName()) != null) { - GenericsType gt = genericParameterNames.get(type.getName()); + String typeName = type.getName(); + + if (genericParameterNames.get(typeName) != null) { + GenericsType gt = genericParameterNames.get(typeName); type.setRedirect(gt.getType()); - type.setGenericsTypes(new GenericsType[]{gt}); + type.setGenericsTypes(new GenericsType[]{ gt }); type.setGenericsPlaceHolder(true); return true; } - if (currentClass.getNameWithoutPackage().equals(type.getName())) { + if (currentClass.getNameWithoutPackage().equals(typeName)) { type.setRedirect(currentClass); return true; }
