remove some leftovers of old package facades in IDE code

This commit is contained in:
Dmitry Jemerov
2015-11-11 14:38:21 +01:00
parent 5b59fc74bc
commit 45ef9b02c4
4 changed files with 7 additions and 52 deletions
@@ -30,7 +30,6 @@ import org.jetbrains.kotlin.asJava.defaultImplsChild
import org.jetbrains.kotlin.fileClasses.javaFileFacadeFqName
import org.jetbrains.kotlin.idea.stubindex.KotlinClassShortNameIndex
import org.jetbrains.kotlin.idea.stubindex.KotlinFileFacadeShortNameIndex
import org.jetbrains.kotlin.idea.stubindex.PackageIndexUtil
import org.jetbrains.kotlin.load.java.JvmAbi
import org.jetbrains.kotlin.name.FqName
import java.util.*
@@ -43,8 +42,6 @@ public class KotlinShortNamesCache(private val project: Project) : PsiShortNames
val classNames = KotlinClassShortNameIndex.getInstance().getAllKeys(project)
// package classes can not be indexed, since they have no explicit declarations
val packageClassShortNames = PackageIndexUtil.getAllPossiblePackageClasses(project).keySet()
classNames.addAll(packageClassShortNames)
classNames.addAll(KotlinFileFacadeShortNameIndex.INSTANCE.getAllKeys(project))
return classNames.toTypedArray()
@@ -56,9 +53,6 @@ public class KotlinShortNamesCache(private val project: Project) : PsiShortNames
override fun getClassesByName(name: String, scope: GlobalSearchScope): Array<PsiClass> {
val allFqNames = HashSet<FqName?>()
val packageClassNames = PackageIndexUtil.getAllPossiblePackageClasses(project).get(name)
allFqNames.addAll(packageClassNames)
KotlinClassShortNameIndex.getInstance().get(name, project, scope)
.mapTo(allFqNames) { it.fqName }
@@ -19,14 +19,9 @@ package org.jetbrains.kotlin.idea.stubindex
import com.intellij.openapi.project.Project
import com.intellij.psi.search.GlobalSearchScope
import com.intellij.psi.stubs.StubIndex
import org.jetbrains.kotlin.psi.KtFile
import org.jetbrains.kotlin.name.FqName
import com.intellij.util.containers.MultiMap
import org.jetbrains.kotlin.load.kotlin.PackageClassUtils
import com.intellij.psi.util.CachedValuesManager
import com.intellij.psi.util.CachedValueProvider.Result
import com.intellij.psi.util.PsiModificationTracker
import org.jetbrains.kotlin.name.Name
import org.jetbrains.kotlin.psi.KtFile
public object PackageIndexUtil {
@JvmStatic
@@ -73,22 +68,4 @@ public object PackageIndexUtil {
}
return result
}
@JvmStatic
public fun getAllPossiblePackageClasses(project: Project): MultiMap<String, FqName> {
return CachedValuesManager.getManager(project).getCachedValue(project) {
Result(computeAllPossiblePackageClasses(project), PsiModificationTracker.OUT_OF_CODE_BLOCK_MODIFICATION_COUNT)
}!!
}
private fun computeAllPossiblePackageClasses(project: Project): MultiMap<String, FqName> {
val packageFqNames = KotlinExactPackagesIndex.getInstance().getAllKeys(project)
val result = MultiMap<String, FqName>()
for (packageFqName in packageFqNames) {
val packageClassFqName = PackageClassUtils.getPackageClassFqName(FqName(packageFqName))
result.putValue(packageClassFqName.shortName().asString(), packageClassFqName)
}
return result
}
}
@@ -32,7 +32,6 @@ import com.intellij.testFramework.PlatformTestCase
import com.intellij.testFramework.PsiTestUtil
import junit.framework.TestCase
import org.jetbrains.kotlin.idea.test.PluginTestCaseBase
import org.jetbrains.kotlin.load.kotlin.PackageClassUtils.getPackageClassFqName
import org.jetbrains.kotlin.load.kotlin.PackagePartClassUtils
import org.jetbrains.kotlin.name.FqName
import org.jetbrains.kotlin.test.MockLibraryUtil