From d75590c2254ae0f879900a8bfac36b7c99005f59 Mon Sep 17 00:00:00 2001
From: Dimitry Ivanov <mail@dimitryivanov.ru>
Date: Sun, 5 Nov 2017 12:15:02 +0300
Subject: [PATCH] SpannableBuilder

---
 .../ru/noties/markwon/SpannableBuilder.java   | 46 ++++---------------
 .../renderer/SpannableMarkdownVisitor.java    |  2 +-
 2 files changed, 11 insertions(+), 37 deletions(-)

diff --git a/library/src/main/java/ru/noties/markwon/SpannableBuilder.java b/library/src/main/java/ru/noties/markwon/SpannableBuilder.java
index e8fc4c63..9e25dbe8 100644
--- a/library/src/main/java/ru/noties/markwon/SpannableBuilder.java
+++ b/library/src/main/java/ru/noties/markwon/SpannableBuilder.java
@@ -111,11 +111,14 @@ public class SpannableBuilder {
     }
 
     @NonNull
-    public CharSequence remove(int start, int end) {
+    public CharSequence removeFromEnd(int start) {
 
-        // this method is intended to be used only by markdown visitor
-        // it's a workaround to allow tables
+        // this method is not intended to be used by clients
+        // it's a workaround to support tables
 
+        final int end = length();
+
+        // as we do not expose builder and do no apply spans to it, we are safe to NOT to convert to String
         final SpannableStringBuilderImpl impl = new SpannableStringBuilderImpl(builder.subSequence(start, end));
 
         final Iterator<Span> iterator = spans.iterator();
@@ -129,37 +132,7 @@ public class SpannableBuilder {
             }
         }
 
-        // SHIFT EXISTING!
-
-        if (spans.size() > 0) {
-
-            for (Span s : spans) {
-
-                // if end < start -> not affected
-                if (s.end < start) {
-                    continue;
-                }
-
-                // if end between start & end (which is really bad one) -> make end=start
-                if (s.end >= start && s.end <= end) {
-                    s.end = start;
-                    continue;
-                }
-
-                // if start between start&end -> make start=end
-                if (s.start >= start && s.start <= end) {
-                    s.start = start;
-                    // shift end by difference
-                    s.end = s.end - (end - start);
-                    continue;
-                }
-
-                // if after, just shift by difference
-                final int diff = end - start;
-                s.start = s.start - diff;
-                s.end = s.end - diff;
-            }
-        }
+        builder.replace(start, end, "");
 
         return impl;
     }
@@ -180,7 +153,8 @@ public class SpannableBuilder {
         // breaks the order that we intend to use
         // so, we will defensively copy builder
 
-        final SpannableStringBuilderImpl impl = new SpannableStringBuilderImpl(builder.toString());
+        // as we do not expose builder and do no apply spans to it, we are safe to NOT to convert to String
+        final SpannableStringBuilderImpl impl = new SpannableStringBuilderImpl(builder);
 
         for (Span span : spans) {
             impl.setSpan(span.what, span.start, span.end, span.flags);
@@ -215,7 +189,7 @@ public class SpannableBuilder {
         }
     }
 
-    private static class Span {
+    static class Span {
 
         final Object what;
         int start;
diff --git a/library/src/main/java/ru/noties/markwon/renderer/SpannableMarkdownVisitor.java b/library/src/main/java/ru/noties/markwon/renderer/SpannableMarkdownVisitor.java
index c6a8cc93..72dc1f28 100644
--- a/library/src/main/java/ru/noties/markwon/renderer/SpannableMarkdownVisitor.java
+++ b/library/src/main/java/ru/noties/markwon/renderer/SpannableMarkdownVisitor.java
@@ -364,7 +364,7 @@ public class SpannableMarkdownVisitor extends AbstractVisitor {
 
             pendingTableRow.add(new TableRowSpan.Cell(
                     tableCellAlignment(cell.getAlignment()),
-                    builder.remove(length, builder.length())
+                    builder.removeFromEnd(length)
             ));
 
             tableRowIsHeader = cell.isHeader();