From b04cbf537f2dd77d9164d83165436c8bc7dbf265 Mon Sep 17 00:00:00 2001 From: Alexey Sedunov Date: Wed, 29 Mar 2017 23:03:54 +0300 Subject: [PATCH] Kotlin Facet: Fix IAE on null module kind in multi-editor #KT-17145 Fixed --- .../compiler/configuration/KotlinCompilerConfigurableTab.java | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/idea/src/org/jetbrains/kotlin/idea/compiler/configuration/KotlinCompilerConfigurableTab.java b/idea/src/org/jetbrains/kotlin/idea/compiler/configuration/KotlinCompilerConfigurableTab.java index 0ee9409d888..0a959fdcc46 100644 --- a/idea/src/org/jetbrains/kotlin/idea/compiler/configuration/KotlinCompilerConfigurableTab.java +++ b/idea/src/org/jetbrains/kotlin/idea/compiler/configuration/KotlinCompilerConfigurableTab.java @@ -245,7 +245,8 @@ public class KotlinCompilerConfigurableTab implements SearchableConfigurable, Co } @NotNull - private static String getModuleKindDescription(@NotNull String moduleKind) { + private static String getModuleKindDescription(@Nullable String moduleKind) { + if (moduleKind == null) return ""; String result = moduleKindDescriptions.get(moduleKind); assert result != null : "Module kind " + moduleKind + " was not added to combobox, therefore it should not be here"; return result;