Rename spk.dsld to spock_tests.dsld and enhance it

Co-authored-by: Eric Milles <[email protected]>

spock-core/src/main/resources/dsld/spk.dsld → spock-core/src/main/resources/dsld/spock_tests.dsld

@@ -14,6 +14,7 @@
 
 package dsld
 
+import org.codehaus.groovy.ast.*
 import org.codehaus.groovy.ast.expr.*
 
 assertVersion(groovyEclipse: "2.7.2") // tested against this version
@@ -50,3 +51,29 @@ contribute(
   }
 }
 
+
+// From https://issues.apache.org/jira/browse/GROOVY-9510
+// Properly resolve the delegatesTo for the closures of these extensions
+def hasPrecondition = { annotatedBy(name('spock.lang.Requires') | name('spock.lang.IgnoreIf') | name('spock.lang.PendingFeatureIf')) }
+
+contribute(inClosure() & isThisType() & bind(classes: enclosingClass(subType('spock.lang.Specification')))
+ & (enclosingClass(conditions: hasPrecondition()) | enclosingMethod(conditions: hasPrecondition()))) {
+  for (AnnotationNode pre : conditions) {
+    def condition = pre.getMember('value')
+    if (condition.getCode().is(currentNode)) {
+      delegateType = resolver.resolve("org.spockframework.runtime.extension.builtin.PreconditionContext<${classes[0].getName()}>")
+      return
+    }
+  }
+}
+
+contribute(inClosure() & isThisType() & bind(classes: enclosingClass(subType('spock.lang.Specification')))
+ & (enclosingClass(annotations: annotatedBy('spock.lang.Retry')) | enclosingMethod(annotations: annotatedBy('spock.lang.Retry')))) {
+  for (AnnotationNode retry : annotations) {
+    def condition = retry.getMember('condition')
+    if (condition.getCode().is(currentNode)) {
+      delegateType = resolver.resolve("org.spockframework.runtime.extension.builtin.RetryConditionContext<${classes[0].getName()}>")
+      return
+    }
+  }
+}