minor fix-ups

groovy · Apr 14, 2020 · 68af2a1 · 68af2a1
1 parent 48283fc
commit 68af2a1
Show file tree

Hide file tree

Showing 2 changed files with 2 additions and 5 deletions.
diff --git a/...dt.groovy.core/src/org/eclipse/jdt/groovy/search/TypeInferencingVisitorWithRequestor.java b/...dt.groovy.core/src/org/eclipse/jdt/groovy/search/TypeInferencingVisitorWithRequestor.java
@@ -1831,7 +1831,6 @@ public void visitVariableExpression(final VariableExpression node) {
         }
 
         scopes.getLast().setCurrentNode(node);
-        visitAnnotations(node);
         if (node.getAccessedVariable() == node) {
             // this is a local variable declaration
             visitClassReference(node.getOriginType());

diff --git a/base/org.eclipse.jdt.groovy.core/src/org/eclipse/jdt/groovy/search/VariableScope.java b/base/org.eclipse.jdt.groovy.core/src/org/eclipse/jdt/groovy/search/VariableScope.java
@@ -475,16 +475,14 @@ public int getEnclosingClosureResolveStrategy() {
     }
 
     /*package*/ VariableScope getEnclosingClosureScope() {
-        VariableScope scope = this;
-        do {
+        for (VariableScope scope = this; scope != null; scope = scope.parent) {
             if (scope.scopeNode instanceof ClosureExpression) {
                 return scope;
             }
             if (scope.scopeNode instanceof ClassNode) {
                 break;
             }
-        } while ((scope = scope.parent) != null);
-
+        }
         return null;
     }