azalea/kotlin-fork
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

201: Processor<String> -> Processor<in String> in PsiShortNamesCache

Browse Source
This commit is contained in:
Nikolay Krasko
2020-01-28 21:55:05 +03:00
parent 2a71fe97cf
commit 1ecd1a293d
3 changed files with 30 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files
idea/idea-analysis/src/org/jetbrains/kotlin/idea/caches/KotlinShortNamesCache.kt
+6 -6
View File
@@ -48,13 +48,13 @@ class KotlinShortNamesCache(private val project: Project) : PsiShortNamesCache()
//region Classes //region Classes
override fun processAllClassNames(processor: Processor<String>): Boolean { override fun processAllClassNames(processor: StringProcessor): Boolean {
if (disableSearch.get()) return true if (disableSearch.get()) return true
return KotlinClassShortNameIndex.getInstance().processAllKeys(project, processor) && return KotlinClassShortNameIndex.getInstance().processAllKeys(project, processor) &&
KotlinFileFacadeShortNameIndex.INSTANCE.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 if (disableSearch.get()) return true
return processAllClassNames(processor) return processAllClassNames(processor)
} }
@@ -149,7 +149,7 @@ class KotlinShortNamesCache(private val project: Project) : PsiShortNamesCache()
//region Methods //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 if (disableSearch.get()) return true
return processAllMethodNames(processor) 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 (disableSearch.get()) return true
if (!KotlinFunctionShortNameIndex.getInstance().processAllKeys(project, processor)) { if (!KotlinFunctionShortNameIndex.getInstance().processAllKeys(project, processor)) {
return false return false
@@ -254,7 +254,7 @@ class KotlinShortNamesCache(private val project: Project) : PsiShortNamesCache()
//region Fields //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 if (disableSearch.get()) return true
return processAllFieldNames(processor) 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 if (disableSearch.get()) return true
return KotlinPropertyShortNameIndex.getInstance().processAllKeys(project, processor) return KotlinPropertyShortNameIndex.getInstance().processAllKeys(project, processor)
} }
idea/idea-analysis/src/org/jetbrains/kotlin/idea/caches/compat.kt
+12
View File
@@ -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>
idea/idea-analysis/src/org/jetbrains/kotlin/idea/caches/compat.kt.201
+12
View File
@@ -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>