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

KotlinOutputParser: do not amend next line to warnings

Browse Source 
#KT-9678 Fixed #KT-10129 Fixed
This commit is contained in:
Natalia Ukhorskaya
2015-11-25 12:47:16 +03:00
parent 0d80b4f8b0
commit f40e3857fa
1 changed files with 2 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files
idea/kotlin-android-plugin/src/org/jetbrains/kotlin/android/KotlinOutputParserHelper.kt
+2 -2
View File
@@ -25,7 +25,6 @@ import java.io.File
import java.lang.reflect.Constructor import java.lang.reflect.Constructor
import java.util.* import java.util.*
import java.util.regex.Pattern import java.util.regex.Pattern
import kotlin.reflect.jvm.*
import java.lang.reflect.Array as RArray import java.lang.reflect.Array as RArray
fun parse(line: String, reader: OutputLineReader, messages: MutableList<Any>, logger: ILogger): Boolean { fun parse(line: String, reader: OutputLineReader, messages: MutableList<Any>, logger: ILogger): Boolean {
@@ -107,7 +106,8 @@ private fun String.amendNextLinesIfNeeded(reader: OutputLineReader): String {
private fun String.isNextMessage(): Boolean { private fun String.isNextMessage(): Boolean {
val colonIndex1 = indexOf(COLON) val colonIndex1 = indexOf(COLON)
return (colonIndex1 >= 0 && substring(0, colonIndex1).startsWithSeverityPrefix()) return colonIndex1 == 0
|| (colonIndex1 >= 0 && substring(0, colonIndex1).startsWithSeverityPrefix()) // Next Kotlin message
|| StringUtil.containsIgnoreCase(this, "FAILURE") || StringUtil.containsIgnoreCase(this, "FAILURE")
|| StringUtil.containsIgnoreCase(this, "FAILED") || StringUtil.containsIgnoreCase(this, "FAILED")
} }