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

Minor: rename CompilationResultSink->CompilationResults

Browse Source
This commit is contained in:
Alexey Tsvetkov
2017-01-13 13:06:05 +03:00
parent bdae0b5efb
commit 3d07c40887
6 changed files with 14 additions and 14 deletions
Download Patch File Download Diff File Expand all files Collapse all files
compiler/daemon/daemon-common/src/org/jetbrains/kotlin/daemon/common/CompilationResultsSink.kt → compiler/daemon/daemon-common/src/org/jetbrains/kotlin/daemon/common/CompilationResults.kt
+2 -2
View File
@@ -20,9 +20,9 @@ import java.io.Serializable
import java.rmi.Remote
import java.rmi.RemoteException
interface CompilationResultsSink : Remote {
interface CompilationResults : Remote {
@Throws(RemoteException::class)
fun push(compilationResultCategory: Int, value: Serializable)
fun add(compilationResultCategory: Int, value: Serializable)
}
enum class CompilationResultCategory(val code: Int) {
compiler/daemon/daemon-common/src/org/jetbrains/kotlin/daemon/common/CompileService.kt
+1 -1
View File
@@ -135,7 +135,7 @@ interface CompileService : Remote {
compilerArguments: Array<String>,
compilationOptions: CompilationOptions,
servicesFacade: CompilerServicesFacadeBase,
compilationResultsSink: CompilationResultsSink?
compilationResults: CompilationResults?
): CallResult<Int>
@Throws(RemoteException::class)
compiler/daemon/src/org/jetbrains/kotlin/daemon/CompileServiceImpl.kt
+4 -4
View File
@@ -319,7 +319,7 @@ class CompileServiceImpl(
compilerArguments: Array<String>,
compilationOptions: CompilationOptions,
servicesFacade: CompilerServicesFacadeBase,
compilationResultsSink: CompilationResultsSink?
compilationResults: CompilationResults?
): CompileService.CallResult<Int> {
val messageCollector = CompileServicesFacadeMessageCollector(servicesFacade, compilationOptions)
val daemonReporter = DaemonMessageReporter(servicesFacade, compilationOptions)
@@ -362,7 +362,7 @@ class CompileServiceImpl(
withIC {
doCompile(sessionId, daemonReporter, tracer = null) { eventManger, profiler ->
execIncrementalCompiler(k2jvmArgs, gradleIncrementalArgs, gradleIncrementalServicesFacade, compilationResultsSink!!,
execIncrementalCompiler(k2jvmArgs, gradleIncrementalArgs, gradleIncrementalServicesFacade, compilationResults!!,
messageCollector, daemonReporter)
}
}
@@ -394,11 +394,11 @@ class CompileServiceImpl(
k2jvmArgs: K2JVMCompilerArguments,
incrementalCompilationOptions: IncrementalCompilationOptions,
servicesFacade: IncrementalCompilerServicesFacade,
compilationResultsSink: CompilationResultsSink,
compilationResults: CompilationResults,
compilerMessageCollector: MessageCollector,
daemonMessageReporter: DaemonMessageReporter
): ExitCode {
val reporter = RemoteICReporter(servicesFacade, compilationResultsSink, incrementalCompilationOptions)
val reporter = RemoteICReporter(servicesFacade, compilationResults, incrementalCompilationOptions)
val annotationFileUpdater = if (servicesFacade.hasAnnotationsFileUpdater()) RemoteAnnotationsFileUpdater(servicesFacade) else null
val moduleFile = k2jvmArgs.module?.let(::File)
compiler/daemon/src/org/jetbrains/kotlin/daemon/report/RemoteICReporter.kt
+2 -2
View File
@@ -24,7 +24,7 @@ import java.io.Serializable
internal class RemoteICReporter(
private val servicesFacade: CompilerServicesFacadeBase,
private val compilationResultsSink: CompilationResultsSink,
private val compilationResults: CompilationResults,
compilationOptions: CompilationOptions
) : ICReporter {
private val shouldReportMessages = ReportCategory.IC_MESSAGE.code in compilationOptions.reportCategories
@@ -39,7 +39,7 @@ internal class RemoteICReporter(
override fun reportCompileIteration(sourceFiles: Collection<File>, exitCode: ExitCode) {
if (shouldReportCompileIteration) {
compilationResultsSink.push(CompilationResultCategory.IC_COMPILE_ITERATION.code, CompileIterationResult(sourceFiles, exitCode.toString()))
compilationResults.add(CompilationResultCategory.IC_COMPILE_ITERATION.code, CompileIterationResult(sourceFiles, exitCode.toString()))
}
}
}