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
2016-06-29 11:31:03 +03:00
parent a8af654a20
commit 3a3e7bb814
1 changed files with 5 additions and 1 deletions
@@ -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