Fix multi-line replace match ranges/marks

addons/search/MatchModel.cpp

@@ -242,9 +242,6 @@ bool MatchModel::replaceMatch(KTextEditor::Document *doc, const QModelIndex &mat
     int newEndColumn = lastNL == -1 ? matchItem->range.start().column() + replaceText.length() : replaceText.length() - lastNL - 1;
     matchItem->range.setEnd(KTextEditor::Cursor{newEndLine, newEndColumn});
 
-    // Convert replace text back to "html"
-    replaceText.replace(QLatin1Char('\n'), QStringLiteral("\\n"));
-    replaceText.replace(QLatin1Char('\t'), QStringLiteral("\\t"));
     matchItem->replaceText = replaceText;
     return true;
 }
@@ -485,10 +482,10 @@ QString MatchModel::matchToHtmlString(const Match &match) const
     }
     pre = pre.toHtmlEscaped();
 
-    QString matchStr = match.matchStr;
-    matchStr.replace(QLatin1Char('\n'), QStringLiteral("\\n"));
-    matchStr = matchStr.toHtmlEscaped();
+    QString matchStr = match.matchStr.toHtmlEscaped();;
+
     QString replaceStr = match.replaceText.toHtmlEscaped();
+
     if (!replaceStr.isEmpty()) {
         matchStr = QLatin1String("<i><s>") + matchStr + QLatin1String("</s></i> ");
     }
@@ -500,6 +497,9 @@ QString MatchModel::matchToHtmlString(const Match &match) const
         .arg(m_replaceHighlightColor.name(), m_foregroundColor.name(), replaceStr);
     }
 
+    matchStr.replace(QLatin1Char('\n'), QStringLiteral("\\n"));
+    matchStr.replace(QLatin1Char('\t'), QStringLiteral("\\t"));
+
     QString post = match.postMatchStr;
     int nlIndex = post.indexOf(QLatin1Char('\n'));
     if (nlIndex != -1) {
@@ -602,6 +602,11 @@ QString MatchModel::matchToPlainText(const Match &match) const
     }
     QString post = match.postMatchStr;
 
+    matchStr.replace(QLatin1Char('\n'), QStringLiteral("\\n"));
+    matchStr.replace(QLatin1Char('\t'), QStringLiteral("\\t"));
+    replaceStr.replace(QLatin1Char('\n'), QStringLiteral("\\n"));
+    replaceStr.replace(QLatin1Char('\t'), QStringLiteral("\\t"));
+
     // (line:col)[space][space] ...Line text pre [highlighted match] Line text post....
     QString displayText = QStringLiteral("(%1:%2) ")
     .arg(match.range.start().line() + 1, 3)

addons/search/plugin_search.cpp

@@ -798,7 +798,7 @@ void KatePluginSearchView::addMatchMark(KTextEditor::Document *doc, const QModel
             }
         } else {
             if (doc->text(range) != itemIndex.data(MatchModel::ReplaceTextRole).toString()) {
-                // qDebug() << doc->text(range) << "Does not match" << item->data(0, ReplaceMatches::ReplacedTextRole).toString();
+                ///qDebug() << doc->text(range) << "Does not match" << itemIndex.data(MatchModel::ReplaceTextRole).toString();
                 return;
             }
         }