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

[CLI] Provide MessageCollector based logger for IR from CLI

Browse Source
This commit is contained in:
Roman Artemev
2021-01-25 23:35:33 +03:00
parent daa65a2fff
commit 9fa5feeeea
2 changed files with 34 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files
compiler/cli/src/org/jetbrains/kotlin/cli/common/CLICompiler.kt
+4 -1
View File
@@ -30,6 +30,7 @@ import org.jetbrains.kotlin.cli.jvm.plugins.PluginCliParser
import org.jetbrains.kotlin.compiler.plugin.ComponentRegistrar
import org.jetbrains.kotlin.config.CompilerConfiguration
import org.jetbrains.kotlin.config.Services
import org.jetbrains.kotlin.ir.util.IrMessageLogger
import org.jetbrains.kotlin.metadata.deserialization.BinaryVersion
import org.jetbrains.kotlin.progress.CompilationCanceledException
import org.jetbrains.kotlin.progress.CompilationCanceledStatus
@@ -39,7 +40,7 @@ import org.jetbrains.kotlin.utils.KotlinPaths
import org.jetbrains.kotlin.utils.PathUtil
import java.io.File
import java.io.PrintStream
import java.util.ArrayList
import java.util.*
abstract class CLICompiler<A : CommonCompilerArguments> : CLITool<A>() {
@@ -69,6 +70,8 @@ abstract class CLICompiler<A : CommonCompilerArguments> : CLITool<A>() {
configuration.put(CLIConfigurationKeys.MESSAGE_COLLECTOR_KEY, it)
}
configuration.put(IrMessageLogger.IR_MESSAGE_LOGGER, IrMessageCollector(collector))
configuration.put(CLIConfigurationKeys.PERF_MANAGER, performanceManager)
try {
setupCommonArguments(configuration, arguments)
compiler/cli/src/org/jetbrains/kotlin/cli/common/messages/IrMessageCollector.kt
+30
View File
@@ -0,0 +1,30 @@
/*
* Copyright 2010-2021 JetBrains s.r.o. and Kotlin Programming Language contributors.
* Use of this source code is governed by the Apache 2.0 license that can be found in the license/LICENSE.txt file.
*/
package org.jetbrains.kotlin.cli.common.messages
import org.jetbrains.kotlin.ir.util.IrMessageLogger
class IrMessageCollector(private val messageCollector: MessageCollector) : IrMessageLogger {
override fun report(severity: IrMessageLogger.Severity, message: String, location: IrMessageLogger.Location?) {
messageCollector.report(severityToCLISeverity(severity), message, locationToCLILocation(location))
}
companion object {
private fun severityToCLISeverity(severity: IrMessageLogger.Severity): CompilerMessageSeverity {
return when (severity) {
IrMessageLogger.Severity.INFO -> CompilerMessageSeverity.INFO
IrMessageLogger.Severity.WARNING -> CompilerMessageSeverity.WARNING
IrMessageLogger.Severity.ERROR -> CompilerMessageSeverity.ERROR
}
}
private fun locationToCLILocation(location: IrMessageLogger.Location?): CompilerMessageLocation? {
return location?.run {
CompilerMessageLocation.Companion.create(filePath, line, column, null)
}
}
}
}