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

KT-3008 Add UI that allows to change module kind in IDEA Kotlin configurator

Browse Source
This commit is contained in:
Alexey Andreev
2016-04-22 14:06:16 +03:00
parent 496539d101
commit b090b79d92
6 changed files with 71 additions and 14 deletions
Download Patch File Download Diff File Expand all files Collapse all files
compiler/cli/cli-common/src/org/jetbrains/kotlin/cli/common/arguments/K2JSCompilerArguments.java
+5
View File
@@ -24,6 +24,11 @@ import static org.jetbrains.kotlin.cli.common.arguments.K2JsArgumentConstants.CA
import static org.jetbrains.kotlin.cli.common.arguments.K2JsArgumentConstants.NO_CALL;
public class K2JSCompilerArguments extends CommonCompilerArguments {
public static final String MODULE_PLAIN = "plain";
public static final String MODULE_AMD = "amd";
public static final String MODULE_COMMONJS = "commonjs";
public static final String MODULE_UMD = "umd";
@Argument(value = "output", description = "Output file path")
@ValueDescription("<path>")
public String outputFile;
compiler/cli/src/org/jetbrains/kotlin/cli/js/K2JSCompiler.java
+4 -4
View File
@@ -278,16 +278,16 @@ public class K2JSCompiler extends CLICompiler<K2JSCompilerArguments> {
ModuleKind moduleKind = ModuleKind.PLAIN;
if (moduleKindName != null) {
moduleKindName = moduleKindName.toLowerCase();
if (moduleKindName.equals("plain")) {
if (moduleKindName.equals(K2JSCompilerArguments.MODULE_PLAIN)) {
moduleKind = ModuleKind.PLAIN;
}
else if (moduleKindName.equals("amd")) {
else if (moduleKindName.equals(K2JSCompilerArguments.MODULE_AMD)) {
moduleKind = ModuleKind.AMD;
}
else if (moduleKindName.equals("commonjs")) {
else if (moduleKindName.equals(K2JSCompilerArguments.MODULE_COMMONJS)) {
moduleKind = ModuleKind.COMMON_JS;
}
else if (moduleKindName.equals("umd")) {
else if (moduleKindName.equals(K2JSCompilerArguments.MODULE_UMD)) {
moduleKind = ModuleKind.UMD;
}
else {