diff --git a/plugins/groovy/groovy-psi/src/org/jetbrains/plugins/groovy/lang/psi/util/GdkMethodUtil.java b/plugins/groovy/groovy-psi/src/org/jetbrains/plugins/groovy/lang/psi/util/GdkMethodUtil.java index eb5d34e1805b..b7e62d064758 100644 --- a/plugins/groovy/groovy-psi/src/org/jetbrains/plugins/groovy/lang/psi/util/GdkMethodUtil.java +++ b/plugins/groovy/groovy-psi/src/org/jetbrains/plugins/groovy/lang/psi/util/GdkMethodUtil.java @@ -1,4 +1,4 @@ -// Copyright 2000-2018 JetBrains s.r.o. Use of this source code is governed by the Apache 2.0 license that can be found in the LICENSE file. +// Copyright 2000-2019 JetBrains s.r.o. Use of this source code is governed by the Apache 2.0 license that can be found in the LICENSE file. package org.jetbrains.plugins.groovy.lang.psi.util; import com.intellij.openapi.util.NullableComputable; @@ -34,8 +34,6 @@ import org.jetbrains.plugins.groovy.lang.psi.impl.synthetic.GrLightMethodBuilder import org.jetbrains.plugins.groovy.lang.resolve.ResolveUtil; import org.jetbrains.plugins.groovy.lang.resolve.ResolveUtilKt; import org.jetbrains.plugins.groovy.lang.resolve.noncode.MixinMemberContributor; -import org.jetbrains.plugins.groovy.lang.resolve.processors.ClassHint; -import org.jetbrains.plugins.groovy.lang.resolve.processors.GrDelegatingScopeProcessorWithHints; import org.jetbrains.plugins.groovy.lang.resolve.processors.MultiProcessor; import java.util.List; @@ -79,7 +77,7 @@ public class GdkMethodUtil { @NotNull final ResolveState state, @NotNull final PsiClass categoryClass) { for (final PsiScopeProcessor each : MultiProcessor.allProcessors(processor)) { - final PsiScopeProcessor delegate = new GrDelegatingScopeProcessorWithHints(each, null, ClassHint.RESOLVE_KINDS_METHOD) { + final PsiScopeProcessor delegate = new DelegatingScopeProcessor(each) { @Override public boolean execute(@NotNull PsiElement element, @NotNull ResolveState delegateState) { if (element instanceof PsiMethod && isCategoryMethod((PsiMethod)element, null, null, null)) { diff --git a/plugins/groovy/test/org/jetbrains/plugins/groovy/lang/resolve/CategorySupportTest.groovy b/plugins/groovy/test/org/jetbrains/plugins/groovy/lang/resolve/CategorySupportTest.groovy index 94d345ee0a3a..a25698ec6e24 100644 --- a/plugins/groovy/test/org/jetbrains/plugins/groovy/lang/resolve/CategorySupportTest.groovy +++ b/plugins/groovy/test/org/jetbrains/plugins/groovy/lang/resolve/CategorySupportTest.groovy @@ -42,4 +42,15 @@ class C { } ''', GrGdkMethod } + + @Test + void 'property within category with explicit method'() { + resolveTest '''\ +@Category(String) +class C { + static def foo(String s) {} + def usage() { foo } +} +''', null + } }