GROOVY-7685: Object category method and closure method call

Author: eric-milles

src/main/java/groovy/lang/MetaClassImpl.java

@@ -710,7 +710,8 @@ private Object getMethods(final Class<?> sender, final String name, final boolea
                 }
                 for (CategoryMethod cm : methods) {
                     Class<?> cmdc = cm.getDeclaringClass().getTheClass();
-                    if (cmdc.isAssignableFrom(theClass)) // GROOVY-11813: not sender
+                    if (cmdc == Object.class ? !isGroovyFunctor() // GROOVY-7685
+                                             : cmdc.isAssignableFrom(theClass)) // GROOVY-11813
                         filterMatchingMethodForCategory(array, cm);
                 }
                 answer = array;

src/test/groovy/groovy/CategoryTest.groovy

@@ -432,6 +432,32 @@ final class CategoryTest {
         '''
     }
 
+    // GROOVY-7685
+    @Test
+    void testCategoryMethodAndClosureResolveStrategy() {
+        assertScript '''
+            class C {
+                static m(self) {
+                    'Category'
+                }
+            }
+            class D {
+                def m() {
+                    'Delegate'
+                }
+            }
+
+            use(C) {
+                def x = { ->
+                    assert m() == 'Delegate'
+                }
+                x.resolveStrategy = Closure.DELEGATE_ONLY
+                x.delegate = new D()
+                x.call()
+            }
+        '''
+    }
+
     // GROOVY-11813
     @Test
     void testCategoryOperatorMethodAndCustomMetaClass() {