MDS/openide
1
0
Fork 0
mirror of https://gitflic.ru/project/openide/openide.git synced 2026-09-27 10:03:11 +07:00
Code Issues Packages Projects Releases Wiki Activity

[groovy] don't override element class hint when processing category methods (EA-137276)

Browse Source
This commit is contained in:
Daniil Ovchinnikov
2019-03-20 19:03:17 +03:00
parent ad10821513
commit 46a1a8d561
2 changed files with 13 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files
plugins/groovy/groovy-psi/src/org/jetbrains/plugins/groovy/lang/psi/util/GdkMethodUtil.java
+2 -4
View File
@@ -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)) {
plugins/groovy/test/org/jetbrains/plugins/groovy/lang/resolve/CategorySupportTest.groovy
+11
View File
@@ -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() { <caret>foo }
}
''', null
}
}