GROOVY-9510, GROOVY-10192

Author: eric-milles

base-test/org.eclipse.jdt.groovy.core.tests.builder/src/org/eclipse/jdt/core/groovy/tests/search/SpockInferencingTests.java

@@ -151,4 +151,20 @@ public void testDataTableChecks() {
         assertType(source, offset, offset + 1, "java.lang.Object");
         assertDeclaringType(source, offset, offset + 1, "SpockTests");
     }
+
+    @Test
+    public void testRequiresCondition() {
+        //@formatter:off
+        String source =
+            "final class SpockTests extends spock.lang.Specification {\n" +
+            "  @spock.lang.Requires({ owner })\n" + // owner is static
+            "  void testSomething() {\n" +
+            "   expect:\n" +
+            "    true\n" +
+            "  }\n" +
+            "}\n";
+        //@formatter:on
+
+        assertType(source, "owner", "java.lang.Class<SpockTests>");
+    }
 }

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

@@ -658,17 +658,21 @@ private void visitFieldInternal(final FieldNode node) {
     }
 
     private void visitMethodInternal(final MethodNode node) {
-        scopes.add(new VariableScope(scopes.getLast(), node, node.isStatic()));
         ASTNode enclosingDeclaration0 = enclosingDeclarationNode;
         enclosingDeclarationNode = node;
         try {
-            visitConstructorOrMethod(node, node instanceof ConstructorNode || node.getName().equals("<clinit>"));
+            visitAnnotations(node); // annotations are in class scope
+            scopes.add(new VariableScope(scopes.getLast(), node, node.isStatic()));
+            try {
+                visitConstructorOrMethod(node, node instanceof ConstructorNode || node.getName().equals("<clinit>"));
+            } finally {
+                scopes.removeLast().bubbleUpdates();
+            }
         } catch (VisitCompleted vc) {
             if (vc.status == VisitStatus.STOP_VISIT) {
                 throw vc;
             }
         } finally {
-            scopes.removeLast().bubbleUpdates();
             enclosingDeclarationNode = enclosingDeclaration0;
         }
     }
@@ -940,7 +944,7 @@ public void visitClosureExpression(final ClosureExpression node) {
                 scope.addVariable("owner", closureType, VariableScope.CLOSURE_CLASS_NODE);
                 scope.addVariable("getOwner", closureType, VariableScope.CLOSURE_CLASS_NODE);
             } else {
-                ClassNode ownerType = scope.getThis();
+                ClassNode ownerType = parent.getThis();
                 // GRECLIPSE-1348: if someone is silly enough to have a variable named "owner"; don't override it
                 VariableScope.VariableInfo info = scope.lookupName("owner");
                 if (info == null || info.type == null || info.scopeNode instanceof ClosureExpression) {
@@ -1115,7 +1119,6 @@ public void visitConstructorOrMethod(final MethodNode node, final boolean isCons
                 }
             }
             if (handleParameters(node.getParameters())) {
-                visitAnnotations(node);
                 if (!isConstructor || !(node.getCode() instanceof BlockStatement)) {
                     visitClassCodeContainer(node.getCode());
                 } else {