From de778df3114cc8caa87d4708e6a2fd8191d6af4d Mon Sep 17 00:00:00 2001
From: peter <peter@jetbrains.com>
Date: Wed, 21 Nov 2018 08:13:54 +0100
Subject: [PATCH] speed up GDKSuperMethodSearcher initialization

---
 .../plugins/groovy/dgm/DGMMemberContributor.java         | 7 +++++++
 .../groovy/findUsages/GDKSuperMethodSearcher.java        | 9 +++------
 2 files changed, 10 insertions(+), 6 deletions(-)

diff --git a/plugins/groovy/groovy-psi/src/org/jetbrains/plugins/groovy/dgm/DGMMemberContributor.java b/plugins/groovy/groovy-psi/src/org/jetbrains/plugins/groovy/dgm/DGMMemberContributor.java
index e85d9dd3a580..843e84ee8547 100644
--- a/plugins/groovy/groovy-psi/src/org/jetbrains/plugins/groovy/dgm/DGMMemberContributor.java
+++ b/plugins/groovy/groovy-psi/src/org/jetbrains/plugins/groovy/dgm/DGMMemberContributor.java
@@ -35,6 +35,13 @@ public class DGMMemberContributor extends NonCodeMembersContributor {
                                      @NotNull PsiScopeProcessor processor,
                                      @NotNull PsiElement place,
                                      @NotNull ResolveState state) {
+    processDgmMethods(qualifierType, processor, place, state);
+  }
+
+  public static void processDgmMethods(@NotNull PsiType qualifierType,
+                                        @NotNull PsiScopeProcessor processor,
+                                        @NotNull PsiElement place,
+                                        @NotNull ResolveState state) {
     if (!ResolveUtil.shouldProcessMethods(processor.getHint(ElementClassHint.KEY))) return;
 
     final Project project = place.getProject();
diff --git a/plugins/groovy/groovy-psi/src/org/jetbrains/plugins/groovy/findUsages/GDKSuperMethodSearcher.java b/plugins/groovy/groovy-psi/src/org/jetbrains/plugins/groovy/findUsages/GDKSuperMethodSearcher.java
index f84b77288b1b..d1dffa7f26dd 100644
--- a/plugins/groovy/groovy-psi/src/org/jetbrains/plugins/groovy/findUsages/GDKSuperMethodSearcher.java
+++ b/plugins/groovy/groovy-psi/src/org/jetbrains/plugins/groovy/findUsages/GDKSuperMethodSearcher.java
@@ -17,7 +17,6 @@ import org.jetbrains.plugins.groovy.lang.psi.api.GroovyResolveResult;
 import org.jetbrains.plugins.groovy.lang.psi.api.statements.typedef.members.GrMethod;
 import org.jetbrains.plugins.groovy.lang.psi.impl.PsiImplUtil;
 import org.jetbrains.plugins.groovy.lang.psi.impl.statements.expressions.TypesUtil;
-import org.jetbrains.plugins.groovy.lang.resolve.NonCodeMembersContributor;
 import org.jetbrains.plugins.groovy.lang.resolve.processors.MethodResolverProcessor;
 
 import java.util.ArrayList;
@@ -30,8 +29,6 @@ import java.util.List;
  */
 public class GDKSuperMethodSearcher implements QueryExecutor<MethodSignatureBackedByPsiMethod, SuperMethodsSearch.SearchParameters> {
 
-  private static final DGMMemberContributor myContributor = NonCodeMembersContributor.EP_NAME.findExtension(DGMMemberContributor.class);
-
   @Override
   public boolean execute(@NotNull SuperMethodsSearch.SearchParameters queryParameters, @NotNull Processor<? super MethodSignatureBackedByPsiMethod> consumer) {
     final PsiMethod method = queryParameters.getMethod();
@@ -50,9 +47,9 @@ public class GDKSuperMethodSearcher implements QueryExecutor<MethodSignatureBack
     final Project project = method.getProject();
 
     final String name = method.getName();
-    final MethodResolverProcessor processor = new MethodResolverProcessor(name, ((GrMethod)method), false, null, null, PsiType.EMPTY_ARRAY);
-    myContributor.processDynamicElements(JavaPsiFacade.getElementFactory(project).createType(psiClass), psiClass, processor, method,
-                                      ResolveState.initial());
+    final MethodResolverProcessor processor = new MethodResolverProcessor(name, method, false, null, null, PsiType.EMPTY_ARRAY);
+    DGMMemberContributor.processDgmMethods(JavaPsiFacade.getElementFactory(project).createType(psiClass),
+                                           processor, method, ResolveState.initial());
 
     final GroovyResolveResult[] candidates = processor.getCandidates();