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

PerModulePackageCacheService: fix NPE for code injection

Browse Source 
#KT-35208 Fixed
This commit is contained in:
Dmitry Gridin
2019-12-02 16:16:15 +07:00
parent ebf3bfc048
commit 7c9826b60b
1 changed files with 2 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files
idea/idea-analysis/src/org/jetbrains/kotlin/idea/caches/PerModulePackageCacheService.kt
+2 -2
View File
@@ -68,7 +68,7 @@ class KotlinPackageContentModificationListener(private val project: Project) : D
.filter { (it.isValid || it !is VFileCreateEvent) && it.file != null } .filter { (it.isValid || it !is VFileCreateEvent) && it.file != null }
.filter { .filter {
val vFile = it.file!! val vFile = it.file!!
vFile.isDirectory || FileTypeRegistry.getInstance().getFileTypeByFileName(vFile.nameSequence) == KotlinFileType.INSTANCE vFile.isDirectory || vFile.fileType == KotlinFileType.INSTANCE
} }
.filter { .filter {
when (val origin = it.requestor) { when (val origin = it.requestor) {
@@ -221,7 +221,7 @@ class ImplicitPackagePrefixCache(private val project: Project) {
} }
internal fun update(ktFile: KtFile) { internal fun update(ktFile: KtFile) {
val parent = ktFile.virtualFile.parent val parent = ktFile.virtualFile?.parent ?: return
if (ktFile.sourceRoot == parent) { if (ktFile.sourceRoot == parent) {
implicitPackageCache[parent]?.updateFile(ktFile) implicitPackageCache[parent]?.updateFile(ktFile)
} }