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

Drop CompilerMessageLocation.NO_LOCATION, use null everywhere instead

Browse Source
This commit is contained in:
Alexander Udalov
2017-03-31 20:39:22 +03:00
parent 861d9a1620
commit cb4d2994a3
12 changed files with 31 additions and 47 deletions
Download Patch File Download Diff File Expand all files Collapse all files
compiler/daemon/src/org/jetbrains/kotlin/daemon/KotlinRemoteReplService.kt
+2 -4
View File
@@ -98,8 +98,7 @@ open class KotlinJvmReplService(
override fun check(state: IReplStageState<*>, codeLine: ReplCodeLine): ReplCheckResult {
operationsTracer?.before("check")
try {
return replCompiler?.check(state, codeLine)
?: ReplCheckResult.Error("Initialization error", CompilerMessageLocation.NO_LOCATION)
return replCompiler?.check(state, codeLine) ?: ReplCheckResult.Error("Initialization error")
}
finally {
operationsTracer?.after("check")
@@ -109,8 +108,7 @@ open class KotlinJvmReplService(
override fun compile(state: IReplStageState<*>, codeLine: ReplCodeLine): ReplCompileResult {
operationsTracer?.before("compile")
try {
return replCompiler?.compile(state, codeLine)
?: ReplCompileResult.Error("Initialization error", CompilerMessageLocation.NO_LOCATION)
return replCompiler?.compile(state, codeLine) ?: ReplCompileResult.Error("Initialization error")
}
finally {
operationsTracer?.after("compile")
compiler/daemon/src/org/jetbrains/kotlin/daemon/report/CompileServicesFacadeMessageCollector.kt
+1 -1
View File
@@ -35,7 +35,7 @@ internal class CompileServicesFacadeMessageCollector(
}
override fun report(severity: CompilerMessageSeverity, message: String, location: CompilerMessageLocation?) {
log.info("Message: " + MessageRenderer.WITHOUT_PATHS.render(severity, message, location ?: CompilerMessageLocation.NO_LOCATION))
log.info("Message: " + MessageRenderer.WITHOUT_PATHS.render(severity, message, location))
when (severity) {
CompilerMessageSeverity.OUTPUT -> {
servicesFacade.report(ReportCategory.OUTPUT_MESSAGE, ReportSeverity.ERROR, message)