GROOVY-9510, GROOVY-10192 (pt.3)

Author: eric-milles

base/org.eclipse.jdt.groovy.core/src/org/eclipse/jdt/groovy/search/TypeInferencingVisitorWithRequestor.java

@@ -440,11 +440,7 @@ public void visitJDT(final IField field, final ITypeRequestor requestor) {
         IJavaElement enclosingElement0 = enclosingElement;
         enclosingElement = field;
         try {
-            visitField(fieldNode);
-        } catch (VisitCompleted vc) {
-            if (vc.status == VisitStatus.STOP_VISIT) {
-                throw vc;
-            }
+            visitFieldInternal(fieldNode);
         } finally {
             enclosingElement = enclosingElement0;
         }
@@ -658,31 +654,22 @@ private void visitFieldInternal(final FieldNode node) {
     }
 
     private void visitMethodInternal(final MethodNode node) {
+        scopes.add(new VariableScope(scopes.getLast(), node, true));
         ASTNode enclosingDeclaration0 = enclosingDeclarationNode;
         enclosingDeclarationNode = node;
         try {
-            VariableScope classScope = scopes.getLast();
-            if (isNotEmpty(node.getAnnotations())) {
-                // assert(!node.isScriptBody());
-                classScope.setCurrentNode(node);
-                try {
-                    visitAnnotations(node); // annotations are in class scope
-                } finally {
-                    classScope.forgetCurrentNode();
-                }
-            }
-
-            scopes.add(new VariableScope(classScope, node, node.isStatic()));
-            try {
-                visitConstructorOrMethod(node, node instanceof ConstructorNode || node.getName().equals("<clinit>"));
-            } finally {
-                scopes.removeLast().bubbleUpdates();
+            visitAnnotations(node);
+            if (!node.isStatic()) {
+                scopes.removeLast();
+                scopes.add(new VariableScope(scopes.getLast(), node, false));
             }
+            visitConstructorOrMethod(node, node instanceof ConstructorNode || node.getName().equals("<clinit>"));
         } catch (VisitCompleted vc) {
             if (vc.status == VisitStatus.STOP_VISIT) {
                 throw vc;
             }
         } finally {
+            scopes.removeLast().bubbleUpdates();
             enclosingDeclarationNode = enclosingDeclaration0;
         }
     }
@@ -1186,21 +1173,26 @@ public void visitFieldExpression(final FieldExpression node) {
 
     @Override
     public void visitField(final FieldNode node) {
-        visitAnnotations(node);
-        if (node.getEnd() > 0 && node.getDeclaringClass().isScript()) {
-            for (ASTNode anno : GroovyUtils.getTransformNodes(node.getDeclaringClass(), FieldASTTransformation.class)) {
-                if (anno.getStart() >= node.getStart() && anno.getEnd() < node.getEnd()) {
-                    visitAnnotation((AnnotationNode) anno);
+        ASTNode enclosingDeclaration = enclosingDeclarationNode;
+        enclosingDeclarationNode = node;
+        try {
+            VariableScope classScope = scopes.getLast(), fieldScope = new VariableScope(classScope, node, true);
+            scopes.add(fieldScope);
+
+            visitAnnotations(node);
+            if (node.getEnd() > 0 && node.getDeclaringClass().isScript()) {
+                for (ASTNode anno : GroovyUtils.getTransformNodes(node.getDeclaringClass(), FieldASTTransformation.class)) {
+                    if (anno.getStart() >= node.getStart() && anno.getEnd() < node.getEnd()) {
+                        visitAnnotation((AnnotationNode) anno);
+                    }
                 }
             }
-        }
 
-        VariableScope classScope = scopes.getLast(), fieldScope = new VariableScope(classScope, node, node.isStatic());
-        scopes.add(fieldScope);
+            if (!node.isStatic()) {
+                scopes.removeLast();
+                scopes.add(fieldScope = new VariableScope(classScope, node, false));
+            }
 
-        ASTNode enclosingDeclaration = enclosingDeclarationNode;
-        enclosingDeclarationNode = node;
-        try {
             if (node.isDynamicTyped()) {
                 ClassNode type = node.getType();
                 if (node.hasInitialExpression()) {

base/org.eclipse.jdt.groovy.core/src/org/eclipse/jdt/groovy/search/VariableScope.java

@@ -402,8 +402,7 @@ public boolean isStatic() {
     }
 
     public boolean isOwnerStatic() {
-        VariableScope scope = this;
-        do {
+        for (VariableScope scope = this; scope != null; scope = scope.parent) {
             if (scope.isStatic()) {
                 return true;
             }
@@ -412,8 +411,7 @@ public boolean isOwnerStatic() {
                 scope.scopeNode instanceof MethodNode) {
                 break;
             }
-        } while ((scope = scope.parent) != null);
-
+        }
         return false;
     }
 
@@ -452,18 +450,13 @@ public FieldNode getEnclosingFieldDeclaration() {
     }
 
     public MethodNode getEnclosingMethodDeclaration() {
-        for (Iterator<ASTNode> it = shared.nodeStack.descendingIterator(); it.hasNext();) {
-            ASTNode node = it.next();
-            if (node instanceof MethodNode) {
-                return (MethodNode) node;
-            }
-        }
-        for (VariableScope scope = this; scope != null; scope = scope.parent) {
-            if (scope.scopeNode instanceof MethodNode) {
-                return (MethodNode) scope.scopeNode;
-            }
+        if (scopeNode instanceof MethodNode) {
+            return (MethodNode) scopeNode;
+        } else if (parent != null) {
+            return parent.getEnclosingMethodDeclaration();
+        } else {
+            return null;
         }
-        return null;
     }
 
     public ClosureExpression getEnclosingClosure() {

ide-test/org.codehaus.groovy.eclipse.dsl.tests/src/org/codehaus/groovy/eclipse/dsl/tests/PointcutEvaluationTests.groovy

@@ -15,7 +15,6 @@
  */
 package org.codehaus.groovy.eclipse.dsl.tests
 
-import groovy.test.NotYetImplemented
 import groovy.transform.ToString
 import groovy.transform.TupleConstructor
 
@@ -669,7 +668,7 @@ final class PointcutEvaluationTests extends GroovyEclipseTestSuite {
             new BindingResult('b', '@java.lang.Deprecated, @java.lang.Deprecated'))
     }
 
-    @NotYetImplemented @Test
+    @Test
     void testEnclosingFieldBinding() {
         addGroovySource('@interface Tag {\n Class<? extends Closure> value()\n}', 'Tag', 'p')