From ddb3327992a966a39ad0e43641e69a3c58c209f3 Mon Sep 17 00:00:00 2001 From: "Pavel V. Talanov" Date: Thu, 9 Jun 2016 21:44:11 +0300 Subject: [PATCH] Minor: Remove scoping limitation in newly created indices --- .../kotlin/idea/stubindex/KotlinMultifileClassPartIndex.kt | 2 +- .../idea/stubindex/KotlinTopLevelTypeAliasByPackageIndex.kt | 4 ++-- .../idea/stubindex/KotlinTopLevelTypeAliasFqNameIndex.kt | 4 ++-- 3 files changed, 5 insertions(+), 5 deletions(-) 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 829b5e32c31..a8c1afb08c0 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 @@ -28,7 +28,7 @@ class KotlinMultifileClassPartIndex private constructor() : StringStubIndexExten 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(KotlinMultifileClassPartIndex::class.java) diff --git a/idea/idea-analysis/src/org/jetbrains/kotlin/idea/stubindex/KotlinTopLevelTypeAliasByPackageIndex.kt b/idea/idea-analysis/src/org/jetbrains/kotlin/idea/stubindex/KotlinTopLevelTypeAliasByPackageIndex.kt index 7a9dedcf0b0..0a49aecaaca 100644 --- a/idea/idea-analysis/src/org/jetbrains/kotlin/idea/stubindex/KotlinTopLevelTypeAliasByPackageIndex.kt +++ b/idea/idea-analysis/src/org/jetbrains/kotlin/idea/stubindex/KotlinTopLevelTypeAliasByPackageIndex.kt @@ -29,8 +29,8 @@ class KotlinTopLevelTypeAliasByPackageIndex : StringStubIndexExtension = StubIndex.getElements( KEY, s, project, - KotlinSourceFilterScope.sourcesAndLibraries(scope, project), - KtTypeAlias::class.java) + scope, KtTypeAlias::class.java + ) companion object { val KEY = KotlinIndexUtil.createIndexKey(KotlinTopLevelTypeAliasByPackageIndex::class.java) diff --git a/idea/idea-analysis/src/org/jetbrains/kotlin/idea/stubindex/KotlinTopLevelTypeAliasFqNameIndex.kt b/idea/idea-analysis/src/org/jetbrains/kotlin/idea/stubindex/KotlinTopLevelTypeAliasFqNameIndex.kt index 60f3c61d45d..eaec0b47ae4 100644 --- a/idea/idea-analysis/src/org/jetbrains/kotlin/idea/stubindex/KotlinTopLevelTypeAliasFqNameIndex.kt +++ b/idea/idea-analysis/src/org/jetbrains/kotlin/idea/stubindex/KotlinTopLevelTypeAliasFqNameIndex.kt @@ -29,8 +29,8 @@ class KotlinTopLevelTypeAliasFqNameIndex : StringStubIndexExtension override fun get(s: String, project: Project, scope: GlobalSearchScope): Collection = StubIndex.getElements( KEY, s, project, - KotlinSourceFilterScope.sourcesAndLibraries(scope, project), - KtTypeAlias::class.java) + scope, KtTypeAlias::class.java + ) companion object { val KEY = KotlinIndexUtil.createIndexKey(KotlinTopLevelTypeAliasFqNameIndex::class.java)