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

Fix JS translator JPS runner

Browse Source
This commit is contained in:
Alexander Udalov
2014-07-24 21:38:05 +04:00
parent 485cc906a4
commit ec6b158c0e
1 changed files with 17 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files
ide-compiler-runner/src/org/jetbrains/jet/compiler/runner/ArgumentUtils.java
+17 -7
View File
@@ -21,6 +21,7 @@ import com.intellij.util.Function;
import com.intellij.util.containers.ComparatorUtil; import com.intellij.util.containers.ComparatorUtil;
import com.sampullara.cli.Argument; import com.sampullara.cli.Argument;
import org.jetbrains.annotations.NotNull; import org.jetbrains.annotations.NotNull;
import org.jetbrains.jet.cli.common.arguments.CommonCompilerArguments;
import java.lang.reflect.Field; import java.lang.reflect.Field;
import java.util.ArrayList; import java.util.ArrayList;
@@ -30,18 +31,22 @@ public class ArgumentUtils {
private ArgumentUtils() {} private ArgumentUtils() {}
@NotNull @NotNull
public static <T> List<String> convertArgumentsToStringList(@NotNull T arguments, @NotNull T defaultArguments) { public static <T extends CommonCompilerArguments> List<String> convertArgumentsToStringList(
@NotNull T arguments,
@NotNull T defaultArguments
) {
List<String> result = new ArrayList<String>(); List<String> result = new ArrayList<String>();
convertArgumentsToStringList(arguments, defaultArguments, arguments.getClass(), result); convertArgumentsToStringList(arguments, defaultArguments, arguments.getClass(), result);
result.addAll(arguments.freeArgs);
return result; return result;
} }
private static <T> void convertArgumentsToStringList(T arguments, T defaultArguments, Class clazz, List<String> result) { private static <T extends CommonCompilerArguments> void convertArgumentsToStringList(
Class superClazz = clazz.getSuperclass(); @NotNull T arguments,
if (superClazz != null) { @NotNull T defaultArguments,
convertArgumentsToStringList(arguments, defaultArguments, superClazz, result); @NotNull Class<?> clazz,
} @NotNull List<String> result
) {
for (Field field : clazz.getDeclaredFields()) { for (Field field : clazz.getDeclaredFields()) {
Argument argument = field.getAnnotation(Argument.class); Argument argument = field.getAnnotation(Argument.class);
if (argument == null) continue; if (argument == null) continue;
@@ -79,6 +84,11 @@ public class ArgumentUtils {
result.add(value.toString()); result.add(value.toString());
} }
Class<?> superClazz = clazz.getSuperclass();
if (superClazz != null) {
convertArgumentsToStringList(arguments, defaultArguments, superClazz, result);
}
} }
private static String getAlias(Argument argument) { private static String getAlias(Argument argument) {