From 0638106bf3773cb8b07b5b6bc004ccfa4ac0002d Mon Sep 17 00:00:00 2001 From: Dmitry Jemerov Date: Thu, 16 Mar 2017 16:45:23 +0100 Subject: [PATCH] Fix NPE in tests when ProjectFileIndex is not available --- .../src/org/jetbrains/kotlin/idea/project/Platform.kt | 7 ++++++- 1 file changed, 6 insertions(+), 1 deletion(-) diff --git a/idea/idea-analysis/src/org/jetbrains/kotlin/idea/project/Platform.kt b/idea/idea-analysis/src/org/jetbrains/kotlin/idea/project/Platform.kt index 1ae2b8841c3..08063c1263e 100644 --- a/idea/idea-analysis/src/org/jetbrains/kotlin/idea/project/Platform.kt +++ b/idea/idea-analysis/src/org/jetbrains/kotlin/idea/project/Platform.kt @@ -147,4 +147,9 @@ val KtElement.languageVersionSettings: LanguageVersionSettings } 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 + }