From 431aec5b2a8c4200abc81e268457cd48dce79452 Mon Sep 17 00:00:00 2001
From: Daniil Ovchinnikov <daniil.ovchinnikov@jetbrains.com>
Date: Tue, 26 Sep 2017 23:01:48 +0200
Subject: [PATCH] [groovy] clean up GdkMethodHolder

---
 .../plugins/groovy/dgm/DGMMemberContributor.java      |  6 +++---
 .../jetbrains/plugins/groovy/dgm/GdkMethodHolder.java | 11 +++--------
 .../groovy/lang/resolve/GdkMethodDslProvider.java     |  2 +-
 3 files changed, 7 insertions(+), 12 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 0143c83caa1b..c957c55b73a9 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
@@ -1,5 +1,5 @@
 /*
- * Copyright 2000-2015 JetBrains s.r.o.
+ * Copyright 2000-2017 JetBrains s.r.o.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -80,13 +80,13 @@ public class DGMMemberContributor extends NonCodeMembersContributor {
     for (String category : extensions.getFirst()) {
       PsiClass clazz = facade.findClass(category, resolveScope);
       if (clazz != null) {
-        gdkMethods.add(GdkMethodHolder.getHolderForClass(clazz, false, resolveScope));
+        gdkMethods.add(GdkMethodHolder.getHolderForClass(clazz, false));
       }
     }
     for (String category : extensions.getSecond()) {
       PsiClass clazz = facade.findClass(category, resolveScope);
       if (clazz != null) {
-        gdkMethods.add(GdkMethodHolder.getHolderForClass(clazz, true, resolveScope));
+        gdkMethods.add(GdkMethodHolder.getHolderForClass(clazz, true));
       }
     }
     return gdkMethods;
diff --git a/plugins/groovy/groovy-psi/src/org/jetbrains/plugins/groovy/dgm/GdkMethodHolder.java b/plugins/groovy/groovy-psi/src/org/jetbrains/plugins/groovy/dgm/GdkMethodHolder.java
index 2ac4a1ab996d..0db2211bff84 100644
--- a/plugins/groovy/groovy-psi/src/org/jetbrains/plugins/groovy/dgm/GdkMethodHolder.java
+++ b/plugins/groovy/groovy-psi/src/org/jetbrains/plugins/groovy/dgm/GdkMethodHolder.java
@@ -25,7 +25,6 @@ import com.intellij.psi.*;
 import com.intellij.psi.impl.PsiImplUtil;
 import com.intellij.psi.scope.NameHint;
 import com.intellij.psi.scope.PsiScopeProcessor;
-import com.intellij.psi.search.GlobalSearchScope;
 import com.intellij.psi.util.*;
 import com.intellij.util.containers.ConcurrentFactoryMap;
 import com.intellij.util.containers.MultiMap;
@@ -50,15 +49,11 @@ public class GdkMethodHolder {
   private final ConcurrentMap<String, MultiMap<String, PsiMethod>> myOriginalMethodsByNameAndType;
   private final NotNullLazyValue<MultiMap<String, PsiMethod>> myOriginalMethodByType;
   private final boolean myStatic;
-  private final GlobalSearchScope myScope;
-  private final PsiManager myPsiManager;
 
-  private GdkMethodHolder(final PsiClass categoryClass, final boolean isStatic, final GlobalSearchScope scope) {
+  private GdkMethodHolder(final PsiClass categoryClass, final boolean isStatic) {
     myClassName = categoryClass.getName();
     myStatic = isStatic;
-    myScope = scope;
     final MultiMap<String, PsiMethod> byName = new MultiMap<>();
-    myPsiManager = categoryClass.getManager();
     for (PsiMethod m : categoryClass.getMethods()) {
       final PsiParameter[] params = m.getParameterList().getParameters();
       if (params.length == 0) continue;
@@ -113,11 +108,11 @@ public class GdkMethodHolder {
     return true;
   }
 
-  public static GdkMethodHolder getHolderForClass(final PsiClass categoryClass, final boolean isStatic, final GlobalSearchScope scope) {
+  public static GdkMethodHolder getHolderForClass(final PsiClass categoryClass, final boolean isStatic) {
     final Project project = categoryClass.getProject();
     Key<CachedValue<GdkMethodHolder>> key = isStatic ? CACHED_STATIC : CACHED_NON_STATIC;
     return CachedValuesManager.getManager(project).getCachedValue(categoryClass, key, () -> {
-      GdkMethodHolder result = new GdkMethodHolder(categoryClass, isStatic, scope);
+      GdkMethodHolder result = new GdkMethodHolder(categoryClass, isStatic);
 
       final ProjectRootManager rootManager = ProjectRootManager.getInstance(project);
       final VirtualFile vfile = categoryClass.getContainingFile().getVirtualFile();
diff --git a/plugins/groovy/groovy-psi/src/org/jetbrains/plugins/groovy/lang/resolve/GdkMethodDslProvider.java b/plugins/groovy/groovy-psi/src/org/jetbrains/plugins/groovy/lang/resolve/GdkMethodDslProvider.java
index 49baa7757a4d..dda4f1930c42 100644
--- a/plugins/groovy/groovy-psi/src/org/jetbrains/plugins/groovy/lang/resolve/GdkMethodDslProvider.java
+++ b/plugins/groovy/groovy-psi/src/org/jetbrains/plugins/groovy/lang/resolve/GdkMethodDslProvider.java
@@ -55,7 +55,7 @@ public class GdkMethodDslProvider implements GdslMembersProvider {
       @NotNull
       @Override
       protected GdkMethodHolder compute() {
-        return GdkMethodHolder.getHolderForClass(categoryClass, isStatic, scope);
+        return GdkMethodHolder.getHolderForClass(categoryClass, isStatic);
       }
     };