azalea/kotlin-fork
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Minor: rename and refactor PackageIndexUtil#containsAny()

Browse Source
This commit is contained in:
Pavel V. Talanov
2014-09-24 17:46:31 +04:00
parent 4370577457
commit 9219616bb8
2 changed files with 8 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files
idea/idea-analysis/src/org/jetbrains/jet/plugin/stubindex/PackageIndexUtil.kt
+6 -5
View File
@@ -48,18 +48,19 @@ public object PackageIndexUtil {
searchScope: GlobalSearchScope, searchScope: GlobalSearchScope,
project: Project project: Project
): Boolean { ): Boolean {
return containsAny(packageFqName, searchScope, project, JetExactPackagesIndex.getInstance().getKey()) || return containsFilesWithExactPackage(packageFqName, searchScope, project) ||
SubpackagesIndexService.getInstance(project).hasSubpackages(packageFqName, searchScope) SubpackagesIndexService.getInstance(project).hasSubpackages(packageFqName, searchScope)
} }
platformStatic public fun containsAny( platformStatic public fun containsFilesWithExactPackage(
packageFqName: FqName, packageFqName: FqName,
searchScope: GlobalSearchScope, searchScope: GlobalSearchScope,
project: Project, project: Project
key: StubIndexKey<String, JetFile>
): Boolean { ): Boolean {
var result = false var result = false
StubIndex.getInstance().processElements<String, JetFile>(key, packageFqName.asString(), project, searchScope, javaClass<JetFile>()) { StubIndex.getInstance().processElements<String, JetFile>(
JetExactPackagesIndex.getInstance().getKey(), packageFqName.asString(), project, searchScope, javaClass<JetFile>()
) {
result = true result = true
false false
} }
idea/idea-analysis/src/org/jetbrains/jet/plugin/stubindex/SubpackagesIndexService.kt
+2 -4
View File
@@ -55,7 +55,7 @@ public class SubpackagesIndexService(private val project: Project) {
public fun hasSubpackages(fqName: FqName, scope: GlobalSearchScope): Boolean { public fun hasSubpackages(fqName: FqName, scope: GlobalSearchScope): Boolean {
return fqNameByPrefix[fqName].any { packageWithFilesFqName -> return fqNameByPrefix[fqName].any { packageWithFilesFqName ->
PackageIndexUtil.containsAny(packageWithFilesFqName, scope, project, JetExactPackagesIndex.getInstance().getKey()) PackageIndexUtil.containsFilesWithExactPackage(packageWithFilesFqName, scope, project)
} }
} }
@@ -68,9 +68,7 @@ public class SubpackagesIndexService(private val project: Project) {
if (candidateSubPackageShortName in existingSubPackagesShortNames) { if (candidateSubPackageShortName in existingSubPackagesShortNames) {
continue continue
} }
val existsInThisScope = PackageIndexUtil.containsAny( val existsInThisScope = PackageIndexUtil.containsFilesWithExactPackage(filesFqName, scope, project)
filesFqName, scope, project, JetExactPackagesIndex.getInstance().getKey()
)
if (existsInThisScope) { if (existsInThisScope) {
existingSubPackagesShortNames.add(candidateSubPackageShortName) existingSubPackagesShortNames.add(candidateSubPackageShortName)
} }