azalea/kotlin-fork
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

KT-12893: fix another potential issue (could not reproduce)

Browse Source
This commit is contained in:
Alexey Andreev
2016-06-29 14:28:08 +03:00
parent 476c1ec264
commit 9a50e91cd8
1 changed files with 12 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files
idea/src/org/jetbrains/kotlin/idea/compiler/configuration/KotlinCompilerConfigurableTab.java
+12 -7
View File
@@ -152,11 +152,12 @@ public class KotlinCompilerConfigurableTab implements SearchableConfigurable, Co
ComparingUtils.isModified(generateSourceMapsCheckBox, k2jsCompilerArguments.sourceMap) ||
isModified(outputPrefixFile, k2jsCompilerArguments.outputPrefix) ||
isModified(outputPostfixFile, k2jsCompilerArguments.outputPostfix) ||
!getSelectedModuleKind().equals(k2jsCompilerArguments.moduleKind);
!getSelectedModuleKind().equals(getModuleKindOrDefault(k2jsCompilerArguments.moduleKind));
}
@NotNull
private String getSelectedModuleKind() {
return (String) moduleKindComboBox.getSelectedItem();
return getModuleKindOrDefault((String) moduleKindComboBox.getSelectedItem());
}
@Override
@@ -182,6 +183,14 @@ public class KotlinCompilerConfigurableTab implements SearchableConfigurable, Co
BuildManager.getInstance().clearState(project);
}
@NotNull
private static String getModuleKindOrDefault(@Nullable String moduleKindId) {
if (moduleKindId == null) {
moduleKindId = K2JsArgumentConstants.MODULE_PLAIN;
}
return moduleKindId;
}
@Override
public void reset() {
generateNoWarningsCheckBox.setSelected(commonCompilerArguments.suppressWarnings);
@@ -196,11 +205,7 @@ public class KotlinCompilerConfigurableTab implements SearchableConfigurable, Co
outputPrefixFile.setText(k2jsCompilerArguments.outputPrefix);
outputPostfixFile.setText(k2jsCompilerArguments.outputPostfix);
String moduleKind = k2jsCompilerArguments.moduleKind;
if (moduleKind == null) {
moduleKind = K2JsArgumentConstants.MODULE_PLAIN;
}
moduleKindComboBox.setSelectedItem(moduleKind);
moduleKindComboBox.setSelectedItem(getModuleKindOrDefault(k2jsCompilerArguments.moduleKind));
}
@Override