Fix for opening Groovy Editor in non-Java project

#564
groovy · Apr 19, 2018 · 312cdfe · 312cdfe
1 parent 20b5ee2
commit 312cdfe
Showing 1 changed file with 4 additions and 3 deletions.
diff --git a/...t.groovy.core/src/org/codehaus/jdt/groovy/internal/compiler/GroovyClassLoaderFactory.java b/...t.groovy.core/src/org/codehaus/jdt/groovy/internal/compiler/GroovyClassLoaderFactory.java
@@ -141,11 +141,11 @@ private GroovyClassLoader[] getProjectGroovyClassLoaders(CompilerConfiguration c
         String projectName = compilerOptions.groovyProjectName; IProject project = findProject(projectName);
         try {
             IJavaProject javaProject = JavaCore.create(project);
-            IClasspathEntry[] classpathEntries = javaProject.getResolvedClasspath(true);
+            IClasspathEntry[] classpathEntries = javaProject.exists() ? javaProject.getResolvedClasspath(true) : new IClasspathEntry[0];
 
             Map.Entry<IClasspathEntry[], GroovyClassLoader[]> entry = projectClassLoaderCache.computeIfAbsent(projectName, key -> {
                 Set<String> classPaths = new LinkedHashSet<>(), xformPaths = new LinkedHashSet<>();
-                calculateClasspath(javaProject, classPaths, xformPaths);
+                if (javaProject.exists()) calculateClasspath(javaProject, classPaths, xformPaths);
 
                 if (GroovyLogManager.manager.hasLoggers()) {
                     GroovyLogManager.manager.log(TraceCategory.AST_TRANSFORM,
@@ -226,7 +226,8 @@ private static URLClassLoader newClassLoader(Set<String> classpath, ClassLoader
         }).filter(Objects::nonNull).toArray(URL[]::new);
 
         if (NONLOCKING) {
-            return new org.apache.xbean.classloader.NonLockingJarFileClassLoader("AST Transform loader", urls, parent);
+            if (parent == null) parent = URLClassLoader.newInstance(new URL[0], null);
+            return new org.apache.xbean.classloader.NonLockingJarFileClassLoader("GDT non-locking loader", urls, parent);
         } else {
             return URLClassLoader.newInstance(urls, parent);
         }