From ffe8ae3840d7b9bdc82170c8181031f05ced68bd Mon Sep 17 00:00:00 2001
From: Natalia Ukhorskaya <natalia.ukhorskaya@jetbrains.com>
Date: Wed, 1 Oct 2014 17:55:38 +0400
Subject: [PATCH] kotlin-gradle-plugin: change output format

---
 .../jetbrains/kotlin/gradle/tasks/Tasks.kt    | 34 +++++++++++++------
 1 file changed, 24 insertions(+), 10 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 ff292cee73b..18fddfa84f7 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
@@ -213,16 +213,30 @@ fun getAnnotations(project: Project, logger: Logger): Collection<File> {
 
 class GradleMessageCollector(val logger : Logger): MessageCollector {
     public override fun report(severity: CompilerMessageSeverity, message: String, location: CompilerMessageLocation) {
-        val path = location.getPath()
-        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"
+        val text = with(StringBuilder()) {
+            append(when (severity) {
+                in CompilerMessageSeverity.VERBOSE -> "v"
+                in CompilerMessageSeverity.ERRORS -> "e"
+                CompilerMessageSeverity.INFO -> "i"
+                CompilerMessageSeverity.WARNING -> "w"
+                else -> throw IllegalArgumentException("Unknown CompilerMessageSeverity: $severity")
+            })
+            append(": ")
+
+            val path = location.getPath()
+            if (path != null) {
+                append(path)
+                append(": ")
+                append("(")
+                append(location.getLine())
+                append(", ")
+                append(location.getColumn())
+                append("): ")
+            }
+
+            append(message)
+
+            toString()
         }
         when (severity) {
             in CompilerMessageSeverity.VERBOSE -> logger.debug(text)