From 88540360b44a2e388645cc693c25a7d461251933 Mon Sep 17 00:00:00 2001 From: Alexey Sedunov Date: Mon, 18 Dec 2017 18:17:31 +0300 Subject: [PATCH] Misc: Fix NPE on external project import --- idea/src/org/jetbrains/kotlin/idea/facet/facetUtils.kt | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) diff --git a/idea/src/org/jetbrains/kotlin/idea/facet/facetUtils.kt b/idea/src/org/jetbrains/kotlin/idea/facet/facetUtils.kt index 04ae7da78d3..8f0e904a146 100644 --- a/idea/src/org/jetbrains/kotlin/idea/facet/facetUtils.kt +++ b/idea/src/org/jetbrains/kotlin/idea/facet/facetUtils.kt @@ -219,9 +219,10 @@ fun KotlinFacet.configureFacet( platformKind, compilerVersion ) - // Both apiLevel and languageLevel should be initialized in the lines above - if (apiLevel!! > languageLevel!!) { - apiLevel = languageLevel + val apiLevel = apiLevel + val languageLevel = languageLevel + if (languageLevel != null && apiLevel != null && apiLevel > languageLevel) { + this.apiLevel = languageLevel } this.coroutineSupport = coroutineSupport }