From 1ecd1a293d3a025d3a6246f5aa972284b24c6b01 Mon Sep 17 00:00:00 2001
From: Nikolay Krasko <nikolay.krasko@jetbrains.com>
Date: Tue, 28 Jan 2020 21:55:05 +0300
Subject: [PATCH] 201: Processor<String> -> Processor<in String> in
 PsiShortNamesCache

---
 .../kotlin/idea/caches/KotlinShortNamesCache.kt      | 12 ++++++------
 .../src/org/jetbrains/kotlin/idea/caches/compat.kt   | 12 ++++++++++++
 .../org/jetbrains/kotlin/idea/caches/compat.kt.201   | 12 ++++++++++++
 3 files changed, 30 insertions(+), 6 deletions(-)
 create mode 100644 idea/idea-analysis/src/org/jetbrains/kotlin/idea/caches/compat.kt
 create mode 100644 idea/idea-analysis/src/org/jetbrains/kotlin/idea/caches/compat.kt.201

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 2238c07b313..2e78c11aa7d 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
@@ -48,13 +48,13 @@ class KotlinShortNamesCache(private val project: Project) : PsiShortNamesCache()
 
     //region Classes
 
-    override fun processAllClassNames(processor: Processor<String>): Boolean {
+    override fun processAllClassNames(processor: StringProcessor): Boolean {
         if (disableSearch.get()) return true
         return KotlinClassShortNameIndex.getInstance().processAllKeys(project, processor) &&
                 KotlinFileFacadeShortNameIndex.INSTANCE.processAllKeys(project, processor)
     }
 
-    override fun processAllClassNames(processor: Processor<String>, scope: GlobalSearchScope, filter: IdFilter?): Boolean {
+    override fun processAllClassNames(processor: StringProcessor, scope: GlobalSearchScope, filter: IdFilter?): Boolean {
         if (disableSearch.get()) return true
         return processAllClassNames(processor)
     }
@@ -149,7 +149,7 @@ class KotlinShortNamesCache(private val project: Project) : PsiShortNamesCache()
 
     //region Methods
 
-    override fun processAllMethodNames(processor: Processor<String>, scope: GlobalSearchScope, filter: IdFilter?): Boolean {
+    override fun processAllMethodNames(processor: StringProcessor, scope: GlobalSearchScope, filter: IdFilter?): Boolean {
         if (disableSearch.get()) return true
         return processAllMethodNames(processor)
     }
@@ -161,7 +161,7 @@ class KotlinShortNamesCache(private val project: Project) : PsiShortNamesCache()
         }
     }
 
-    private fun processAllMethodNames(processor: Processor<String>): Boolean {
+    private fun processAllMethodNames(processor: StringProcessor): Boolean {
         if (disableSearch.get()) return true
         if (!KotlinFunctionShortNameIndex.getInstance().processAllKeys(project, processor)) {
             return false
@@ -254,7 +254,7 @@ class KotlinShortNamesCache(private val project: Project) : PsiShortNamesCache()
 
     //region Fields
 
-    override fun processAllFieldNames(processor: Processor<String>, scope: GlobalSearchScope, filter: IdFilter?): Boolean {
+    override fun processAllFieldNames(processor: StringProcessor, scope: GlobalSearchScope, filter: IdFilter?): Boolean {
         if (disableSearch.get()) return true
         return processAllFieldNames(processor)
     }
@@ -266,7 +266,7 @@ class KotlinShortNamesCache(private val project: Project) : PsiShortNamesCache()
         }
     }
 
-    private fun processAllFieldNames(processor: Processor<String>): Boolean {
+    private fun processAllFieldNames(processor: StringProcessor): Boolean {
         if (disableSearch.get()) return true
         return KotlinPropertyShortNameIndex.getInstance().processAllKeys(project, 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
new file mode 100644
index 00000000000..85417931218
--- /dev/null
+++ b/idea/idea-analysis/src/org/jetbrains/kotlin/idea/caches/compat.kt
@@ -0,0 +1,12 @@
+/*
+ * Copyright 2010-2020 JetBrains s.r.o. and Kotlin Programming Language contributors.
+ * Use of this source code is governed by the Apache 2.0 license that can be found in the license/LICENSE.txt file.
+ */
+
+package org.jetbrains.kotlin.idea.caches
+
+import com.intellij.util.Processor
+
+// BUNCH 193
+typealias StringProcessor = Processor<String>
+
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
new file mode 100644
index 00000000000..5d0fb981b4c
--- /dev/null
+++ b/idea/idea-analysis/src/org/jetbrains/kotlin/idea/caches/compat.kt.201
@@ -0,0 +1,12 @@
+/*
+ * Copyright 2010-2020 JetBrains s.r.o. and Kotlin Programming Language contributors.
+ * Use of this source code is governed by the Apache 2.0 license that can be found in the license/LICENSE.txt file.
+ */
+
+package org.jetbrains.kotlin.idea.caches
+
+import com.intellij.util.Processor
+
+// BUNCH 193
+typealias StringProcessor = Processor<in String>
+