GROOVY-8096

groovy · Aug 27, 2023 · a51a8c0 · a51a8c0
1 parent 045b29e
commit a51a8c0
Show file tree

Hide file tree

Showing 4 changed files with 28 additions and 1 deletion.
diff --git a/base/org.codehaus.groovy30/src/org/codehaus/groovy/ast/ModuleNode.java b/base/org.codehaus.groovy30/src/org/codehaus/groovy/ast/ModuleNode.java
@@ -344,7 +344,16 @@ private void setScriptBaseClassFromConfig(final ClassNode cn) {
         }
         if (baseClassName != null) {
             if (!cn.getSuperClass().getName().equals(baseClassName)) {
+                /* GRECLIPSE edit -- GROOVY-8096
                 cn.setSuperClass(ClassHelper.make(baseClassName));
+                */
+                ClassLoader cl = unit != null ? unit.getClassLoader() : context.getClassLoader();
+                try {
+                    cn.setSuperClass(ClassHelper.make(cl.loadClass(baseClassName)));
+                } catch (ReflectiveOperationException | RuntimeException e) {
+                    cn.setSuperClass(ClassHelper.make(baseClassName));
+                }
+                // GRECLIPSE end
                 AnnotationNode annotationNode = new AnnotationNode(BaseScriptASTTransformation.MY_TYPE);
                 cn.addAnnotation(annotationNode);
             }

diff --git a/base/org.codehaus.groovy40/src/org/codehaus/groovy/ast/ModuleNode.java b/base/org.codehaus.groovy40/src/org/codehaus/groovy/ast/ModuleNode.java
@@ -350,7 +350,16 @@ private void setScriptBaseClassFromConfig(final ClassNode cn) {
         }
         if (baseClassName != null) {
             if (!cn.getSuperClass().getName().equals(baseClassName)) {
+                /* GRECLIPSE edit -- GROOVY-8096
                 cn.setSuperClass(ClassHelper.make(baseClassName));
+                */
+                ClassLoader cl = unit != null ? unit.getClassLoader() : context.getClassLoader();
+                try {
+                    cn.setSuperClass(ClassHelper.make(cl.loadClass(baseClassName)));
+                } catch (ReflectiveOperationException | RuntimeException e) {
+                    cn.setSuperClass(ClassHelper.make(baseClassName));
+                }
+                // GRECLIPSE end
                 AnnotationNode annotationNode = new AnnotationNode(BaseScriptASTTransformation.MY_TYPE);
                 cn.addAnnotation(annotationNode);
             }

diff --git a/base/org.codehaus.groovy50/src/org/codehaus/groovy/ast/ModuleNode.java b/base/org.codehaus.groovy50/src/org/codehaus/groovy/ast/ModuleNode.java
@@ -349,7 +349,16 @@ private void setScriptBaseClassFromConfig(final ClassNode cn) {
         }
         if (baseClassName != null) {
             if (!cn.getSuperClass().getName().equals(baseClassName)) {
+                /* GRECLIPSE edit -- GROOVY-8096
                 cn.setSuperClass(ClassHelper.make(baseClassName));
+                */
+                ClassLoader cl = unit != null ? unit.getClassLoader() : context.getClassLoader();
+                try {
+                    cn.setSuperClass(ClassHelper.make(cl.loadClass(baseClassName)));
+                } catch (ReflectiveOperationException | RuntimeException e) {
+                    cn.setSuperClass(ClassHelper.make(baseClassName));
+                }
+                // GRECLIPSE end
                 AnnotationNode annotationNode = new AnnotationNode(BaseScriptASTTransformation.MY_TYPE);
                 cn.addAnnotation(annotationNode);
             }

diff --git a/...t.groovy.core/src/org/codehaus/jdt/groovy/integration/internal/GroovyLanguageSupport.java b/...t.groovy.core/src/org/codehaus/jdt/groovy/integration/internal/GroovyLanguageSupport.java
@@ -250,7 +250,7 @@ public static CompilerConfiguration newCompilerConfiguration(final CompilerOptio
             ic.addStarImports("org.codehaus.groovy.ast.expr");
             if (GroovyUtils.getGroovyVersion().compareTo(new Version(4, 0, 6)) >= 0) ic.addStarImports("org.codehaus.groovy.ast");
             ic.addStaticStars("org.codehaus.groovy.ast.ClassHelper","org.codehaus.groovy.transform.stc.StaticTypeCheckingSupport");
-            config.addCompilationCustomizers(ic).setScriptBaseClass("org.codehaus.groovy.transform.stc.GroovyTypeCheckingExtensionSupport.TypeCheckingDSL");
+            config.addCompilationCustomizers(ic).setScriptBaseClass("org.codehaus.groovy.transform.stc.GroovyTypeCheckingExtensionSupport$TypeCheckingDSL");
 
             return config;
         }