From 9ef5970f927e9e262e3287db54f1e0b06f1f8176 Mon Sep 17 00:00:00 2001 From: Andrey Uskov Date: Mon, 25 May 2020 21:36:35 +0300 Subject: [PATCH] Fixed KNPE when serialized Kotlin Facet is broken #KT-37428 Fixed Original commit: 104eeb9ffdf3d187a29106842250d4a1dff997c4 --- .../org/jetbrains/kotlin/config/KotlinFacetSettings.kt | 8 ++++++-- 1 file changed, 6 insertions(+), 2 deletions(-) diff --git a/jps/jps-common/src/org/jetbrains/kotlin/config/KotlinFacetSettings.kt b/jps/jps-common/src/org/jetbrains/kotlin/config/KotlinFacetSettings.kt index 2e2ec9eb36d..372eb485866 100644 --- a/jps/jps-common/src/org/jetbrains/kotlin/config/KotlinFacetSettings.kt +++ b/jps/jps-common/src/org/jetbrains/kotlin/config/KotlinFacetSettings.kt @@ -237,13 +237,17 @@ class KotlinFacetSettings { var languageLevel: LanguageVersion? get() = compilerArguments?.languageVersion?.let { LanguageVersion.fromFullVersionString(it) } set(value) { - compilerArguments!!.languageVersion = value?.versionString + compilerArguments?.apply { + languageVersion = value?.versionString + } } var apiLevel: LanguageVersion? get() = compilerArguments?.apiVersion?.let { LanguageVersion.fromFullVersionString(it) } set(value) { - compilerArguments!!.apiVersion = value?.versionString + compilerArguments?.apply { + apiVersion = value?.versionString + } } var targetPlatform: TargetPlatform? = null