Fix for #1002: load DGMs from VMPlugin

groovy · Dec 12, 2019 · 620a3fb · 620a3fb
1 parent b35a659
commit 620a3fb
Show file tree

Hide file tree

Showing 2 changed files with 21 additions and 1 deletion.
diff --git a/....core.tests.builder/src/org/eclipse/jdt/core/groovy/tests/search/DGMInferencingTests.java b/....core.tests.builder/src/org/eclipse/jdt/core/groovy/tests/search/DGMInferencingTests.java
@@ -17,6 +17,7 @@
 
 import static org.eclipse.jdt.groovy.core.tests.GroovyBundle.isAtLeastGroovy;
 import static org.junit.Assume.assumeFalse;
+import static org.junit.Assume.assumeTrue;
 
 import java.util.Comparator;
 import java.util.List;
@@ -997,6 +998,20 @@ public void testDGSMDeclaring6() {
         assertDeclType(contents, "minus", "org.codehaus.groovy.runtime.dgmimpl.NumberNumberMinus");
     }
 
+    @Test // https://github.com/groovy/groovy-eclipse/issues/1002
+    public void testDGSMDeclaring7() {
+        String contents = "new StringBuilder().size()";
+        assertDeclType(contents, "size", "org.codehaus.groovy.vmplugin.v5.PluginDefaultGroovyMethods");
+    }
+
+    @Test // https://github.com/groovy/groovy-eclipse/issues/1002
+    public void testDGSMDeclaring8() {
+        assumeTrue(isAtLeastGroovy(25));
+
+        String contents = "['x','y','z'].stream().toList()";
+        assertDeclType(contents, "toList", "org.codehaus.groovy.vmplugin.v8.PluginDefaultGroovyMethods");
+    }
+
     @Test
     public void testStaticMixinDGM() {
         String contents =

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
@@ -274,7 +274,11 @@ public Set<Class> getDefaultCategories() {
                             Collections.addAll(objectCategories, (Class[]) dgm.getField("DGM_LIKE_CLASSES").get(dgm));
                             Collections.addAll(objectCategories, (Class[]) dgm.getField("ADDITIONAL_CLASSES").get(dgm));
 
-                            staticCategories.add(dgsm);
+                            Class vmpf = loadClass("org.codehaus.groovy.vmplugin.VMPluginFactory", false, true);
+                            @SuppressWarnings("unchecked") Object vmp = vmpf.getMethod("getPlugin").invoke(vmpf);
+
+                            Collections.addAll(objectCategories, (Class[]) vmp.getClass().getMethod("getPluginDefaultGroovyMethods").invoke(vmp));
+                            Collections.addAll(staticCategories, (Class[]) vmp.getClass().getMethod("getPluginStaticGroovyMethods").invoke(vmp));
 
                             new ExtensionModuleScanner(module -> {
                                 if (module instanceof SimpleExtensionModule) {
@@ -283,6 +287,7 @@ public Set<Class> getDefaultCategories() {
                                 }
                             }, this).scanClasspathModules();
 
+                            staticCategories.add(dgsm);
                             objectCategories.addAll(staticCategories);
 
                             defaultCategories = objectCategories;