From 1cb56ee946ff787025b2c7a52db79cea177c04b9 Mon Sep 17 00:00:00 2001
From: Nikolay Krasko <nikolay.krasko@jetbrains.com>
Date: Wed, 29 Jan 2020 17:37:34 +0300
Subject: [PATCH] 201: Processor<in PsiMethod> used in PsiShortNamesCache

---
 .../org/jetbrains/kotlin/idea/caches/KotlinShortNamesCache.kt | 2 +-
 .../src/org/jetbrains/kotlin/idea/caches/compat.kt            | 2 ++
 .../src/org/jetbrains/kotlin/idea/caches/compat.kt.201        | 2 ++
 .../JavaClassesInScriptDependenciesShortNameCache.kt          | 4 ++--
 4 files changed, 7 insertions(+), 3 deletions(-)

diff --git a/idea/idea-analysis/src/org/jetbrains/kotlin/idea/caches/KotlinShortNamesCache.kt b/idea/idea-analysis/src/org/jetbrains/kotlin/idea/caches/KotlinShortNamesCache.kt
index 652d5b288a5..63fca1e3dc0 100644
--- a/idea/idea-analysis/src/org/jetbrains/kotlin/idea/caches/KotlinShortNamesCache.kt
+++ b/idea/idea-analysis/src/org/jetbrains/kotlin/idea/caches/KotlinShortNamesCache.kt
@@ -245,7 +245,7 @@ class KotlinShortNamesCache(private val project: Project) : PsiShortNamesCache()
         }
     }
 
-    override fun processMethodsWithName(name: String, scope: GlobalSearchScope, processor: Processor<PsiMethod>): Boolean {
+    override fun processMethodsWithName(name: String, scope: GlobalSearchScope, processor: PsiMethodProcessor): Boolean {
         if (disableSearch.get()) return true
         return ContainerUtil.process(getMethodsByName(name, scope), processor)
     }
diff --git a/idea/idea-analysis/src/org/jetbrains/kotlin/idea/caches/compat.kt b/idea/idea-analysis/src/org/jetbrains/kotlin/idea/caches/compat.kt
index 85417931218..081be027285 100644
--- a/idea/idea-analysis/src/org/jetbrains/kotlin/idea/caches/compat.kt
+++ b/idea/idea-analysis/src/org/jetbrains/kotlin/idea/caches/compat.kt
@@ -5,8 +5,10 @@
 
 package org.jetbrains.kotlin.idea.caches
 
+import com.intellij.psi.PsiMethod
 import com.intellij.util.Processor
 
 // BUNCH 193
 typealias StringProcessor = Processor<String>
+typealias PsiMethodProcessor = Processor<PsiMethod>
 
diff --git a/idea/idea-analysis/src/org/jetbrains/kotlin/idea/caches/compat.kt.201 b/idea/idea-analysis/src/org/jetbrains/kotlin/idea/caches/compat.kt.201
index 5d0fb981b4c..43b67859cdb 100644
--- a/idea/idea-analysis/src/org/jetbrains/kotlin/idea/caches/compat.kt.201
+++ b/idea/idea-analysis/src/org/jetbrains/kotlin/idea/caches/compat.kt.201
@@ -5,8 +5,10 @@
 
 package org.jetbrains.kotlin.idea.caches
 
+import com.intellij.psi.PsiMethod
 import com.intellij.util.Processor
 
 // BUNCH 193
 typealias StringProcessor = Processor<in String>
+typealias PsiMethodProcessor = Processor<in PsiMethod>
 
diff --git a/idea/idea-core/src/org/jetbrains/kotlin/idea/core/script/dependencies/JavaClassesInScriptDependenciesShortNameCache.kt b/idea/idea-core/src/org/jetbrains/kotlin/idea/core/script/dependencies/JavaClassesInScriptDependenciesShortNameCache.kt
index e5877a61ff4..fac55d36536 100644
--- a/idea/idea-core/src/org/jetbrains/kotlin/idea/core/script/dependencies/JavaClassesInScriptDependenciesShortNameCache.kt
+++ b/idea/idea-core/src/org/jetbrains/kotlin/idea/core/script/dependencies/JavaClassesInScriptDependenciesShortNameCache.kt
@@ -24,7 +24,7 @@ import com.intellij.psi.impl.java.stubs.index.JavaShortClassNameIndex
 import com.intellij.psi.search.GlobalSearchScope
 import com.intellij.psi.search.PsiShortNamesCache
 import com.intellij.psi.stubs.StubIndex
-import com.intellij.util.Processor
+import org.jetbrains.kotlin.idea.caches.PsiMethodProcessor
 import org.jetbrains.kotlin.idea.core.script.ScriptConfigurationManager
 
 // Allow searching java classes in jars in script dependencies, this is needed for stuff like completion and autoimport
@@ -47,7 +47,7 @@ class JavaClassesInScriptDependenciesShortNameCache(private val project: Project
 
     override fun getMethodsByNameIfNotMoreThan(name: String, scope: GlobalSearchScope, maxCount: Int): Array<PsiMethod> = PsiMethod.EMPTY_ARRAY
 
-    override fun processMethodsWithName(name: String, scope: GlobalSearchScope, processor: Processor<PsiMethod>) = true
+    override fun processMethodsWithName(name: String, scope: GlobalSearchScope, processor: PsiMethodProcessor) = true
 
     override fun getAllFieldNames() = emptyArray<String>()