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

Fix NPE in tests when ProjectFileIndex is not available

Browse Source
This commit is contained in:
Dmitry Jemerov
2017-03-16 16:45:23 +01:00
parent 0d86bdd216
commit 0638106bf3
1 changed files with 6 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files
idea/idea-analysis/src/org/jetbrains/kotlin/idea/project/Platform.kt
+6 -1
View File
@@ -147,4 +147,9 @@ val KtElement.languageVersionSettings: LanguageVersionSettings
} }
val KtElement.jvmTarget: JvmTarget val KtElement.jvmTarget: JvmTarget
get() = ModuleUtilCore.findModuleForPsiElement(this)?.targetPlatform?.version as? JvmTarget ?: JvmTarget.DEFAULT get() {
if (ServiceManager.getService(containingKtFile.project, ProjectFileIndex::class.java) == null) {
return JvmTarget.DEFAULT
}
return ModuleUtilCore.findModuleForPsiElement(this)?.targetPlatform?.version as? JvmTarget ?: JvmTarget.DEFAULT
}