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

Fix NPE in KotlinIndicesHelper (EA-209799)

Browse Source
This commit is contained in:
Nikolay Krasko
2019-09-07 15:47:48 +03:00
parent 90511c734d
commit 7f8774f68e
1 changed files with 2 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files
idea/idea-core/src/org/jetbrains/kotlin/idea/core/KotlinIndicesHelper.kt
+2 -1
View File
@@ -503,7 +503,8 @@ class KotlinIndicesHelper(
psiFilter: (KtDeclaration) -> Boolean psiFilter: (KtDeclaration) -> Boolean
): Collection<DeclarationDescriptor> { ): Collection<DeclarationDescriptor> {
if (containingKtFile.isCompiled) { //TODO: it's temporary while resolveToDescriptor does not work for compiled declarations if (containingKtFile.isCompiled) { //TODO: it's temporary while resolveToDescriptor does not work for compiled declarations
return resolutionFacade.resolveImportReference(moduleDescriptor, fqName!!) val fqName = fqName ?: return emptyList()
return resolutionFacade.resolveImportReference(moduleDescriptor, fqName)
} else { } else {
val translatedDeclaration = declarationTranslator(this) ?: return emptyList() val translatedDeclaration = declarationTranslator(this) ?: return emptyList()
if (!psiFilter(translatedDeclaration)) return emptyList() if (!psiFilter(translatedDeclaration)) return emptyList()