From 3d0b737916735981b10437b558cd7f24cdb0d648 Mon Sep 17 00:00:00 2001 From: "Pavel V. Talanov" Date: Wed, 9 Sep 2015 15:54:49 +0300 Subject: [PATCH] Minor: rename index --- .../jetbrains/kotlin/idea/caches/JetShortNamesCache.kt | 6 +++--- .../idea/caches/resolve/IDELightClassGenerationSupport.kt | 2 +- .../kotlin/idea/stubindex/IdeStubIndexService.java | 4 ++-- ...ileFacadeClassIndex.kt => JetFileFacadeFqNameIndex.kt} | 8 ++++---- .../kotlin/idea/stubindex/StaticFacadeIndexUtil.kt | 2 +- idea/src/META-INF/plugin.xml | 2 +- 6 files changed, 12 insertions(+), 12 deletions(-) rename idea/idea-analysis/src/org/jetbrains/kotlin/idea/stubindex/{JetFileFacadeClassIndex.kt => JetFileFacadeFqNameIndex.kt} (86%) diff --git a/idea/idea-analysis/src/org/jetbrains/kotlin/idea/caches/JetShortNamesCache.kt b/idea/idea-analysis/src/org/jetbrains/kotlin/idea/caches/JetShortNamesCache.kt index 0463594d647..3a6f4021e3e 100644 --- a/idea/idea-analysis/src/org/jetbrains/kotlin/idea/caches/JetShortNamesCache.kt +++ b/idea/idea-analysis/src/org/jetbrains/kotlin/idea/caches/JetShortNamesCache.kt @@ -27,7 +27,7 @@ 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.JetFileFacadeClassIndex +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.name.FqName @@ -43,7 +43,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(JetFileFacadeClassIndex.getAllFacadeShortNames(project)) + classNames.addAll(JetFileFacadeFqNameIndex.getAllFacadeShortNames(project)) return classNames.toTypedArray() } @@ -57,7 +57,7 @@ public class JetShortNamesCache(private val project: Project) : PsiShortNamesCac val packageClasses = PackageIndexUtil.getAllPossiblePackageClasses(project) // package classes can not be indexed, since they have no explicit declarations - val fqNames = packageClasses.get(name) + JetFileFacadeClassIndex.getInstance().getAllKeys(project).map { FqName(it) }.filter { it.shortName().asString() == name } + val fqNames = packageClasses.get(name) + JetFileFacadeFqNameIndex.getInstance().getAllKeys(project).map { FqName(it) }.filter { it.shortName().asString() == name } for (fqName in fqNames) { val psiClass = JavaElementFinder.getInstance(project).findClass(fqName.asString(), scope) if (psiClass != null) { diff --git a/idea/idea-analysis/src/org/jetbrains/kotlin/idea/caches/resolve/IDELightClassGenerationSupport.kt b/idea/idea-analysis/src/org/jetbrains/kotlin/idea/caches/resolve/IDELightClassGenerationSupport.kt index fea4252ddff..3e254596037 100644 --- a/idea/idea-analysis/src/org/jetbrains/kotlin/idea/caches/resolve/IDELightClassGenerationSupport.kt +++ b/idea/idea-analysis/src/org/jetbrains/kotlin/idea/caches/resolve/IDELightClassGenerationSupport.kt @@ -215,7 +215,7 @@ public class IDELightClassGenerationSupport(private val project: Project) : Ligh } override fun findFilesForFacade(facadeFqName: FqName, scope: GlobalSearchScope): Collection { - return JetFileFacadeClassIndex.INSTANCE.get(facadeFqName.asString(), project, scope) + return JetFileFacadeFqNameIndex.INSTANCE.get(facadeFqName.asString(), project, scope) } override fun resolveClassToDescriptor(classOrObject: JetClassOrObject): ClassDescriptor? { diff --git a/idea/idea-analysis/src/org/jetbrains/kotlin/idea/stubindex/IdeStubIndexService.java b/idea/idea-analysis/src/org/jetbrains/kotlin/idea/stubindex/IdeStubIndexService.java index 25b435a0ffb..a9b36e4de9c 100644 --- a/idea/idea-analysis/src/org/jetbrains/kotlin/idea/stubindex/IdeStubIndexService.java +++ b/idea/idea-analysis/src/org/jetbrains/kotlin/idea/stubindex/IdeStubIndexService.java @@ -45,7 +45,7 @@ public class IdeStubIndexService extends StubIndexService { FqName facadeFqName = ((KotlinFileStubForIde) stub).getFacadeFqName(); if (facadeFqName != null) { - sink.occurrence(JetFileFacadeClassIndex.INSTANCE.getKey(), facadeFqName.asString()); + sink.occurrence(JetFileFacadeFqNameIndex.INSTANCE.getKey(), facadeFqName.asString()); sink.occurrence(JetFileFacadeClassByPackageIndex.INSTANCE.getKey(), packageFqName.asString()); } @@ -57,7 +57,7 @@ public class IdeStubIndexService extends StubIndexService { JetFile jetFile = stub.getPsi(); if (jetFile != null) { JvmFileClassInfo fileClassInfo = JvmFileClassUtil.getFileClassInfoNoResolve(jetFile); - sink.occurrence(JetFileFacadeClassIndex.INSTANCE.getKey(), fileClassInfo.getFacadeClassFqName().asString()); + sink.occurrence(JetFileFacadeFqNameIndex.INSTANCE.getKey(), fileClassInfo.getFacadeClassFqName().asString()); sink.occurrence(JetFilePartClassIndex.INSTANCE.getKey(), fileClassInfo.getFileClassFqName().asString()); } } diff --git a/idea/idea-analysis/src/org/jetbrains/kotlin/idea/stubindex/JetFileFacadeClassIndex.kt b/idea/idea-analysis/src/org/jetbrains/kotlin/idea/stubindex/JetFileFacadeFqNameIndex.kt similarity index 86% rename from idea/idea-analysis/src/org/jetbrains/kotlin/idea/stubindex/JetFileFacadeClassIndex.kt rename to idea/idea-analysis/src/org/jetbrains/kotlin/idea/stubindex/JetFileFacadeFqNameIndex.kt index 271ec529490..4a75b246b43 100644 --- a/idea/idea-analysis/src/org/jetbrains/kotlin/idea/stubindex/JetFileFacadeClassIndex.kt +++ b/idea/idea-analysis/src/org/jetbrains/kotlin/idea/stubindex/JetFileFacadeFqNameIndex.kt @@ -26,16 +26,16 @@ import com.intellij.psi.util.PsiModificationTracker import org.jetbrains.kotlin.name.FqName import org.jetbrains.kotlin.psi.JetFile -public class JetFileFacadeClassIndex private constructor() : StringStubIndexExtension() { +public class JetFileFacadeFqNameIndex private constructor() : StringStubIndexExtension() { override fun getKey(): StubIndexKey = KEY override fun get(key: String, project: Project, scope: GlobalSearchScope) = super.get(key, project, JetSourceFilterScope.kotlinSourcesAndLibraries(scope, project)) companion object { - private val KEY = KotlinIndexUtil.createIndexKey(JetFileFacadeClassIndex::class.java) - public val INSTANCE: JetFileFacadeClassIndex = JetFileFacadeClassIndex() - public @jvmStatic fun getInstance(): JetFileFacadeClassIndex = INSTANCE + 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 { return CachedValuesManager.getManager(project).getCachedValue(project) { diff --git a/idea/idea-analysis/src/org/jetbrains/kotlin/idea/stubindex/StaticFacadeIndexUtil.kt b/idea/idea-analysis/src/org/jetbrains/kotlin/idea/stubindex/StaticFacadeIndexUtil.kt index 80e918f2273..0f320b6c9a0 100644 --- a/idea/idea-analysis/src/org/jetbrains/kotlin/idea/stubindex/StaticFacadeIndexUtil.kt +++ b/idea/idea-analysis/src/org/jetbrains/kotlin/idea/stubindex/StaticFacadeIndexUtil.kt @@ -31,5 +31,5 @@ public object StaticFacadeIndexUtil { project: Project ) : Collection = PackagePartClassUtils.getFilesWithCallables( - JetFileFacadeClassIndex.INSTANCE.get(partFqName.asString(), project, searchScope)) + JetFileFacadeFqNameIndex.INSTANCE.get(partFqName.asString(), project, searchScope)) } \ No newline at end of file diff --git a/idea/src/META-INF/plugin.xml b/idea/src/META-INF/plugin.xml index 31c66b3e6bf..e4f8854cc3e 100644 --- a/idea/src/META-INF/plugin.xml +++ b/idea/src/META-INF/plugin.xml @@ -500,7 +500,7 @@ - +