Preserving spaces and newlines in code tag.

Author: khaykov

aztec/src/main/java/org/wordpress/aztec/Html.java

@@ -90,8 +90,11 @@ public interface ImageGetter {
 
         interface Callbacks {
             void onUseDefaultImage();
+
             void onImageFailed();
+
             void onImageLoaded(Drawable drawable);
+
             void onImageLoading(Drawable drawable);
         }
     }
@@ -106,7 +109,7 @@ public interface TagHandler {
          * a tag that it does not know how to interpret.
          */
         boolean handleTag(boolean opening, String tag, Editable output, OnMediaTappedListener onMediaTappedListener,
-                Context context, Attributes attributes, int nestingLevel);
+                          Context context, Attributes attributes, int nestingLevel);
     }
 
     private Html() {
@@ -183,6 +186,7 @@ class HtmlToSpannedConverter implements ContentHandler, LexicalHandler {
     public int unknownTagLevel = 0;
     public Unknown unknown;
     private boolean insidePreTag = false;
+    private boolean insideCodeTag = false;
 
     private String mSource;
     private UnknownHtmlSpan.OnUnknownHtmlClickListener onUnknownHtmlClickListener;
@@ -291,12 +295,14 @@ private void handleStartTag(String tag, Attributes attributes, int nestingLevel)
         } else if (tag.equalsIgnoreCase("sub")) {
             start(spannableStringBuilder, TextFormat.FORMAT_SUBSCRIPT, attributes);
         } else if (tag.equalsIgnoreCase("code")) {
+            insideCodeTag = true;
             start(spannableStringBuilder, TextFormat.FORMAT_CODE, attributes);
         } else {
             if (tagHandler != null) {
-                if(tag.equalsIgnoreCase("pre")){
+                if (tag.equalsIgnoreCase("pre")) {
                     insidePreTag = true;
                 }
+
                 boolean tagHandled = tagHandler.handleTag(true, tag, spannableStringBuilder, onMediaTappedListener,
                         context, attributes, nestingLevel);
                 if (tagHandled) {
@@ -369,9 +375,10 @@ private void handleEndTag(String tag, int nestingLevel) {
         } else if (tag.equalsIgnoreCase("sub")) {
             end(spannableStringBuilder, TextFormat.FORMAT_SUBSCRIPT);
         } else if (tag.equalsIgnoreCase("code")) {
+            insideCodeTag = false;
             end(spannableStringBuilder, TextFormat.FORMAT_CODE);
         } else if (tagHandler != null) {
-            if(tag.equalsIgnoreCase("pre")){
+            if (tag.equalsIgnoreCase("pre")) {
                 insidePreTag = false;
             }
             tagHandler.handleTag(false, tag, spannableStringBuilder, onMediaTappedListener, context, new AztecAttributes(),
@@ -611,7 +618,7 @@ public void characters(char ch[], int start, int length) throws SAXException {
         for (int i = 0; i < length; i++) {
             char c = ch[i + start];
 
-            if (!insidePreTag &&  c == ' ' || c == '\n') {
+            if (!insidePreTag && !insideCodeTag && c == ' ' || c == '\n') {
                 char pred;
                 int len = sb.length();
 

aztec/src/main/kotlin/org/wordpress/aztec/watchers/EndOfParagraphMarkerAdder.kt

@@ -4,10 +4,7 @@ import android.text.Editable
 import android.text.Spanned
 import android.text.TextWatcher
 import org.wordpress.aztec.AztecText
-import org.wordpress.aztec.spans.AztecHeadingSpan
-import org.wordpress.aztec.spans.AztecListItemSpan
-import org.wordpress.aztec.spans.AztecPreformatSpan
-import org.wordpress.aztec.spans.EndOfParagraphMarker
+import org.wordpress.aztec.spans.*
 import java.lang.ref.WeakReference
 
 
@@ -36,22 +33,30 @@ class EndOfParagraphMarkerAdder(aztecText: AztecText, val verticalParagraphMargi
             val inputStart = textChangedEventDetails.inputStart
             val inputEnd = textChangedEventDetails.inputEnd
 
-            val isInsideList = aztecText.text.getSpans(inputStart, inputEnd, AztecListItemSpan::class.java).isNotEmpty()
-            val isInsidePre = aztecText.text.getSpans(inputStart, inputEnd, AztecPreformatSpan::class.java).isNotEmpty()
-            var insideHeading = aztecText.text.getSpans(inputStart, inputEnd, AztecHeadingSpan::class.java).isNotEmpty()
-
-            if (insideHeading && (aztecText.text.length > inputEnd
-                    && aztecText.text[inputEnd] == '\n')) {
-                insideHeading = false
-            }
-
-            if (!isInsideList && !insideHeading && !isInsidePre) {
+            if (paragraphMarkerCanBeApplied(aztecText.text)) {
                 aztecText.text.setSpan(EndOfParagraphMarker(verticalParagraphMargin), inputStart, inputEnd,
                         Spanned.SPAN_EXCLUSIVE_EXCLUSIVE)
             }
         }
     }
 
+    fun paragraphMarkerCanBeApplied(text: Editable): Boolean {
+        val inputStart = textChangedEventDetails.inputStart
+        val inputEnd = textChangedEventDetails.inputEnd
+
+        val isInsideList = text.getSpans(inputStart, inputEnd, AztecListItemSpan::class.java).isNotEmpty()
+        val isInsidePre = text.getSpans(inputStart, inputEnd, AztecPreformatSpan::class.java).isNotEmpty()
+        val isInsideCode = text.getSpans(inputStart, inputEnd, AztecCodeSpan::class.java).isNotEmpty()
+        var insideHeading = text.getSpans(inputStart, inputEnd, AztecHeadingSpan::class.java).isNotEmpty()
+
+        if (insideHeading && (text.length > inputEnd
+                && text[inputEnd] == '\n')) {
+            insideHeading = false
+        }
+
+        return !isInsideList && !insideHeading && !isInsidePre && !isInsideCode
+    }
+
     override fun afterTextChanged(text: Editable) {
         text.getSpans(0, text.length, EndOfParagraphMarker::class.java).forEach {
             text.setSpan(it, text.getSpanStart(it), text.getSpanEnd(it), Spanned.SPAN_EXCLUSIVE_EXCLUSIVE)