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

Fixes after review

Browse Source 
Original commit: 61de1c3212
This commit is contained in:
Ilya Chernikov
2015-08-20 17:36:26 +02:00
parent 9edbe4f0d6
commit 4145f431a0
1 changed files with 4 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files
jps/jps-plugin/src/org/jetbrains/kotlin/compilerRunner/KotlinCompilerRunner.java
+4 -3
View File
@@ -62,7 +62,8 @@ public class KotlinCompilerRunner {
CompilerSettings compilerSettings, CompilerSettings compilerSettings,
MessageCollector messageCollector, MessageCollector messageCollector,
CompilerEnvironment environment, CompilerEnvironment environment,
Map<String, IncrementalCache> incrementalCaches, File moduleFile, Map<String, IncrementalCache> incrementalCaches,
File moduleFile,
OutputItemsCollector collector OutputItemsCollector collector
) { ) {
K2JVMCompilerArguments arguments = mergeBeans(commonArguments, k2jvmArguments); K2JVMCompilerArguments arguments = mergeBeans(commonArguments, k2jvmArguments);
@@ -78,7 +79,8 @@ public class KotlinCompilerRunner {
@NotNull CompilerSettings compilerSettings, @NotNull CompilerSettings compilerSettings,
@NotNull MessageCollector messageCollector, @NotNull MessageCollector messageCollector,
@NotNull CompilerEnvironment environment, @NotNull CompilerEnvironment environment,
Map<String, IncrementalCache> incrementalCaches, @NotNull OutputItemsCollector collector, Map<String, IncrementalCache> incrementalCaches,
@NotNull OutputItemsCollector collector,
@NotNull Collection<File> sourceFiles, @NotNull Collection<File> sourceFiles,
@NotNull List<String> libraryFiles, @NotNull List<String> libraryFiles,
@NotNull File outputFile @NotNull File outputFile
@@ -156,7 +158,6 @@ public class KotlinCompilerRunner {
// exec() returns an ExitCode object, class of which is loaded with a different class loader, // exec() returns an ExitCode object, class of which is loaded with a different class loader,
// so we take it's contents through reflection // so we take it's contents through reflection
return getReturnCodeFromObject(rc); return getReturnCodeFromObject(rc);
} }
catch (Throwable e) { catch (Throwable e) {
MessageCollectorUtil.reportException(messageCollector, e); MessageCollectorUtil.reportException(messageCollector, e);