From 3a3e7bb814e37d61897539beffe7b3c975784fc8 Mon Sep 17 00:00:00 2001
From: Alexey Andreev <Alexey.Andreev@jetbrains.com>
Date: Wed, 29 Jun 2016 11:31:03 +0300
Subject: [PATCH] KT-12893: when opening Kotlin compiler settings while
 kotlinc.xml does not specify which module kind to use, fallback to default
 value ("plain"). Fix #KT-12893

---
 .../configuration/KotlinCompilerConfigurableTab.java        | 6 +++++-
 1 file changed, 5 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 4f7592b6054..3d9bb5e5285 100644
--- a/idea/src/org/jetbrains/kotlin/idea/compiler/configuration/KotlinCompilerConfigurableTab.java
+++ b/idea/src/org/jetbrains/kotlin/idea/compiler/configuration/KotlinCompilerConfigurableTab.java
@@ -196,7 +196,11 @@ public class KotlinCompilerConfigurableTab implements SearchableConfigurable, Co
         outputPrefixFile.setText(k2jsCompilerArguments.outputPrefix);
         outputPostfixFile.setText(k2jsCompilerArguments.outputPostfix);
 
-        moduleKindComboBox.setSelectedItem(k2jsCompilerArguments.moduleKind);
+        String moduleKind = k2jsCompilerArguments.moduleKind;
+        if (moduleKind == null) {
+            moduleKind = K2JsArgumentConstants.MODULE_PLAIN;
+        }
+        moduleKindComboBox.setSelectedItem(moduleKind);
     }
 
     @Override