GROOVY-10199

Author: eric-milles

base-test/org.eclipse.jdt.groovy.core.tests.compiler/src/org/eclipse/jdt/groovy/core/tests/xform/ASTTestTests.java

@@ -17,6 +17,8 @@
 
 import static org.eclipse.jdt.groovy.core.tests.GroovyBundle.isAtLeastGroovy;
 
+import org.eclipse.core.runtime.FileLocator;
+import org.eclipse.core.runtime.Platform;
 import org.eclipse.jdt.groovy.core.tests.basic.GroovyCompilerTestSuite;
 import org.junit.Test;
 
@@ -102,4 +104,25 @@ public void testASTTest4() {
 
         runConformTest(sources);
     }
+
+    @Test // GROOVY-10199
+    public void testASTTest5() throws Exception {
+        java.net.URL bundleEntry = Platform.getBundle("org.eclipse.jdt.groovy.core.tests.compiler").getEntry("astTransformations/transforms.jar");
+        cpAdditions = new String[] {FileLocator.toFileURL(bundleEntry).getPath()};
+
+        //@formatter:off
+        String[] sources = {
+            "Main.groovy",
+            "@groovy.transform.ASTTest(value={\n" +
+            "  print examples.local.LoggingExample\n" + // Cannot get property 'local' on null object
+            "})\n" +
+            "class Main {\n" +
+            "  static main(args) {\n" +
+            "  }\n" +
+            "}\n",
+        };
+        //@formatter:on
+
+        runConformTest(sources);
+    }
 }

base-test/org.eclipse.jdt.groovy.core.tests.compiler/src/org/eclipse/jdt/groovy/core/tests/xform/UserDefinedTests.java

@@ -1,5 +1,5 @@
 /*
- * Copyright 2009-2020 the original author or authors.
+ * Copyright 2009-2021 the original author or authors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -21,17 +21,14 @@
 import org.junit.Test;
 
 /**
- * Test cases for user-defined AST transformations. The required library (aka
- * <tt>astTransformations/transforms.jar</tt>) is added to compiler classpath
- * in {@link GroovyCompilerTestSuite}.
+ * Test cases for user-defined AST transformations.
  */
 public final class UserDefinedTests extends GroovyCompilerTestSuite {
 
     @Test
     public void testWithLogging() throws Exception {
-        cpAdditions = new String[] {
-            FileLocator.toFileURL(Platform.getBundle("org.eclipse.jdt.groovy.core.tests.compiler").getEntry("astTransformations/transforms.jar")).getPath()
-        };
+        java.net.URL bundleEntry = Platform.getBundle("org.eclipse.jdt.groovy.core.tests.compiler").getEntry("astTransformations/transforms.jar");
+        cpAdditions = new String[] {FileLocator.toFileURL(bundleEntry).getPath()};
 
         //@formatter:off
         String[] sources = {

base/org.codehaus.groovy25/src/org/codehaus/groovy/transform/ASTTestTransformation.groovy

@@ -124,7 +124,7 @@ class ASTTestTransformation extends AbstractASTTransformation implements Compila
                     binding['compilationUnit'] = compilationUnit
                     binding['compilePhase'] = CompilePhase.fromPhaseNumber(phaseRef)
 
-                    GroovyShell shell = new GroovyShell(binding, config)
+                    GroovyShell shell = new GroovyShell(/*GRECLIPSE add*/compilationUnit.transformLoader,/**/binding, config)
 
                     source.AST.imports.each {
                         customizer.addImport(it.alias, it.type.name)

base/org.codehaus.groovy30/src/org/codehaus/groovy/transform/ASTTestTransformation.groovy

@@ -140,11 +140,11 @@ class ASTTestTransformation implements ASTTransformation, CompilationUnitAware {
 
                     def config = new CompilerConfiguration()
                     config.addCompilationCustomizers(customizer)
-                    // GRECLIPSE add
-                    try {
-                    // GRECLIPSE end
+                    /* GRECLIPSE edit
                     new GroovyShell(binding, config).evaluate(testSource)
-                    // GRECLIPSE add
+                    */
+                    try {
+                        new GroovyShell(compilationUnit.transformLoader, binding, config).evaluate(testSource)
                     } catch (Throwable t) {
                         source.addErrorAndContinue(new SyntaxException(" ASTTest exception: $t.message", t,
                             annotationNode.lineNumber, annotationNode.columnNumber, annotationNode.classNode.lastLineNumber, annotationNode.classNode.lastColumnNumber

base/org.codehaus.groovy40/src/org/codehaus/groovy/transform/ASTTestTransformation.groovy

@@ -160,11 +160,11 @@ class ASTTestTransformation implements ASTTransformation, CompilationUnitAware {
 
             def config = new CompilerConfiguration()
             config.addCompilationCustomizers(customizer)
-            // GRECLIPSE add
-            try {
-            // GRECLIPSE end
+            /* GRECLIPSE edit
             new GroovyShell(binding, config).evaluate(testSource)
-            // GRECLIPSE add
+            */
+            try {
+                new GroovyShell(compilationUnit.transformLoader, binding, config).evaluate(testSource)
             } catch (Throwable t) {
                 sourceUnit.addErrorAndContinue(new SyntaxException(" ASTTest exception: $t.message", t, astNode.lineNumber, astNode.columnNumber))
             }