From 48027f5fb5a98f5c53937a219e3c12ef3d34c0ba Mon Sep 17 00:00:00 2001
From: Natalia Ukhorskaya <natalia.ukhorskaya@jetbrains.com>
Date: Tue, 24 Nov 2015 19:05:37 +0300
Subject: [PATCH] Fix compatibility with AS 2.0  #KT-10153 Fixed

---
 .../kotlin/android/KotlinOutputParserHelper.kt     | 14 +++++++++++++-
 1 file changed, 13 insertions(+), 1 deletion(-)

diff --git a/idea/kotlin-android-plugin/src/org/jetbrains/kotlin/android/KotlinOutputParserHelper.kt b/idea/kotlin-android-plugin/src/org/jetbrains/kotlin/android/KotlinOutputParserHelper.kt
index 8bfc213796c..b308627bf4a 100644
--- a/idea/kotlin-android-plugin/src/org/jetbrains/kotlin/android/KotlinOutputParserHelper.kt
+++ b/idea/kotlin-android-plugin/src/org/jetbrains/kotlin/android/KotlinOutputParserHelper.kt
@@ -88,7 +88,19 @@ private fun String.amendNextLinesIfNeeded(reader: OutputLineReader): String {
         nextLine = reader.readLine()
     }
 
-    if (nextLine != null) reader.pushBack(nextLine)
+    if (nextLine != null) {
+        // This code is needed for compatibility with AS 2.0 and IDEA 15.0, because of difference in android plugins
+        val positionField = try {
+            reader.javaClass.getDeclaredField("myPosition")
+        }
+        catch(e: Throwable) {
+            null
+        }
+        if (positionField != null) {
+            positionField.isAccessible = true
+            positionField.setInt(reader, positionField.getInt(reader) - 1)
+        }
+    }
 
     return builder.toString()
 }