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

Use new index in JetShortNamesCache

Browse Source
This commit is contained in:
Pavel V. Talanov
2015-09-09 16:11:58 +03:00
parent 0257ea6fd8
commit eaeabb28b8
2 changed files with 18 additions and 36 deletions
Download Patch File Download Diff File Expand all files Collapse all files
idea/idea-analysis/src/org/jetbrains/kotlin/idea/caches/JetShortNamesCache.kt
+18 -23
View File
@@ -26,10 +26,7 @@ import com.intellij.util.Processor
import com.intellij.util.containers.ContainerUtil
import com.intellij.util.containers.HashSet
import org.jetbrains.kotlin.asJava.JavaElementFinder
import org.jetbrains.kotlin.idea.stubindex.JetClassShortNameIndex
import org.jetbrains.kotlin.idea.stubindex.JetFileFacadeFqNameIndex
import org.jetbrains.kotlin.idea.stubindex.JetFunctionShortNameIndex
import org.jetbrains.kotlin.idea.stubindex.PackageIndexUtil
import org.jetbrains.kotlin.idea.stubindex.*
import org.jetbrains.kotlin.name.FqName
import java.util.*
@@ -43,7 +40,7 @@ public class JetShortNamesCache(private val project: Project) : PsiShortNamesCac
// package classes can not be indexed, since they have no explicit declarations
val packageClassShortNames = PackageIndexUtil.getAllPossiblePackageClasses(project).keySet()
classNames.addAll(packageClassShortNames)
classNames.addAll(JetFileFacadeFqNameIndex.getAllFacadeShortNames(project))
classNames.addAll(JetFileFacadeShortNameIndex.INSTANCE.getAllKeys(project))
return classNames.toTypedArray()
}
@@ -52,32 +49,30 @@ public class JetShortNamesCache(private val project: Project) : PsiShortNamesCac
* Return class names form kotlin sources in given scope which should be visible as Java classes.
*/
override fun getClassesByName(name: String, scope: GlobalSearchScope): Array<PsiClass> {
val allFqNames = HashSet<FqName?>()
val packageClassNames = PackageIndexUtil.getAllPossiblePackageClasses(project).get(name)
allFqNames.addAll(packageClassNames)
JetClassShortNameIndex.getInstance().get(name, project, scope)
.mapTo(allFqNames) { it.fqName }
JetFileFacadeShortNameIndex.INSTANCE.get(name, project, scope)
.mapTo(allFqNames) { it.javaFileFacadeFqName }
val result = ArrayList<PsiClass>()
for (fqName in allFqNames) {
if (fqName == null) continue
val packageClasses = PackageIndexUtil.getAllPossiblePackageClasses(project)
// package classes can not be indexed, since they have no explicit declarations
val fqNames = packageClasses.get(name) + JetFileFacadeFqNameIndex.getInstance().getAllKeys(project).map { FqName(it) }.filter { it.shortName().asString() == name }
for (fqName in fqNames) {
assert(fqName.shortName().asString() == name) {
"A declaration obtained from index has non-matching name:\nin index: $name\ndeclared: ${fqName.shortName()}($fqName)"
}
val psiClass = JavaElementFinder.getInstance(project).findClass(fqName.asString(), scope)
if (psiClass != null) {
result.add(psiClass)
}
}
// Quick check for classes from getAllClassNames()
val classOrObjects = JetClassShortNameIndex.getInstance().get(name, project, scope)
for (classOrObject in classOrObjects) {
val fqName = classOrObject.getFqName()
if (fqName != null) {
assert(fqName.shortName().asString() == name) { "A declaration obtained from index has non-matching name:\n" + "in index: " + name + "\n" + "declared: " + fqName.shortName() + "(" + fqName + ")" }
val psiClass = JavaElementFinder.getInstance(project).findClass(fqName.asString(), scope)
if (psiClass != null) {
result.add(psiClass)
}
}
}
return result.toTypedArray()
}
idea/idea-analysis/src/org/jetbrains/kotlin/idea/stubindex/JetFileFacadeFqNameIndex.kt
-13
View File
@@ -20,10 +20,6 @@ import com.intellij.openapi.project.Project
import com.intellij.psi.search.GlobalSearchScope
import com.intellij.psi.stubs.StringStubIndexExtension
import com.intellij.psi.stubs.StubIndexKey
import com.intellij.psi.util.CachedValueProvider
import com.intellij.psi.util.CachedValuesManager
import com.intellij.psi.util.PsiModificationTracker
import org.jetbrains.kotlin.name.FqName
import org.jetbrains.kotlin.psi.JetFile
public class JetFileFacadeFqNameIndex private constructor() : StringStubIndexExtension<JetFile>() {
@@ -36,14 +32,5 @@ public class JetFileFacadeFqNameIndex private constructor() : StringStubIndexExt
private val KEY = KotlinIndexUtil.createIndexKey(JetFileFacadeFqNameIndex::class.java)
public val INSTANCE: JetFileFacadeFqNameIndex = JetFileFacadeFqNameIndex()
public @jvmStatic fun getInstance(): JetFileFacadeFqNameIndex = INSTANCE
public fun getAllFacadeShortNames(project: Project): Collection<String> {
return CachedValuesManager.getManager(project).getCachedValue(project) {
val shortNames = getInstance().getAllKeys(project).map {
FqName(it).shortName().asString()
}
CachedValueProvider.Result(shortNames, PsiModificationTracker.OUT_OF_CODE_BLOCK_MODIFICATION_COUNT)
}
}
}
}