From d0a4e542af509f4684358cdb99f21253f24ef5ea Mon Sep 17 00:00:00 2001 From: Dmitry Jemerov Date: Mon, 11 Jan 2016 16:29:41 +0100 Subject: [PATCH] use StubIndex.getElements() with required class specified to diagnose CCE problems when using stub index --- .../kotlin/idea/stubindex/KotlinAnnotationsIndex.java | 3 ++- .../kotlin/idea/stubindex/KotlinClassShortNameIndex.java | 4 +++- .../kotlin/idea/stubindex/KotlinExactPackagesIndex.java | 3 ++- .../idea/stubindex/KotlinFileFacadeClassByPackageIndex.kt | 3 ++- .../kotlin/idea/stubindex/KotlinFileFacadeFqNameIndex.kt | 3 ++- .../kotlin/idea/stubindex/KotlinFileFacadeShortNameIndex.kt | 3 ++- .../kotlin/idea/stubindex/KotlinFilePartClassIndex.kt | 3 ++- .../kotlin/idea/stubindex/KotlinFullClassNameIndex.java | 4 +++- .../kotlin/idea/stubindex/KotlinFunctionShortNameIndex.java | 3 ++- .../kotlin/idea/stubindex/KotlinMultifileClassPartIndex.kt | 3 ++- .../KotlinProbablyNothingFunctionShortNameIndex.java | 3 ++- .../KotlinProbablyNothingPropertyShortNameIndex.java | 3 ++- .../kotlin/idea/stubindex/KotlinPropertyShortNameIndex.java | 3 ++- .../jetbrains/kotlin/idea/stubindex/KotlinScriptFqnIndex.kt | 3 ++- .../kotlin/idea/stubindex/KotlinSuperClassIndex.java | 3 ++- .../idea/stubindex/KotlinTopLevelClassByPackageIndex.java | 3 ++- .../stubindex/KotlinTopLevelExtensionsByReceiverTypeIndex.kt | 3 ++- .../idea/stubindex/KotlinTopLevelFunctionByPackageIndex.java | 3 ++- .../idea/stubindex/KotlinTopLevelFunctionFqnNameIndex.java | 3 ++- .../idea/stubindex/KotlinTopLevelPropertyByPackageIndex.java | 3 ++- .../idea/stubindex/KotlinTopLevelPropertyFqnNameIndex.java | 3 ++- 21 files changed, 44 insertions(+), 21 deletions(-) diff --git a/idea/idea-analysis/src/org/jetbrains/kotlin/idea/stubindex/KotlinAnnotationsIndex.java b/idea/idea-analysis/src/org/jetbrains/kotlin/idea/stubindex/KotlinAnnotationsIndex.java index 510ed6c2c49..920ffb5b02c 100644 --- a/idea/idea-analysis/src/org/jetbrains/kotlin/idea/stubindex/KotlinAnnotationsIndex.java +++ b/idea/idea-analysis/src/org/jetbrains/kotlin/idea/stubindex/KotlinAnnotationsIndex.java @@ -19,6 +19,7 @@ package org.jetbrains.kotlin.idea.stubindex; import com.intellij.openapi.project.Project; import com.intellij.psi.search.GlobalSearchScope; import com.intellij.psi.stubs.StringStubIndexExtension; +import com.intellij.psi.stubs.StubIndex; import com.intellij.psi.stubs.StubIndexKey; import org.jetbrains.annotations.NotNull; import org.jetbrains.kotlin.psi.KtAnnotationEntry; @@ -45,7 +46,7 @@ public class KotlinAnnotationsIndex extends StringStubIndexExtension get(@NotNull String s, @NotNull Project project, @NotNull GlobalSearchScope scope) { - return super.get(s, project, KotlinSourceFilterScope.sourcesAndLibraries(scope, project)); + return StubIndex.getElements(KEY, s, project, KotlinSourceFilterScope.sourcesAndLibraries(scope, project), KtAnnotationEntry.class); } @Override diff --git a/idea/idea-analysis/src/org/jetbrains/kotlin/idea/stubindex/KotlinClassShortNameIndex.java b/idea/idea-analysis/src/org/jetbrains/kotlin/idea/stubindex/KotlinClassShortNameIndex.java index 2dcee9805e4..9d4e12ee540 100644 --- a/idea/idea-analysis/src/org/jetbrains/kotlin/idea/stubindex/KotlinClassShortNameIndex.java +++ b/idea/idea-analysis/src/org/jetbrains/kotlin/idea/stubindex/KotlinClassShortNameIndex.java @@ -19,8 +19,10 @@ package org.jetbrains.kotlin.idea.stubindex; import com.intellij.openapi.project.Project; import com.intellij.psi.search.GlobalSearchScope; import com.intellij.psi.stubs.StringStubIndexExtension; +import com.intellij.psi.stubs.StubIndex; import com.intellij.psi.stubs.StubIndexKey; import org.jetbrains.annotations.NotNull; +import org.jetbrains.kotlin.psi.KtClass; import org.jetbrains.kotlin.psi.KtClassOrObject; import java.util.Collection; @@ -46,6 +48,6 @@ public class KotlinClassShortNameIndex extends StringStubIndexExtension get(@NotNull String s, @NotNull Project project, @NotNull GlobalSearchScope scope) { - return super.get(s, project, KotlinSourceFilterScope.sourcesAndLibraries(scope, project)); + return StubIndex.getElements(KEY, s, project, KotlinSourceFilterScope.sourcesAndLibraries(scope, project), KtClassOrObject.class); } } diff --git a/idea/idea-analysis/src/org/jetbrains/kotlin/idea/stubindex/KotlinExactPackagesIndex.java b/idea/idea-analysis/src/org/jetbrains/kotlin/idea/stubindex/KotlinExactPackagesIndex.java index 613d6723914..658e6e4585f 100644 --- a/idea/idea-analysis/src/org/jetbrains/kotlin/idea/stubindex/KotlinExactPackagesIndex.java +++ b/idea/idea-analysis/src/org/jetbrains/kotlin/idea/stubindex/KotlinExactPackagesIndex.java @@ -19,6 +19,7 @@ package org.jetbrains.kotlin.idea.stubindex; import com.intellij.openapi.project.Project; import com.intellij.psi.search.GlobalSearchScope; import com.intellij.psi.stubs.StringStubIndexExtension; +import com.intellij.psi.stubs.StubIndex; import com.intellij.psi.stubs.StubIndexKey; import org.jetbrains.annotations.NotNull; import org.jetbrains.kotlin.psi.KtFile; @@ -46,6 +47,6 @@ public class KotlinExactPackagesIndex extends StringStubIndexExtension { @NotNull @Override public Collection get(@NotNull String fqName, @NotNull Project project, @NotNull GlobalSearchScope scope) { - return super.get(fqName, project, KotlinSourceFilterScope.sourcesAndLibraries(scope, project)); + return StubIndex.getElements(KEY, fqName, project, KotlinSourceFilterScope.sourcesAndLibraries(scope, project), KtFile.class); } } diff --git a/idea/idea-analysis/src/org/jetbrains/kotlin/idea/stubindex/KotlinFileFacadeClassByPackageIndex.kt b/idea/idea-analysis/src/org/jetbrains/kotlin/idea/stubindex/KotlinFileFacadeClassByPackageIndex.kt index 108a2cdfff4..a3fe58aad81 100644 --- a/idea/idea-analysis/src/org/jetbrains/kotlin/idea/stubindex/KotlinFileFacadeClassByPackageIndex.kt +++ b/idea/idea-analysis/src/org/jetbrains/kotlin/idea/stubindex/KotlinFileFacadeClassByPackageIndex.kt @@ -19,6 +19,7 @@ package org.jetbrains.kotlin.idea.stubindex import com.intellij.openapi.project.Project import com.intellij.psi.search.GlobalSearchScope import com.intellij.psi.stubs.StringStubIndexExtension +import com.intellij.psi.stubs.StubIndex import com.intellij.psi.stubs.StubIndexKey import org.jetbrains.kotlin.psi.KtFile @@ -26,7 +27,7 @@ class KotlinFileFacadeClassByPackageIndex private constructor() : StringStubInde override fun getKey(): StubIndexKey = KEY override fun get(key: String, project: Project, scope: GlobalSearchScope) = - super.get(key, project, KotlinSourceFilterScope.sourcesAndLibraries(scope, project)) + StubIndex.getElements(KEY, key, project, KotlinSourceFilterScope.sourcesAndLibraries(scope, project), KtFile::class.java) companion object { private val KEY = KotlinIndexUtil.createIndexKey(KotlinFileFacadeClassByPackageIndex::class.java) diff --git a/idea/idea-analysis/src/org/jetbrains/kotlin/idea/stubindex/KotlinFileFacadeFqNameIndex.kt b/idea/idea-analysis/src/org/jetbrains/kotlin/idea/stubindex/KotlinFileFacadeFqNameIndex.kt index 112636a4e3e..1d4e7c89958 100644 --- a/idea/idea-analysis/src/org/jetbrains/kotlin/idea/stubindex/KotlinFileFacadeFqNameIndex.kt +++ b/idea/idea-analysis/src/org/jetbrains/kotlin/idea/stubindex/KotlinFileFacadeFqNameIndex.kt @@ -19,6 +19,7 @@ package org.jetbrains.kotlin.idea.stubindex import com.intellij.openapi.project.Project import com.intellij.psi.search.GlobalSearchScope import com.intellij.psi.stubs.StringStubIndexExtension +import com.intellij.psi.stubs.StubIndex import com.intellij.psi.stubs.StubIndexKey import org.jetbrains.kotlin.psi.KtFile @@ -26,7 +27,7 @@ class KotlinFileFacadeFqNameIndex private constructor() : StringStubIndexExtensi override fun getKey(): StubIndexKey = KEY override fun get(key: String, project: Project, scope: GlobalSearchScope) = - super.get(key, project, KotlinSourceFilterScope.sourcesAndLibraries(scope, project)) + StubIndex.getElements(KEY, key, project, KotlinSourceFilterScope.sourcesAndLibraries(scope, project), KtFile::class.java) companion object { private val KEY = KotlinIndexUtil.createIndexKey(KotlinFileFacadeFqNameIndex::class.java) diff --git a/idea/idea-analysis/src/org/jetbrains/kotlin/idea/stubindex/KotlinFileFacadeShortNameIndex.kt b/idea/idea-analysis/src/org/jetbrains/kotlin/idea/stubindex/KotlinFileFacadeShortNameIndex.kt index 37b931f74c6..051a02c9bbe 100644 --- a/idea/idea-analysis/src/org/jetbrains/kotlin/idea/stubindex/KotlinFileFacadeShortNameIndex.kt +++ b/idea/idea-analysis/src/org/jetbrains/kotlin/idea/stubindex/KotlinFileFacadeShortNameIndex.kt @@ -19,6 +19,7 @@ package org.jetbrains.kotlin.idea.stubindex import com.intellij.openapi.project.Project import com.intellij.psi.search.GlobalSearchScope import com.intellij.psi.stubs.StringStubIndexExtension +import com.intellij.psi.stubs.StubIndex import com.intellij.psi.stubs.StubIndexKey import org.jetbrains.kotlin.psi.KtFile @@ -26,7 +27,7 @@ class KotlinFileFacadeShortNameIndex private constructor() : StringStubIndexExte override fun getKey(): StubIndexKey = KEY override fun get(key: String, project: Project, scope: GlobalSearchScope) = - super.get(key, project, KotlinSourceFilterScope.sourcesAndLibraries(scope, project)) + StubIndex.getElements(KEY, key, project, KotlinSourceFilterScope.sourcesAndLibraries(scope, project), KtFile::class.java) companion object { private val KEY = KotlinIndexUtil.createIndexKey(KotlinFileFacadeShortNameIndex::class.java) diff --git a/idea/idea-analysis/src/org/jetbrains/kotlin/idea/stubindex/KotlinFilePartClassIndex.kt b/idea/idea-analysis/src/org/jetbrains/kotlin/idea/stubindex/KotlinFilePartClassIndex.kt index 1532f9af2d5..310c4a41f59 100644 --- a/idea/idea-analysis/src/org/jetbrains/kotlin/idea/stubindex/KotlinFilePartClassIndex.kt +++ b/idea/idea-analysis/src/org/jetbrains/kotlin/idea/stubindex/KotlinFilePartClassIndex.kt @@ -19,6 +19,7 @@ package org.jetbrains.kotlin.idea.stubindex import com.intellij.openapi.project.Project import com.intellij.psi.search.GlobalSearchScope import com.intellij.psi.stubs.StringStubIndexExtension +import com.intellij.psi.stubs.StubIndex import com.intellij.psi.stubs.StubIndexKey import org.jetbrains.kotlin.psi.KtFile @@ -27,7 +28,7 @@ class KotlinFilePartClassIndex private constructor() : StringStubIndexExtension< override fun getKey(): StubIndexKey = KEY override fun get(key: String, project: Project, scope: GlobalSearchScope) = - super.get(key, project, KotlinSourceFilterScope.sourcesAndLibraries(scope, project)) + StubIndex.getElements(KEY, key, project, KotlinSourceFilterScope.sourcesAndLibraries(scope, project), KtFile::class.java) companion object { private val KEY = KotlinIndexUtil.createIndexKey(KotlinFilePartClassIndex::class.java) diff --git a/idea/idea-analysis/src/org/jetbrains/kotlin/idea/stubindex/KotlinFullClassNameIndex.java b/idea/idea-analysis/src/org/jetbrains/kotlin/idea/stubindex/KotlinFullClassNameIndex.java index 090b82b1b70..8e1c0b2888b 100644 --- a/idea/idea-analysis/src/org/jetbrains/kotlin/idea/stubindex/KotlinFullClassNameIndex.java +++ b/idea/idea-analysis/src/org/jetbrains/kotlin/idea/stubindex/KotlinFullClassNameIndex.java @@ -19,8 +19,10 @@ package org.jetbrains.kotlin.idea.stubindex; import com.intellij.openapi.project.Project; import com.intellij.psi.search.GlobalSearchScope; import com.intellij.psi.stubs.StringStubIndexExtension; +import com.intellij.psi.stubs.StubIndex; import com.intellij.psi.stubs.StubIndexKey; import org.jetbrains.annotations.NotNull; +import org.jetbrains.kotlin.psi.KtClass; import org.jetbrains.kotlin.psi.KtClassOrObject; import java.util.Collection; @@ -46,6 +48,6 @@ public class KotlinFullClassNameIndex extends StringStubIndexExtension get(@NotNull String fqName, @NotNull Project project, @NotNull GlobalSearchScope scope) { - return super.get(fqName, project, KotlinSourceFilterScope.sourcesAndLibraries(scope, project)); + return StubIndex.getElements(KEY, fqName, project, KotlinSourceFilterScope.sourcesAndLibraries(scope, project), KtClassOrObject.class); } } diff --git a/idea/idea-analysis/src/org/jetbrains/kotlin/idea/stubindex/KotlinFunctionShortNameIndex.java b/idea/idea-analysis/src/org/jetbrains/kotlin/idea/stubindex/KotlinFunctionShortNameIndex.java index 81e980a3eb3..7e9903f79b8 100644 --- a/idea/idea-analysis/src/org/jetbrains/kotlin/idea/stubindex/KotlinFunctionShortNameIndex.java +++ b/idea/idea-analysis/src/org/jetbrains/kotlin/idea/stubindex/KotlinFunctionShortNameIndex.java @@ -19,6 +19,7 @@ package org.jetbrains.kotlin.idea.stubindex; import com.intellij.openapi.project.Project; import com.intellij.psi.search.GlobalSearchScope; import com.intellij.psi.stubs.StringStubIndexExtension; +import com.intellij.psi.stubs.StubIndex; import com.intellij.psi.stubs.StubIndexKey; import org.jetbrains.annotations.NotNull; import org.jetbrains.kotlin.psi.KtNamedFunction; @@ -45,6 +46,6 @@ public class KotlinFunctionShortNameIndex extends StringStubIndexExtension get(@NotNull String s, @NotNull Project project, @NotNull GlobalSearchScope scope) { - return super.get(s, project, KotlinSourceFilterScope.sourcesAndLibraries(scope, project)); + return StubIndex.getElements(KEY, s, project, KotlinSourceFilterScope.sourcesAndLibraries(scope, project), KtNamedFunction.class); } } diff --git a/idea/idea-analysis/src/org/jetbrains/kotlin/idea/stubindex/KotlinMultifileClassPartIndex.kt b/idea/idea-analysis/src/org/jetbrains/kotlin/idea/stubindex/KotlinMultifileClassPartIndex.kt index d334194c1eb..829b5e32c31 100644 --- a/idea/idea-analysis/src/org/jetbrains/kotlin/idea/stubindex/KotlinMultifileClassPartIndex.kt +++ b/idea/idea-analysis/src/org/jetbrains/kotlin/idea/stubindex/KotlinMultifileClassPartIndex.kt @@ -19,6 +19,7 @@ package org.jetbrains.kotlin.idea.stubindex import com.intellij.openapi.project.Project import com.intellij.psi.search.GlobalSearchScope import com.intellij.psi.stubs.StringStubIndexExtension +import com.intellij.psi.stubs.StubIndex import com.intellij.psi.stubs.StubIndexKey import org.jetbrains.kotlin.psi.KtFile @@ -27,7 +28,7 @@ class KotlinMultifileClassPartIndex private constructor() : StringStubIndexExten override fun getKey(): StubIndexKey = KEY override fun get(key: String, project: Project, scope: GlobalSearchScope) = - super.get(key, project, KotlinSourceFilterScope.sourcesAndLibraries(scope, project)) + StubIndex.getElements(KEY, key, project, KotlinSourceFilterScope.sourcesAndLibraries(scope, project), KtFile::class.java) companion object { private val KEY = KotlinIndexUtil.createIndexKey(KotlinMultifileClassPartIndex::class.java) diff --git a/idea/idea-analysis/src/org/jetbrains/kotlin/idea/stubindex/KotlinProbablyNothingFunctionShortNameIndex.java b/idea/idea-analysis/src/org/jetbrains/kotlin/idea/stubindex/KotlinProbablyNothingFunctionShortNameIndex.java index 157fd418fab..4ed0949ccf3 100644 --- a/idea/idea-analysis/src/org/jetbrains/kotlin/idea/stubindex/KotlinProbablyNothingFunctionShortNameIndex.java +++ b/idea/idea-analysis/src/org/jetbrains/kotlin/idea/stubindex/KotlinProbablyNothingFunctionShortNameIndex.java @@ -19,6 +19,7 @@ package org.jetbrains.kotlin.idea.stubindex; import com.intellij.openapi.project.Project; import com.intellij.psi.search.GlobalSearchScope; import com.intellij.psi.stubs.StringStubIndexExtension; +import com.intellij.psi.stubs.StubIndex; import com.intellij.psi.stubs.StubIndexKey; import org.jetbrains.annotations.NotNull; import org.jetbrains.kotlin.psi.KtNamedFunction; @@ -45,6 +46,6 @@ public class KotlinProbablyNothingFunctionShortNameIndex extends StringStubIndex @NotNull @Override public Collection get(@NotNull String s, @NotNull Project project, @NotNull GlobalSearchScope scope) { - return super.get(s, project, KotlinSourceFilterScope.sourcesAndLibraries(scope, project)); + return StubIndex.getElements(KEY, s, project, KotlinSourceFilterScope.sourcesAndLibraries(scope, project), KtNamedFunction.class); } } diff --git a/idea/idea-analysis/src/org/jetbrains/kotlin/idea/stubindex/KotlinProbablyNothingPropertyShortNameIndex.java b/idea/idea-analysis/src/org/jetbrains/kotlin/idea/stubindex/KotlinProbablyNothingPropertyShortNameIndex.java index bbdc21c3096..7eaccd88007 100644 --- a/idea/idea-analysis/src/org/jetbrains/kotlin/idea/stubindex/KotlinProbablyNothingPropertyShortNameIndex.java +++ b/idea/idea-analysis/src/org/jetbrains/kotlin/idea/stubindex/KotlinProbablyNothingPropertyShortNameIndex.java @@ -19,6 +19,7 @@ package org.jetbrains.kotlin.idea.stubindex; import com.intellij.openapi.project.Project; import com.intellij.psi.search.GlobalSearchScope; import com.intellij.psi.stubs.StringStubIndexExtension; +import com.intellij.psi.stubs.StubIndex; import com.intellij.psi.stubs.StubIndexKey; import org.jetbrains.annotations.NotNull; import org.jetbrains.kotlin.psi.KtProperty; @@ -45,6 +46,6 @@ public class KotlinProbablyNothingPropertyShortNameIndex extends StringStubIndex @NotNull @Override public Collection get(@NotNull String s, @NotNull Project project, @NotNull GlobalSearchScope scope) { - return super.get(s, project, KotlinSourceFilterScope.sourcesAndLibraries(scope, project)); + return StubIndex.getElements(KEY, s, project, KotlinSourceFilterScope.sourcesAndLibraries(scope, project), KtProperty.class); } } diff --git a/idea/idea-analysis/src/org/jetbrains/kotlin/idea/stubindex/KotlinPropertyShortNameIndex.java b/idea/idea-analysis/src/org/jetbrains/kotlin/idea/stubindex/KotlinPropertyShortNameIndex.java index b8e58e86156..e547fb8a60e 100644 --- a/idea/idea-analysis/src/org/jetbrains/kotlin/idea/stubindex/KotlinPropertyShortNameIndex.java +++ b/idea/idea-analysis/src/org/jetbrains/kotlin/idea/stubindex/KotlinPropertyShortNameIndex.java @@ -19,6 +19,7 @@ package org.jetbrains.kotlin.idea.stubindex; import com.intellij.openapi.project.Project; import com.intellij.psi.search.GlobalSearchScope; import com.intellij.psi.stubs.StringStubIndexExtension; +import com.intellij.psi.stubs.StubIndex; import com.intellij.psi.stubs.StubIndexKey; import org.jetbrains.annotations.NotNull; import org.jetbrains.kotlin.psi.KtProperty; @@ -45,6 +46,6 @@ public class KotlinPropertyShortNameIndex extends StringStubIndexExtension get(@NotNull String s, @NotNull Project project, @NotNull GlobalSearchScope scope) { - return super.get(s, project, KotlinSourceFilterScope.sourcesAndLibraries(scope, project)); + return StubIndex.getElements(KEY, s, project, KotlinSourceFilterScope.sourcesAndLibraries(scope, project), KtProperty.class); } } diff --git a/idea/idea-analysis/src/org/jetbrains/kotlin/idea/stubindex/KotlinScriptFqnIndex.kt b/idea/idea-analysis/src/org/jetbrains/kotlin/idea/stubindex/KotlinScriptFqnIndex.kt index 3af86d4e3ce..5dd0c5d3801 100644 --- a/idea/idea-analysis/src/org/jetbrains/kotlin/idea/stubindex/KotlinScriptFqnIndex.kt +++ b/idea/idea-analysis/src/org/jetbrains/kotlin/idea/stubindex/KotlinScriptFqnIndex.kt @@ -19,13 +19,14 @@ package org.jetbrains.kotlin.idea.stubindex import com.intellij.openapi.project.Project import com.intellij.psi.search.GlobalSearchScope import com.intellij.psi.stubs.StringStubIndexExtension +import com.intellij.psi.stubs.StubIndex import org.jetbrains.kotlin.psi.KtScript class KotlinScriptFqnIndex private constructor() : StringStubIndexExtension() { override fun getKey() = KEY override fun get(fqName: String, project: Project, scope: GlobalSearchScope): Collection { - return super.get(fqName, project, KotlinSourceFilterScope.sourcesAndLibraries(scope, project)) + return StubIndex.getElements(KEY, fqName, project, KotlinSourceFilterScope.sourcesAndLibraries(scope, project), KtScript::class.java) } companion object { diff --git a/idea/idea-analysis/src/org/jetbrains/kotlin/idea/stubindex/KotlinSuperClassIndex.java b/idea/idea-analysis/src/org/jetbrains/kotlin/idea/stubindex/KotlinSuperClassIndex.java index aa460f9a48c..61b931fc839 100644 --- a/idea/idea-analysis/src/org/jetbrains/kotlin/idea/stubindex/KotlinSuperClassIndex.java +++ b/idea/idea-analysis/src/org/jetbrains/kotlin/idea/stubindex/KotlinSuperClassIndex.java @@ -19,6 +19,7 @@ package org.jetbrains.kotlin.idea.stubindex; import com.intellij.openapi.project.Project; import com.intellij.psi.search.GlobalSearchScope; import com.intellij.psi.stubs.StringStubIndexExtension; +import com.intellij.psi.stubs.StubIndex; import com.intellij.psi.stubs.StubIndexKey; import org.jetbrains.annotations.NotNull; import org.jetbrains.kotlin.psi.KtClassOrObject; @@ -46,6 +47,6 @@ public class KotlinSuperClassIndex extends StringStubIndexExtension get(@NotNull String s, @NotNull Project project, @NotNull GlobalSearchScope scope) { - return super.get(s, project, KotlinSourceFilterScope.sourcesAndLibraries(scope, project)); + return StubIndex.getElements(KEY, s, project, KotlinSourceFilterScope.sourcesAndLibraries(scope, project), KtClassOrObject.class); } } diff --git a/idea/idea-analysis/src/org/jetbrains/kotlin/idea/stubindex/KotlinTopLevelClassByPackageIndex.java b/idea/idea-analysis/src/org/jetbrains/kotlin/idea/stubindex/KotlinTopLevelClassByPackageIndex.java index 6a8d0027224..9da98de4f14 100644 --- a/idea/idea-analysis/src/org/jetbrains/kotlin/idea/stubindex/KotlinTopLevelClassByPackageIndex.java +++ b/idea/idea-analysis/src/org/jetbrains/kotlin/idea/stubindex/KotlinTopLevelClassByPackageIndex.java @@ -19,6 +19,7 @@ package org.jetbrains.kotlin.idea.stubindex; import com.intellij.openapi.project.Project; import com.intellij.psi.search.GlobalSearchScope; import com.intellij.psi.stubs.StringStubIndexExtension; +import com.intellij.psi.stubs.StubIndex; import com.intellij.psi.stubs.StubIndexKey; import org.jetbrains.annotations.NotNull; import org.jetbrains.kotlin.psi.KtClassOrObject; @@ -45,6 +46,6 @@ public class KotlinTopLevelClassByPackageIndex extends StringStubIndexExtension< @NotNull @Override public Collection get(@NotNull String fqName, @NotNull Project project, @NotNull GlobalSearchScope scope) { - return super.get(fqName, project, KotlinSourceFilterScope.sourcesAndLibraries(scope, project)); + return StubIndex.getElements(KEY, fqName, project, KotlinSourceFilterScope.sourcesAndLibraries(scope, project), KtClassOrObject.class); } } diff --git a/idea/idea-analysis/src/org/jetbrains/kotlin/idea/stubindex/KotlinTopLevelExtensionsByReceiverTypeIndex.kt b/idea/idea-analysis/src/org/jetbrains/kotlin/idea/stubindex/KotlinTopLevelExtensionsByReceiverTypeIndex.kt index c2abc099941..8f70284cb85 100644 --- a/idea/idea-analysis/src/org/jetbrains/kotlin/idea/stubindex/KotlinTopLevelExtensionsByReceiverTypeIndex.kt +++ b/idea/idea-analysis/src/org/jetbrains/kotlin/idea/stubindex/KotlinTopLevelExtensionsByReceiverTypeIndex.kt @@ -19,6 +19,7 @@ package org.jetbrains.kotlin.idea.stubindex import com.intellij.openapi.project.Project import com.intellij.psi.search.GlobalSearchScope import com.intellij.psi.stubs.StringStubIndexExtension +import com.intellij.psi.stubs.StubIndex import org.jetbrains.kotlin.psi.KtCallableDeclaration class KotlinTopLevelExtensionsByReceiverTypeIndex private constructor() : StringStubIndexExtension() { @@ -26,7 +27,7 @@ class KotlinTopLevelExtensionsByReceiverTypeIndex private constructor() : String override fun getKey() = KEY override fun get(s: String, project: Project, scope: GlobalSearchScope) - = super.get(s, project, KotlinSourceFilterScope.sourcesAndLibraries(scope, project)) + = StubIndex.getElements(KEY, s, project, KotlinSourceFilterScope.sourcesAndLibraries(scope, project), KtCallableDeclaration::class.java) companion object { private val KEY = KotlinIndexUtil.createIndexKey(KotlinTopLevelExtensionsByReceiverTypeIndex::class.java) diff --git a/idea/idea-analysis/src/org/jetbrains/kotlin/idea/stubindex/KotlinTopLevelFunctionByPackageIndex.java b/idea/idea-analysis/src/org/jetbrains/kotlin/idea/stubindex/KotlinTopLevelFunctionByPackageIndex.java index 371ea5b147b..f135a0e6136 100644 --- a/idea/idea-analysis/src/org/jetbrains/kotlin/idea/stubindex/KotlinTopLevelFunctionByPackageIndex.java +++ b/idea/idea-analysis/src/org/jetbrains/kotlin/idea/stubindex/KotlinTopLevelFunctionByPackageIndex.java @@ -19,6 +19,7 @@ package org.jetbrains.kotlin.idea.stubindex; import com.intellij.openapi.project.Project; import com.intellij.psi.search.GlobalSearchScope; import com.intellij.psi.stubs.StringStubIndexExtension; +import com.intellij.psi.stubs.StubIndex; import com.intellij.psi.stubs.StubIndexKey; import org.jetbrains.annotations.NotNull; import org.jetbrains.kotlin.psi.KtNamedFunction; @@ -45,6 +46,6 @@ public class KotlinTopLevelFunctionByPackageIndex extends StringStubIndexExtensi @NotNull @Override public Collection get(@NotNull String fqName, @NotNull Project project, @NotNull GlobalSearchScope scope) { - return super.get(fqName, project, KotlinSourceFilterScope.sourcesAndLibraries(scope, project)); + return StubIndex.getElements(KEY, fqName, project, KotlinSourceFilterScope.sourcesAndLibraries(scope, project), KtNamedFunction.class); } } diff --git a/idea/idea-analysis/src/org/jetbrains/kotlin/idea/stubindex/KotlinTopLevelFunctionFqnNameIndex.java b/idea/idea-analysis/src/org/jetbrains/kotlin/idea/stubindex/KotlinTopLevelFunctionFqnNameIndex.java index 83771b9ecbe..688c7b1edcb 100644 --- a/idea/idea-analysis/src/org/jetbrains/kotlin/idea/stubindex/KotlinTopLevelFunctionFqnNameIndex.java +++ b/idea/idea-analysis/src/org/jetbrains/kotlin/idea/stubindex/KotlinTopLevelFunctionFqnNameIndex.java @@ -19,6 +19,7 @@ package org.jetbrains.kotlin.idea.stubindex; import com.intellij.openapi.project.Project; import com.intellij.psi.search.GlobalSearchScope; import com.intellij.psi.stubs.StringStubIndexExtension; +import com.intellij.psi.stubs.StubIndex; import com.intellij.psi.stubs.StubIndexKey; import org.jetbrains.annotations.NotNull; import org.jetbrains.kotlin.psi.KtNamedFunction; @@ -49,6 +50,6 @@ public class KotlinTopLevelFunctionFqnNameIndex extends StringStubIndexExtension @NotNull @Override public Collection get(@NotNull String s, @NotNull Project project, @NotNull GlobalSearchScope scope) { - return super.get(s, project, KotlinSourceFilterScope.sourcesAndLibraries(scope, project)); + return StubIndex.getElements(KEY, s, project, KotlinSourceFilterScope.sourcesAndLibraries(scope, project), KtNamedFunction.class); } } diff --git a/idea/idea-analysis/src/org/jetbrains/kotlin/idea/stubindex/KotlinTopLevelPropertyByPackageIndex.java b/idea/idea-analysis/src/org/jetbrains/kotlin/idea/stubindex/KotlinTopLevelPropertyByPackageIndex.java index 006b219fa0f..7ded8e6895e 100644 --- a/idea/idea-analysis/src/org/jetbrains/kotlin/idea/stubindex/KotlinTopLevelPropertyByPackageIndex.java +++ b/idea/idea-analysis/src/org/jetbrains/kotlin/idea/stubindex/KotlinTopLevelPropertyByPackageIndex.java @@ -19,6 +19,7 @@ package org.jetbrains.kotlin.idea.stubindex; import com.intellij.openapi.project.Project; import com.intellij.psi.search.GlobalSearchScope; import com.intellij.psi.stubs.StringStubIndexExtension; +import com.intellij.psi.stubs.StubIndex; import com.intellij.psi.stubs.StubIndexKey; import org.jetbrains.annotations.NotNull; import org.jetbrains.kotlin.psi.KtProperty; @@ -45,6 +46,6 @@ public class KotlinTopLevelPropertyByPackageIndex extends StringStubIndexExtensi @NotNull @Override public Collection get(@NotNull String fqName, @NotNull Project project, @NotNull GlobalSearchScope scope) { - return super.get(fqName, project, KotlinSourceFilterScope.sourcesAndLibraries(scope, project)); + return StubIndex.getElements(KEY, fqName, project, KotlinSourceFilterScope.sourcesAndLibraries(scope, project), KtProperty.class); } } diff --git a/idea/idea-analysis/src/org/jetbrains/kotlin/idea/stubindex/KotlinTopLevelPropertyFqnNameIndex.java b/idea/idea-analysis/src/org/jetbrains/kotlin/idea/stubindex/KotlinTopLevelPropertyFqnNameIndex.java index d33d01a5625..d081eb7b8cd 100644 --- a/idea/idea-analysis/src/org/jetbrains/kotlin/idea/stubindex/KotlinTopLevelPropertyFqnNameIndex.java +++ b/idea/idea-analysis/src/org/jetbrains/kotlin/idea/stubindex/KotlinTopLevelPropertyFqnNameIndex.java @@ -19,6 +19,7 @@ package org.jetbrains.kotlin.idea.stubindex; import com.intellij.openapi.project.Project; import com.intellij.psi.search.GlobalSearchScope; import com.intellij.psi.stubs.StringStubIndexExtension; +import com.intellij.psi.stubs.StubIndex; import com.intellij.psi.stubs.StubIndexKey; import org.jetbrains.annotations.NotNull; import org.jetbrains.kotlin.psi.KtProperty; @@ -46,6 +47,6 @@ public class KotlinTopLevelPropertyFqnNameIndex extends StringStubIndexExtension @NotNull @Override public Collection get(@NotNull String s, @NotNull Project project, @NotNull GlobalSearchScope scope) { - return super.get(s, project, KotlinSourceFilterScope.sourcesAndLibraries(scope, project)); + return StubIndex.getElements(KEY, s, project, KotlinSourceFilterScope.sourcesAndLibraries(scope, project), KtProperty.class); } }