You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@groovy.apache.org by su...@apache.org on 2019/08/29 06:49:31 UTC

[groovy] branch danielsun1106-patch-1 created (now 605d6d1)

This is an automated email from the ASF dual-hosted git repository.

sunlan pushed a change to branch danielsun1106-patch-1
in repository https://gitbox.apache.org/repos/asf/groovy.git.


      at 605d6d1  GROOVY-9236: Avoid unnecessary resolving

This branch includes the following new commits:

     new 605d6d1  GROOVY-9236: Avoid unnecessary resolving

The 1 revisions listed above as "new" are entirely new to this
repository and will be described in separate emails.  The revisions
listed as "add" were already present in the repository and have only
been added to this reference.



[groovy] 01/01: GROOVY-9236: Avoid unnecessary resolving

Posted by su...@apache.org.
This is an automated email from the ASF dual-hosted git repository.

sunlan pushed a commit to branch danielsun1106-patch-1
in repository https://gitbox.apache.org/repos/asf/groovy.git

commit 605d6d11e2d120eab1b3d414a1308848583c778d
Author: Daniel.Sun <su...@apache.org>
AuthorDate: Thu Aug 29 14:49:25 2019 +0800

    GROOVY-9236: Avoid unnecessary resolving
---
 src/main/java/org/codehaus/groovy/control/ResolveVisitor.java | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/src/main/java/org/codehaus/groovy/control/ResolveVisitor.java b/src/main/java/org/codehaus/groovy/control/ResolveVisitor.java
index 9f6cf24..a979371 100644
--- a/src/main/java/org/codehaus/groovy/control/ResolveVisitor.java
+++ b/src/main/java/org/codehaus/groovy/control/ResolveVisitor.java
@@ -462,12 +462,12 @@ public class ResolveVisitor extends ClassCodeExpressionTransformer {
             return true;
         }
 
-        return resolveNestedClass(type) ||
+        return  resolveNestedClass(type) ||
                 resolveFromModule(type, testModuleImports) ||
                 resolveFromCompileUnit(type) ||
+                resolveToOuter(type) ||
                 resolveFromDefaultImports(type, testDefaultImports) ||
-                resolveFromStaticInnerClasses(type, testStaticInnerClasses) ||
-                resolveToOuter(type);
+                resolveFromStaticInnerClasses(type, testStaticInnerClasses);
     }
 
     private boolean resolveNestedClass(ClassNode type) {