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

Fix CCE caused by KotlinPackageSourcesMemberNamesIndex

Browse Source 
FileContentImpl::getPsiFile is not-nullable and at the same time
it contains an explicit case of its fileType to LanguageFileType
that leads to the following exception in case when kt-file is marked as plain text:

java.lang.ClassCastException: com.intellij.openapi.file.exclude.EnforcedPlainTextFileTypeFactory$1 cannot be cast to com.intellij.openapi.fileTypes.LanguageFileType
	at com.intellij.util.indexing.FileContentImpl.createFileFromText(FileContentImpl.java:135)
	at com.intellij.util.indexing.FileContentImpl.getPsiFile(FileContentImpl.java:104)

 #EA-114338 Fixed
This commit is contained in:
Denis Zharkov
2018-02-19 10:31:33 +03:00
parent f790635b30
commit cef7205f14
1 changed files with 4 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files
idea/idea-analysis/src/org/jetbrains/kotlin/idea/vfilefinder/KotlinPackageSourcesMemberNamesIndex.kt
+4 -1
View File
@@ -30,10 +30,13 @@ object KotlinPackageSourcesMemberNamesIndex : FileBasedIndexExtension<String, Co
override fun getInputFilter(): FileBasedIndex.InputFilter = override fun getInputFilter(): FileBasedIndex.InputFilter =
FileBasedIndex.InputFilter { file -> file.extension == KotlinFileType.EXTENSION } FileBasedIndex.InputFilter { file -> file.extension == KotlinFileType.EXTENSION }
override fun getVersion(): Int = 1 override fun getVersion(): Int = 2
override fun getIndexer(): DataIndexer<String, Collection<String>, FileContent> = override fun getIndexer(): DataIndexer<String, Collection<String>, FileContent> =
DataIndexer { inputData -> DataIndexer { inputData ->
// Check if ".kt" file is marked as plain text
if (inputData.fileType !is KotlinFileType) return@DataIndexer emptyMap()
val ktFile = inputData.psiFile as? KtFile ?: return@DataIndexer emptyMap() val ktFile = inputData.psiFile as? KtFile ?: return@DataIndexer emptyMap()
val packageName = ktFile.packageDirective?.fqName?.asString() ?: "" val packageName = ktFile.packageDirective?.fqName?.asString() ?: ""