From e6e6fda251de0773742e0dfe858cef5c760bab61 Mon Sep 17 00:00:00 2001 From: Valentin Kipyatkov Date: Fri, 28 Nov 2014 20:24:28 +0300 Subject: [PATCH] More correct implementation PsiShortNamesCache (although I do not know if it matters at all) --- .../org/jetbrains/jet/plugin/caches/JetShortNamesCache.kt | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/idea/idea-analysis/src/org/jetbrains/jet/plugin/caches/JetShortNamesCache.kt b/idea/idea-analysis/src/org/jetbrains/jet/plugin/caches/JetShortNamesCache.kt index 1c60af0d779..90bc77139af 100644 --- a/idea/idea-analysis/src/org/jetbrains/jet/plugin/caches/JetShortNamesCache.kt +++ b/idea/idea-analysis/src/org/jetbrains/jet/plugin/caches/JetShortNamesCache.kt @@ -22,6 +22,7 @@ import com.intellij.psi.PsiField import com.intellij.psi.PsiClass import org.jetbrains.jet.plugin.stubindex.PackageIndexUtil import org.jetbrains.jet.utils.addToStdlib.firstIsInstance +import org.jetbrains.jet.plugin.stubindex.JetFunctionShortNameIndex // used in Upsource, what's why in idea-analysis module public class JetShortNamesCache(private val project: com.intellij.openapi.project.Project) : com.intellij.psi.search.PsiShortNamesCache() { @@ -100,10 +101,10 @@ public class JetShortNamesCache(private val project: com.intellij.openapi.projec = com.intellij.util.containers.ContainerUtil.process(getMethodsByName(name, scope), processor) override fun getAllMethodNames(): Array - = array() + = JetFunctionShortNameIndex.getInstance().getAllKeys(project).copyToArray() override fun getAllMethodNames(set: HashSet) { - set.addAll(org.jetbrains.jet.plugin.stubindex.JetTopLevelNonExtensionFunctionShortNameIndex.getInstance().getAllKeys(project)) + set.addAll(JetFunctionShortNameIndex.getInstance().getAllKeys(project)) } override fun getFieldsByName(org.jetbrains.annotations.NonNls name: String, scope: com.intellij.psi.search.GlobalSearchScope): Array