From cfb2a41ad2554bfe226e7d45949daf4f61e18e55 Mon Sep 17 00:00:00 2001
From: Alexander Udalov <Alexander.Udalov@jetbrains.com>
Date: Sun, 14 Feb 2016 18:01:39 +0300
Subject: [PATCH] Add MessageCollector#hasErrors, get rid of
 MessageSeverityCollector

Also fix duplicated wrapping of a message collector into a message severity
collector (in CLICompiler and in the beginning of doExecute in
K2JVMCompiler/K2JSCompiler)

Original commit: 3c81bb4bfcb0829ce9530f3399d4b08ef16c0f70
---
 .../src/org/jetbrains/kotlin/jps/build/KotlinBuilder.kt       | 4 ++++
 1 file changed, 4 insertions(+)

diff --git a/jps/jps-plugin/src/org/jetbrains/kotlin/jps/build/KotlinBuilder.kt b/jps/jps-plugin/src/org/jetbrains/kotlin/jps/build/KotlinBuilder.kt
index 105dee96734..5edbe429833 100644
--- a/jps/jps-plugin/src/org/jetbrains/kotlin/jps/build/KotlinBuilder.kt
+++ b/jps/jps-plugin/src/org/jetbrains/kotlin/jps/build/KotlinBuilder.kt
@@ -689,8 +689,10 @@ class KotlinBuilder : ModuleLevelBuilder(BuilderCategory.SOURCE_PROCESSOR) {
     }
 
     class MessageCollectorAdapter(private val context: CompileContext) : MessageCollector {
+        private var hasErrors = false
 
         override fun report(severity: CompilerMessageSeverity, message: String, location: CompilerMessageLocation) {
+            hasErrors = hasErrors or severity.isError
             var prefix = ""
             if (severity == EXCEPTION) {
                 prefix = INTERNAL_ERROR_PREFIX
@@ -705,6 +707,8 @@ class KotlinBuilder : ModuleLevelBuilder(BuilderCategory.SOURCE_PROCESSOR) {
             ))
         }
 
+        override fun hasErrors(): Boolean = hasErrors
+
         private fun renderLocationIfNeeded(location: CompilerMessageLocation): String {
             if (location == CompilerMessageLocation.NO_LOCATION) return ""