Merge pull request #14 from Softwee/fix/highlight.line.break

Fixed line break bug

Author: kbiakov

codeview/src/main/java/io/github/kbiakov/codeview/highlight/CodeHighlighter.kt

@@ -219,7 +219,10 @@ fun Int.isFound() = this >= 0
 fun Int.notFound() = this == -1
 
 /**
- * @return String with applied font params
+ * Apply font params to string.
+ *
+ * @param color Color as formatter string
+ * @return Formatted string
  */
 fun String.withFontParams(color: String?): String {
     val parametrizedString = StringBuilder()
@@ -232,13 +235,13 @@ fun String.withFontParams(color: String?): String {
     else { // may contain multiple lines with line breaks
 
         // put tag on the borders (end & start of line, ..., end of tag)
-        while (newIdx.isFound()) { // until closing tag is reached
-            val part = substring(idx..newIdx).inFontTag(color)
+        do { // until closing tag is reached
+            val part = substring(idx..newIdx - 1).inFontTag(color).plus("\n")
             parametrizedString.append(part)
 
-            idx = newIdx
-            newIdx = indexOf("\n", idx + 1)
-        }
+            idx = newIdx + 1
+            newIdx = indexOf("\n", idx)
+        } while (newIdx.isFound())
 
         if (idx != indexOf("\n")) // if not replaced only once (for multiline tag coverage)
             parametrizedString.append(substring(idx).inFontTag(color))
@@ -251,7 +254,7 @@ fun String.withFontParams(color: String?): String {
  * @return String with escaped line break at start
  */
 fun String.escLineBreakAtStart() =
-        if (startsWith("\n") && length >= 2)
+        if (startsWith("\n") && length >= 1)
             substring(1)
         else this
 

example/src/main/java/io/github/kbiakov/codeviewexample/ListingsActivity.java

@@ -76,7 +76,7 @@ public void onCodeLineClicked(int n, @NotNull String line) {
         codeView.highlightCode("python");
         codeView.removeCodeListener();
 
-        diffsAdapter.addFooterEntity(15, new DiffModel(getString(R.string.py_addition_16), true));
-        diffsAdapter.addFooterEntity(10, new DiffModel(getString(R.string.py_deletion_11), false));
+        diffsAdapter.addFooterEntity(16, new DiffModel(getString(R.string.py_addition_16), true));
+        diffsAdapter.addFooterEntity(11, new DiffModel(getString(R.string.py_deletion_11), false));
     }
 }

example/src/main/res/values/strings.xml

@@ -98,21 +98,21 @@
             \n
             tmp = \"Python 3.2.2 (default, Jun 12 2011, 15:08:59) [MSC v.1500 32 bit (Intel)] on win32.\"\n
             \n
-            def case1(): # А. инкрементальные конкатенации в цикле\n
+            def case1(): # A. Incremental concatenations in cycle\n
             s = \"\"\n
             for i in range(10000):\n
             s += tmp\n
-
-            def case2(): # Б. через промежуточный список и метод join\n
+            \n
+            def case2(): # Б. temporary list and join\n
             s = []\n
             for i in range(10000):\n
             s.append(tmp)\n
             s = \"\".join(s)\n
             \n
-            def case3(): # В. списковое выражение и метод join\n
+            def case3(): # C. list expression and join\n
             return \"\".join([tmp for i in range(10000)])\n
             \n
-            def case4(): # Г. генераторное выражение и метод join\n
+            def case4(): # D. generator expression join\n
             return \"\".join(tmp for i in range(10000))\n
             \n
             for v in range(1,5):\n