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

Temporary change gradle output to show it in MessageView in Android-Studio

Browse Source
This commit is contained in:
Natalia.Ukhorskaya
2013-08-09 12:22:33 +04:00
parent 3f7627120b
commit 2436ed1a17
1 changed files with 12 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files
libraries/tools/kotlin-gradle-plugin-core/src/main/kotlin/org/jetbrains/kotlin/gradle/tasks/Tasks.kt
+12 -5
View File
@@ -231,15 +231,22 @@ public open class KDoc(): SourceTask() {
class GradleMessageCollector(val logger : Logger): MessageCollector { class GradleMessageCollector(val logger : Logger): MessageCollector {
public override fun report(severity: CompilerMessageSeverity, message: String, location: CompilerMessageLocation) { public override fun report(severity: CompilerMessageSeverity, message: String, location: CompilerMessageLocation) {
val path = location.getPath() val path = location.getPath()
val position = if (path != null) (path + ": (" + location.getLine() + ", " + location.getColumn() + ") ") else "" val hasLocation = path != null && location.getLine() > 0 && location.getColumn() > 0
val text: String
val text = position + message if (hasLocation) {
val warningPrefix = if (severity == CompilerMessageSeverity.WARNING) "warning:" else ""
val errorMarkerLine = "${" ".repeat(location.getColumn() - 1)}^"
text = "$path:${location.getLine()}:$warningPrefix$message\n${errorMarkerLine}"
}
else {
text = "${severity.name().toLowerCase()}:$message"
}
when (severity) { when (severity) {
in CompilerMessageSeverity.VERBOSE -> logger.debug(text) in CompilerMessageSeverity.VERBOSE -> logger.debug(text)
in CompilerMessageSeverity.ERRORS -> logger.error(text) in CompilerMessageSeverity.ERRORS -> logger.error(text)
CompilerMessageSeverity.INFO -> logger.info(text) CompilerMessageSeverity.INFO -> logger.info(text)
else -> logger.warn(text) CompilerMessageSeverity.WARNING -> logger.error(text)
else -> throw IllegalArgumentException("Unknown CompilerMessageSeverity: $severity")
} }
} }
} }