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

Refresh FS after compilation for js and sourcemap files.

Browse Source 
Original commit: 1409dd7812
This commit is contained in:
Zalim Bashorov
2013-11-08 12:26:39 +04:00
parent 372c0e944b
commit a5fbb9e61b
1 changed files with 18 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files
jps/jps-plugin/src/org/jetbrains/jet/jps/build/KotlinBuilder.java
+18 -6
View File
@@ -51,7 +51,9 @@ import java.lang.reflect.Field;
import java.lang.reflect.Modifier; import java.lang.reflect.Modifier;
import java.util.*; import java.util.*;
import static org.jetbrains.jet.cli.common.messages.CompilerMessageLocation.NO_LOCATION;
import static org.jetbrains.jet.cli.common.messages.CompilerMessageSeverity.*; import static org.jetbrains.jet.cli.common.messages.CompilerMessageSeverity.*;
import static org.jetbrains.jet.compiler.runner.CompilerRunnerConstants.INTERNAL_ERROR_PREFIX;
import static org.jetbrains.jet.compiler.runner.KotlinCompilerRunner.runK2JsCompiler; import static org.jetbrains.jet.compiler.runner.KotlinCompilerRunner.runK2JsCompiler;
import static org.jetbrains.jet.compiler.runner.KotlinCompilerRunner.runK2JvmCompiler; import static org.jetbrains.jet.compiler.runner.KotlinCompilerRunner.runK2JvmCompiler;
@@ -87,11 +89,11 @@ public class KotlinBuilder extends ModuleLevelBuilder {
MessageCollector messageCollector = new MessageCollectorAdapter(context); MessageCollector messageCollector = new MessageCollectorAdapter(context);
// Workaround for Android Studio // Workaround for Android Studio
if (!isJavaPluginEnabled(context)) { if (!isJavaPluginEnabled(context)) {
messageCollector.report(INFO, "Kotlin JPS plugin is disabled", CompilerMessageLocation.NO_LOCATION); messageCollector.report(INFO, "Kotlin JPS plugin is disabled", NO_LOCATION);
return ExitCode.NOTHING_DONE; return ExitCode.NOTHING_DONE;
} }
messageCollector.report(INFO, "Kotlin JPS plugin version " + KotlinVersion.VERSION, CompilerMessageLocation.NO_LOCATION); messageCollector.report(INFO, "Kotlin JPS plugin version " + KotlinVersion.VERSION, NO_LOCATION);
ModuleBuildTarget representativeTarget = chunk.representativeTarget(); ModuleBuildTarget representativeTarget = chunk.representativeTarget();
@@ -128,7 +130,7 @@ public class KotlinBuilder extends ModuleLevelBuilder {
WARNING, "Circular dependencies are not supported. " + WARNING, "Circular dependencies are not supported. " +
"The following JS modules depend on each other: " + StringUtil.join(chunk.getModules(), MODULE_NAME, ", ") + ". " + "The following JS modules depend on each other: " + StringUtil.join(chunk.getModules(), MODULE_NAME, ", ") + ". " +
"Kotlin is not compiled for these modules", "Kotlin is not compiled for these modules",
CompilerMessageLocation.NO_LOCATION); NO_LOCATION);
return ExitCode.NOTHING_DONE; return ExitCode.NOTHING_DONE;
} }
@@ -152,7 +154,7 @@ public class KotlinBuilder extends ModuleLevelBuilder {
WARNING, "Circular dependencies are only partially supported. " + WARNING, "Circular dependencies are only partially supported. " +
"The following modules depend on each other: " + StringUtil.join(chunk.getModules(), MODULE_NAME, ", ") + ". " + "The following modules depend on each other: " + StringUtil.join(chunk.getModules(), MODULE_NAME, ", ") + ". " +
"Kotlin will compile them, but some strange effect may happen", "Kotlin will compile them, but some strange effect may happen",
CompilerMessageLocation.NO_LOCATION); NO_LOCATION);
} }
File moduleFile = KotlinBuilderModuleScriptGenerator.generateModuleDescription(context, chunk); File moduleFile = KotlinBuilderModuleScriptGenerator.generateModuleDescription(context, chunk);
@@ -178,7 +180,17 @@ public class KotlinBuilder extends ModuleLevelBuilder {
} }
for (SimpleOutputItem outputItem : outputItemCollector.getOutputs()) { for (SimpleOutputItem outputItem : outputItemCollector.getOutputs()) {
BuildTarget<?> target = sourceToTarget.get(outputItem.getSourceFiles().iterator().next()); BuildTarget<?> target = null;
Collection<File> sourceFiles = outputItem.getSourceFiles();
if (sourceFiles != null && !sourceFiles.isEmpty()) {
target = sourceToTarget.get(sourceFiles.iterator().next());
}
else {
messageCollector.report(ERROR,
INTERNAL_ERROR_PREFIX + "outputItem.sourceFiles is null or empty, outputItem = " + outputItem,
NO_LOCATION);
}
outputConsumer.registerOutputFile( outputConsumer.registerOutputFile(
target != null ? target : representativeTarget, target != null ? target : representativeTarget,
outputItem.getOutputFile(), outputItem.getOutputFile(),
@@ -235,7 +247,7 @@ public class KotlinBuilder extends ModuleLevelBuilder {
) { ) {
String prefix = ""; String prefix = "";
if (severity == EXCEPTION) { if (severity == EXCEPTION) {
prefix = CompilerRunnerConstants.INTERNAL_ERROR_PREFIX; prefix = INTERNAL_ERROR_PREFIX;
} }
context.processMessage(new CompilerMessage( context.processMessage(new CompilerMessage(
CompilerRunnerConstants.KOTLIN_COMPILER_NAME, CompilerRunnerConstants.KOTLIN_COMPILER_NAME,