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

Add DataBindingComponentShortNamesCache and DataBindingShortNamesCache to ignored caches for Java callables sources. Extract filteredShortNamesCaches property

Browse Source
This commit is contained in:
Yan Zhulanow
2016-12-26 16:32:42 +03:00
committed by Yan Zhulanow
parent 6bff4a4ed4
commit 400759826f
1 changed files with 12 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files
idea/idea-core/src/org/jetbrains/kotlin/idea/core/KotlinIndicesHelper.kt
+12 -5
View File
@@ -244,7 +244,8 @@ class KotlinIndicesHelper(
* in a module inside "myFieldCache" (and in Kotlin light classes too, of course). * in a module inside "myFieldCache" (and in Kotlin light classes too, of course).
* It triggers the light classes compilation in the UI thread inside our static field import quick-fix. * It triggers the light classes compilation in the UI thread inside our static field import quick-fix.
*/ */
private fun getJavaCallables(name: String, shortNamesCache: PsiShortNamesCache): Sequence<Any> { private val filteredShortNamesCaches: List<PsiShortNamesCache>? by lazy {
val shortNamesCache = PsiShortNamesCache.getInstance(project)
if (shortNamesCache is CompositeShortNamesCache) { if (shortNamesCache is CompositeShortNamesCache) {
try { try {
fun getMyCachesField(clazz: Class<PsiShortNamesCache>): Field { fun getMyCachesField(clazz: Class<PsiShortNamesCache>): Field {
@@ -255,7 +256,7 @@ class KotlinIndicesHelper(
// In case the class is proguarded // In case the class is proguarded
return clazz.declaredFields.first { return clazz.declaredFields.first {
Modifier.isPrivate(it.modifiers) && Modifier.isFinal(it.modifiers) && !Modifier.isStatic(it.modifiers) Modifier.isPrivate(it.modifiers) && Modifier.isFinal(it.modifiers) && !Modifier.isStatic(it.modifiers)
&& it.type.isArray && it.type.componentType == PsiShortNamesCache::class.java && it.type.isArray && it.type.componentType == PsiShortNamesCache::class.java
} }
} }
} }
@@ -265,10 +266,12 @@ class KotlinIndicesHelper(
try { try {
myCachesField.isAccessible = true myCachesField.isAccessible = true
@Suppress("UNCHECKED_CAST") @Suppress("UNCHECKED_CAST")
val caches = (myCachesField.get(shortNamesCache) as Array<PsiShortNamesCache>).filter { return@lazy (myCachesField.get(shortNamesCache) as Array<PsiShortNamesCache>).filter {
it !is KotlinShortNamesCache && it.javaClass.name != "com.android.tools.idea.databinding.BrShortNamesCache" it !is KotlinShortNamesCache
&& it.javaClass.name != "com.android.tools.idea.databinding.BrShortNamesCache"
&& it.javaClass.name != "com.android.tools.idea.databinding.DataBindingComponentShortNamesCache"
&& it.javaClass.name != "com.android.tools.idea.databinding.DataBindingShortNamesCache"
} }
return getCallablesByName(name, scopeWithoutKotlin, caches)
} }
finally { finally {
myCachesField.isAccessible = previousIsAccessible myCachesField.isAccessible = previousIsAccessible
@@ -279,6 +282,10 @@ class KotlinIndicesHelper(
} }
} }
return@lazy null
}
private fun getJavaCallables(name: String, shortNamesCache: PsiShortNamesCache): Sequence<Any> {
filteredShortNamesCaches?.let { caches -> return getCallablesByName(name, scopeWithoutKotlin, caches) }
return shortNamesCache.getFieldsByName(name, scopeWithoutKotlin).asSequence() + return shortNamesCache.getFieldsByName(name, scopeWithoutKotlin).asSequence() +
shortNamesCache.getMethodsByName(name, scopeWithoutKotlin).asSequence() shortNamesCache.getMethodsByName(name, scopeWithoutKotlin).asSequence()
} }