From 2436ed1a17e629a0e3a18d8935eac450d622ef66 Mon Sep 17 00:00:00 2001 From: "Natalia.Ukhorskaya" Date: Fri, 9 Aug 2013 12:22:33 +0400 Subject: [PATCH] Temporary change gradle output to show it in MessageView in Android-Studio --- .../org/jetbrains/kotlin/gradle/tasks/Tasks.kt | 17 ++++++++++++----- 1 file changed, 12 insertions(+), 5 deletions(-) diff --git a/libraries/tools/kotlin-gradle-plugin-core/src/main/kotlin/org/jetbrains/kotlin/gradle/tasks/Tasks.kt b/libraries/tools/kotlin-gradle-plugin-core/src/main/kotlin/org/jetbrains/kotlin/gradle/tasks/Tasks.kt index 2513eec80c2..84c0925005f 100644 --- a/libraries/tools/kotlin-gradle-plugin-core/src/main/kotlin/org/jetbrains/kotlin/gradle/tasks/Tasks.kt +++ b/libraries/tools/kotlin-gradle-plugin-core/src/main/kotlin/org/jetbrains/kotlin/gradle/tasks/Tasks.kt @@ -231,15 +231,22 @@ public open class KDoc(): SourceTask() { class GradleMessageCollector(val logger : Logger): MessageCollector { public override fun report(severity: CompilerMessageSeverity, message: String, location: CompilerMessageLocation) { val path = location.getPath() - val position = if (path != null) (path + ": (" + location.getLine() + ", " + location.getColumn() + ") ") else "" - - val text = position + message - + val hasLocation = path != null && location.getLine() > 0 && location.getColumn() > 0 + val text: String + 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) { in CompilerMessageSeverity.VERBOSE -> logger.debug(text) in CompilerMessageSeverity.ERRORS -> logger.error(text) CompilerMessageSeverity.INFO -> logger.info(text) - else -> logger.warn(text) + CompilerMessageSeverity.WARNING -> logger.error(text) + else -> throw IllegalArgumentException("Unknown CompilerMessageSeverity: $severity") } } }