From cb71a283b21dafea207b25a53155b549c6a7158e Mon Sep 17 00:00:00 2001
From: Kirill Biakov <kbiakov@gmail.com>
Date: Sat, 9 Sep 2017 21:28:01 +0300
Subject: [PATCH] Fixed applying html tags before highlighting

---
 .../kbiakov/codeview/adapters/AbstractCodeAdapter.kt       | 7 +++++--
 1 file changed, 5 insertions(+), 2 deletions(-)

diff --git a/codeview/src/main/java/io/github/kbiakov/codeview/adapters/AbstractCodeAdapter.kt b/codeview/src/main/java/io/github/kbiakov/codeview/adapters/AbstractCodeAdapter.kt
index 8870d99..93cdd08 100644
--- a/codeview/src/main/java/io/github/kbiakov/codeview/adapters/AbstractCodeAdapter.kt
+++ b/codeview/src/main/java/io/github/kbiakov/codeview/adapters/AbstractCodeAdapter.kt
@@ -29,7 +29,7 @@ import java.util.*
 abstract class AbstractCodeAdapter<T> : RecyclerView.Adapter<AbstractCodeAdapter.ViewHolder> {
 
     protected val context: Context
-    protected var lines: List<String> = ArrayList() // items
+    protected var lines: List<String> = ArrayList()
     protected var droppedLines: List<String>? = null
 
     internal var options: Options
@@ -157,6 +157,7 @@ abstract class AbstractCodeAdapter<T> : RecyclerView.Adapter<AbstractCodeAdapter
      */
     private fun updateContent(code: String, onUpdated: () -> Unit) {
         options.code = code
+        options.isHighlighted = true
         prepareCodeLines()
         ui(onUpdated)
     }
@@ -227,7 +228,7 @@ abstract class AbstractCodeAdapter<T> : RecyclerView.Adapter<AbstractCodeAdapter
                 }
             }
             tvLineContent.apply {
-                text = html(lines[pos])
+                text = lines[pos].let { if (options.isHighlighted) html(it) else it }
                 textSize = fontSize
                 setTextColor(options.theme.noteColor.color())
             }
@@ -333,6 +334,8 @@ data class Options(
         var maxLines: Int = 0,
         var lineClickListener: OnCodeLineClickListener? = null) {
 
+    internal var isHighlighted: Boolean = false
+
     fun withCode(code: String): Options {
         this.code = code
         return this