diff --git a/idea/idea-analysis/src/org/jetbrains/kotlin/idea/caches/KotlinShortNamesCache.kt b/idea/idea-analysis/src/org/jetbrains/kotlin/idea/caches/KotlinShortNamesCache.kt index ab237018155..4d6c02f8c45 100644 --- a/idea/idea-analysis/src/org/jetbrains/kotlin/idea/caches/KotlinShortNamesCache.kt +++ b/idea/idea-analysis/src/org/jetbrains/kotlin/idea/caches/KotlinShortNamesCache.kt @@ -30,6 +30,7 @@ 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.KotlinSourceFilterScope import org.jetbrains.kotlin.load.java.JvmAbi import org.jetbrains.kotlin.name.FqName import java.util.* @@ -51,12 +52,13 @@ class KotlinShortNamesCache(private val project: Project) : PsiShortNamesCache() * Return class names form kotlin sources in given scope which should be visible as Java classes. */ override fun getClassesByName(name: String, scope: GlobalSearchScope): Array { + val effectiveScope = KotlinSourceFilterScope.sourcesAndLibraries(scope, project) val allFqNames = HashSet() - KotlinClassShortNameIndex.getInstance().get(name, project, scope) + KotlinClassShortNameIndex.getInstance().get(name, project, effectiveScope) .mapTo(allFqNames) { it.fqName } - KotlinFileFacadeShortNameIndex.INSTANCE.get(name, project, scope) + KotlinFileFacadeShortNameIndex.INSTANCE.get(name, project, effectiveScope) .mapTo(allFqNames) { it.javaFileFacadeFqName } val result = ArrayList() @@ -70,7 +72,7 @@ class KotlinShortNamesCache(private val project: Project) : PsiShortNamesCache() val fqNameToSearch = if (isInterfaceDefaultImpl) fqName.defaultImplsChild() else fqName - val psiClass = JavaElementFinder.getInstance(project).findClass(fqNameToSearch.asString(), scope) + val psiClass = JavaElementFinder.getInstance(project).findClass(fqNameToSearch.asString(), effectiveScope) if (psiClass != null) { result.add(psiClass) } diff --git a/idea/idea-analysis/src/org/jetbrains/kotlin/idea/decompiler/navigation/findDecompiledDeclaration.kt b/idea/idea-analysis/src/org/jetbrains/kotlin/idea/decompiler/navigation/findDecompiledDeclaration.kt index d8a2084bd00..65237b06c36 100644 --- a/idea/idea-analysis/src/org/jetbrains/kotlin/idea/decompiler/navigation/findDecompiledDeclaration.kt +++ b/idea/idea-analysis/src/org/jetbrains/kotlin/idea/decompiler/navigation/findDecompiledDeclaration.kt @@ -85,10 +85,7 @@ private fun findCandidateDeclarationsInIndex( val containingClass = DescriptorUtils.getParentOfType(referencedDescriptor, ClassDescriptor::class.java, false) if (containingClass != null) { - return if (scriptsScope != null) - KotlinFullClassNameIndex.getInstance().getNoScopeWrap(containingClass.fqNameSafe.asString(), project, scope) - else - KotlinFullClassNameIndex.getInstance().get(containingClass.fqNameSafe.asString(), project, scope) + return KotlinFullClassNameIndex.getInstance().get(containingClass.fqNameSafe.asString(), project, scope) } val topLevelDeclaration = DescriptorUtils.getParentOfType(referencedDescriptor, PropertyDescriptor::class.java, false) @@ -98,18 +95,12 @@ private fun findCandidateDeclarationsInIndex( if (!DescriptorUtils.isTopLevelDeclaration(topLevelDeclaration)) return emptyList() val fqName = topLevelDeclaration.fqNameSafe.asString() - when (topLevelDeclaration) { + return when (topLevelDeclaration) { is FunctionDescriptor -> { - return if (scriptsScope != null) - KotlinTopLevelFunctionFqnNameIndex.getInstance().getNoScopeWrap(fqName, project, scope) - else - KotlinTopLevelFunctionFqnNameIndex.getInstance().get(fqName, project, scope) + KotlinTopLevelFunctionFqnNameIndex.getInstance().get(fqName, project, scope) } is PropertyDescriptor -> { - return if (scriptsScope != null) - KotlinTopLevelPropertyFqnNameIndex.getInstance().getNoScopeWrap(fqName, project, scope) - else - KotlinTopLevelPropertyFqnNameIndex.getInstance().get(fqName, project, scope) + KotlinTopLevelPropertyFqnNameIndex.getInstance().get(fqName, project, scope) } else -> error("Referenced non local declaration that is not inside top level function, property of class:\n $referencedDescriptor") } 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 920ffb5b02c..c5dca723264 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 @@ -46,7 +46,7 @@ public class KotlinAnnotationsIndex extends StringStubIndexExtension get(@NotNull String s, @NotNull Project project, @NotNull GlobalSearchScope scope) { - return StubIndex.getElements(KEY, s, project, KotlinSourceFilterScope.sourcesAndLibraries(scope, project), KtAnnotationEntry.class); + return StubIndex.getElements(KEY, s, project, scope, 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 9d4e12ee540..7347449be0a 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 @@ -48,6 +48,6 @@ public class KotlinClassShortNameIndex extends StringStubIndexExtension get(@NotNull String s, @NotNull Project project, @NotNull GlobalSearchScope scope) { - return StubIndex.getElements(KEY, s, project, KotlinSourceFilterScope.sourcesAndLibraries(scope, project), KtClassOrObject.class); + return StubIndex.getElements(KEY, s, project, scope, 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 658e6e4585f..a29cfeff0e0 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 @@ -47,6 +47,6 @@ public class KotlinExactPackagesIndex extends StringStubIndexExtension { @NotNull @Override public Collection get(@NotNull String fqName, @NotNull Project project, @NotNull GlobalSearchScope scope) { - return StubIndex.getElements(KEY, fqName, project, KotlinSourceFilterScope.sourcesAndLibraries(scope, project), KtFile.class); + return StubIndex.getElements(KEY, fqName, project, scope, 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 a3fe58aad81..8fed76a2853 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 @@ -27,7 +27,7 @@ class KotlinFileFacadeClassByPackageIndex private constructor() : StringStubInde override fun getKey(): StubIndexKey = KEY override fun get(key: String, project: Project, scope: GlobalSearchScope) = - StubIndex.getElements(KEY, key, project, KotlinSourceFilterScope.sourcesAndLibraries(scope, project), KtFile::class.java) + StubIndex.getElements(KEY, key, project, scope, 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 1d4e7c89958..9fbfdf0628c 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 @@ -27,7 +27,7 @@ class KotlinFileFacadeFqNameIndex private constructor() : StringStubIndexExtensi override fun getKey(): StubIndexKey = KEY override fun get(key: String, project: Project, scope: GlobalSearchScope) = - StubIndex.getElements(KEY, key, project, KotlinSourceFilterScope.sourcesAndLibraries(scope, project), KtFile::class.java) + StubIndex.getElements(KEY, key, project, scope, 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 051a02c9bbe..ca32fea31c7 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 @@ -27,7 +27,7 @@ class KotlinFileFacadeShortNameIndex private constructor() : StringStubIndexExte override fun getKey(): StubIndexKey = KEY override fun get(key: String, project: Project, scope: GlobalSearchScope) = - StubIndex.getElements(KEY, key, project, KotlinSourceFilterScope.sourcesAndLibraries(scope, project), KtFile::class.java) + StubIndex.getElements(KEY, key, project, scope, 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 310c4a41f59..2deff8a17dc 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 @@ -28,7 +28,7 @@ class KotlinFilePartClassIndex private constructor() : StringStubIndexExtension< override fun getKey(): StubIndexKey = KEY override fun get(key: String, project: Project, scope: GlobalSearchScope) = - StubIndex.getElements(KEY, key, project, KotlinSourceFilterScope.sourcesAndLibraries(scope, project), KtFile::class.java) + StubIndex.getElements(KEY, key, project, scope, 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 38dc94cb673..41a4015cea3 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 @@ -48,12 +48,6 @@ public class KotlinFullClassNameIndex extends StringStubIndexExtension get(@NotNull String fqName, @NotNull Project project, @NotNull GlobalSearchScope scope) { - return StubIndex.getElements(KEY, fqName, project, KotlinSourceFilterScope.sourcesAndLibraries(scope, project), KtClassOrObject.class); - } - - // temporary hack, see comments in findCandidateDeclarationsInIndex (findDecompiledDeclaration.kt) - @NotNull - public Collection getNoScopeWrap(@NotNull String fqName, @NotNull Project project, @NotNull GlobalSearchScope scope) { return StubIndex.getElements(KEY, fqName, project, scope, 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 7e9903f79b8..9af3a335c09 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 @@ -46,6 +46,6 @@ public class KotlinFunctionShortNameIndex extends StringStubIndexExtension get(@NotNull String s, @NotNull Project project, @NotNull GlobalSearchScope scope) { - return StubIndex.getElements(KEY, s, project, KotlinSourceFilterScope.sourcesAndLibraries(scope, project), KtNamedFunction.class); + return StubIndex.getElements(KEY, s, project, scope, KtNamedFunction.class); } } 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 4ed0949ccf3..f03fbbe8cce 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 @@ -46,6 +46,6 @@ public class KotlinProbablyNothingFunctionShortNameIndex extends StringStubIndex @NotNull @Override public Collection get(@NotNull String s, @NotNull Project project, @NotNull GlobalSearchScope scope) { - return StubIndex.getElements(KEY, s, project, KotlinSourceFilterScope.sourcesAndLibraries(scope, project), KtNamedFunction.class); + return StubIndex.getElements(KEY, s, project, scope, 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 7eaccd88007..09bfb4dd83a 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 @@ -46,6 +46,6 @@ public class KotlinProbablyNothingPropertyShortNameIndex extends StringStubIndex @NotNull @Override public Collection get(@NotNull String s, @NotNull Project project, @NotNull GlobalSearchScope scope) { - return StubIndex.getElements(KEY, s, project, KotlinSourceFilterScope.sourcesAndLibraries(scope, project), KtProperty.class); + return StubIndex.getElements(KEY, s, project, scope, 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 e547fb8a60e..7f3b9c8c543 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 @@ -46,6 +46,6 @@ public class KotlinPropertyShortNameIndex extends StringStubIndexExtension get(@NotNull String s, @NotNull Project project, @NotNull GlobalSearchScope scope) { - return StubIndex.getElements(KEY, s, project, KotlinSourceFilterScope.sourcesAndLibraries(scope, project), KtProperty.class); + return StubIndex.getElements(KEY, s, project, scope, 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 5dd0c5d3801..48ce32d9ccb 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 @@ -26,7 +26,7 @@ class KotlinScriptFqnIndex private constructor() : StringStubIndexExtension { - return StubIndex.getElements(KEY, fqName, project, KotlinSourceFilterScope.sourcesAndLibraries(scope, project), KtScript::class.java) + return StubIndex.getElements(KEY, fqName, project, scope, 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 61b931fc839..e8b6c4d06f0 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 @@ -47,6 +47,6 @@ public class KotlinSuperClassIndex extends StringStubIndexExtension get(@NotNull String s, @NotNull Project project, @NotNull GlobalSearchScope scope) { - return StubIndex.getElements(KEY, s, project, KotlinSourceFilterScope.sourcesAndLibraries(scope, project), KtClassOrObject.class); + return StubIndex.getElements(KEY, s, project, scope, 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 9da98de4f14..93cca097464 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 @@ -46,6 +46,6 @@ public class KotlinTopLevelClassByPackageIndex extends StringStubIndexExtension< @NotNull @Override public Collection get(@NotNull String fqName, @NotNull Project project, @NotNull GlobalSearchScope scope) { - return StubIndex.getElements(KEY, fqName, project, KotlinSourceFilterScope.sourcesAndLibraries(scope, project), KtClassOrObject.class); + return StubIndex.getElements(KEY, fqName, project, scope, 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 8f70284cb85..40f55b58e19 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 @@ -27,7 +27,7 @@ class KotlinTopLevelExtensionsByReceiverTypeIndex private constructor() : String override fun getKey() = KEY override fun get(s: String, project: Project, scope: GlobalSearchScope) - = StubIndex.getElements(KEY, s, project, KotlinSourceFilterScope.sourcesAndLibraries(scope, project), KtCallableDeclaration::class.java) + = StubIndex.getElements(KEY, s, project, scope, 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 f135a0e6136..728a28ff576 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 @@ -46,6 +46,6 @@ public class KotlinTopLevelFunctionByPackageIndex extends StringStubIndexExtensi @NotNull @Override public Collection get(@NotNull String fqName, @NotNull Project project, @NotNull GlobalSearchScope scope) { - return StubIndex.getElements(KEY, fqName, project, KotlinSourceFilterScope.sourcesAndLibraries(scope, project), KtNamedFunction.class); + return StubIndex.getElements(KEY, fqName, project, scope, 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 782658ba425..1e0987cb931 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 @@ -50,7 +50,7 @@ public class KotlinTopLevelFunctionFqnNameIndex extends StringStubIndexExtension @NotNull @Override public Collection get(@NotNull String s, @NotNull Project project, @NotNull GlobalSearchScope scope) { - return StubIndex.getElements(KEY, s, project, KotlinSourceFilterScope.sourcesAndLibraries(scope, project), KtNamedFunction.class); + return StubIndex.getElements(KEY, s, project, scope, KtNamedFunction.class); } // temporary hack, see comments in findCandidateDeclarationsInIndex (findDecompiledDeclaration.kt) 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 7ded8e6895e..2da9a6e1570 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 @@ -46,6 +46,6 @@ public class KotlinTopLevelPropertyByPackageIndex extends StringStubIndexExtensi @NotNull @Override public Collection get(@NotNull String fqName, @NotNull Project project, @NotNull GlobalSearchScope scope) { - return StubIndex.getElements(KEY, fqName, project, KotlinSourceFilterScope.sourcesAndLibraries(scope, project), KtProperty.class); + return StubIndex.getElements(KEY, fqName, project, scope, 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 b89df1069cf..db3db45e812 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 @@ -47,12 +47,6 @@ public class KotlinTopLevelPropertyFqnNameIndex extends StringStubIndexExtension @NotNull @Override public Collection get(@NotNull String s, @NotNull Project project, @NotNull GlobalSearchScope scope) { - return StubIndex.getElements(KEY, s, project, KotlinSourceFilterScope.sourcesAndLibraries(scope, project), KtProperty.class); - } - - // temporary hack, see comments in findCandidateDeclarationsInIndex (findDecompiledDeclaration.kt) - @NotNull - public Collection getNoScopeWrap(@NotNull String s, @NotNull Project project, @NotNull GlobalSearchScope scope) { return StubIndex.getElements(KEY, s, project, scope, KtProperty.class); } } diff --git a/idea/src/org/jetbrains/kotlin/idea/search/ideaExtensions/KotlinAnnotatedElementsSearcher.kt b/idea/src/org/jetbrains/kotlin/idea/search/ideaExtensions/KotlinAnnotatedElementsSearcher.kt index 5c6adda75bf..a34e381ef32 100644 --- a/idea/src/org/jetbrains/kotlin/idea/search/ideaExtensions/KotlinAnnotatedElementsSearcher.kt +++ b/idea/src/org/jetbrains/kotlin/idea/search/ideaExtensions/KotlinAnnotatedElementsSearcher.kt @@ -32,6 +32,7 @@ import org.jetbrains.kotlin.asJava.LightClassUtil import org.jetbrains.kotlin.asJava.toLightClass import org.jetbrains.kotlin.idea.caches.resolve.analyze import org.jetbrains.kotlin.idea.stubindex.KotlinAnnotationsIndex +import org.jetbrains.kotlin.idea.stubindex.KotlinSourceFilterScope import org.jetbrains.kotlin.idea.util.application.runReadAction import org.jetbrains.kotlin.psi.* import org.jetbrains.kotlin.psi.psiUtil.collectDescendantsOfType @@ -106,7 +107,8 @@ class KotlinAnnotatedElementsSearcher : QueryExecutor { if (useScope is GlobalSearchScope) { val name = annClass.name ?: return emptyList() - return KotlinAnnotationsIndex.getInstance().get(name, annClass.project, useScope) + val scope = KotlinSourceFilterScope.sourcesAndLibraries(useScope, annClass.project) + return KotlinAnnotationsIndex.getInstance().get(name, annClass.project, scope) } return (useScope as LocalSearchScope).scope.flatMap { it.collectDescendantsOfType() }