#3690: make highlighting across multiple lines optional

Signed-off-by: Patrizio Bekerle <patrizio@bekerle.com>

Author: pbek

CHANGELOG.md

@@ -2,6 +2,9 @@
 
 ## 26.8.12
 
+- Added a new editor setting to disable highlighting and applying of Markdown text
+  formatting across multiple lines; it is enabled by default
+  (for [#3690](https://github.com/pbek/QOwnNotes/issues/3690))
 - Whitespace markers in the note editor can now use a separate foreground color
   configured in the editor color scheme (for [#3670](https://github.com/pbek/QOwnNotes/issues/3670))
 - Added an **Insert footnote** action to the _Edit_ menu and the note editor context

src/libraries/qmarkdowntextedit

@@ -6064,9 +6064,16 @@ void MainWindow::applyFormatter(const QString &formatter) {
         c.movePosition(QTextCursor::Left, QTextCursor::MoveAnchor, formatter.length());
         textEdit->setTextCursor(c);
     } else {
+        // Only allow formatting across multiple lines if the feature is enabled
+        QRegularExpression::PatternOptions patternOptions =
+            SettingsService()
+                    .value(QStringLiteral("Editor/multilineInlineHighlighting"), true)
+                    .toBool()
+                ? QRegularExpression::DotMatchesEverythingOption
+                : QRegularExpression::NoPatternOption;
+
         QRegularExpressionMatch match =
-            QRegularExpression(QStringLiteral(R"(^(\s*)(.+?)(\s*)$)"),
-                               QRegularExpression::DotMatchesEverythingOption)
+            QRegularExpression(QStringLiteral(R"(^(\s*)(.+?)(\s*)$)"), patternOptions)
                 .match(selectedText);
         if (match.hasMatch()) {
             QString formattedText =

src/mainwindow.cpp

@@ -2722,6 +2722,13 @@ void QOwnNotesMarkdownTextEdit::updateSettings() {
 
         setHighlightingEnabled(highlightingEnabled);
 
+        if (_highlighter) {
+            // enable or disable highlighting of inline formatting across multiple lines
+            _highlighter->setMultilineInlineHighlightingEnabled(
+                settings.value(QStringLiteral("Editor/multilineInlineHighlighting"), true)
+                    .toBool());
+        }
+
         if (highlightingEnabled) {
             // set the new highlighting styles
             setStyles();

src/widgets/qownnotesmarkdowntextedit.cpp

@@ -49,6 +49,10 @@ void EditorSettingsWidget::readSettings() {
         settings.value(QStringLiteral("markdownHighlightingEnabled"), true).toBool());
     ui->fullyHighlightedBlockquotesCheckBox->setChecked(
         settings.value(QStringLiteral("fullyHighlightedBlockquotes")).toBool());
+    ui->multilineInlineHighlightingCheckBox->setChecked(
+        settings.value(QStringLiteral("Editor/multilineInlineHighlighting"), true).toBool());
+    // Initialize the enabled state of the highlighting dependent checkboxes
+    on_markdownHighlightingCheckBox_toggled(ui->markdownHighlightingCheckBox->isChecked());
     ui->autoBracketClosingCheckBox->setChecked(
         settings.value(QStringLiteral("Editor/autoBracketClosing"), true).toBool());
     ui->autoBracketRemovalCheckBox->setChecked(
@@ -105,6 +109,8 @@ void EditorSettingsWidget::storeSettings() {
                       ui->markdownHighlightingCheckBox->isChecked());
     settings.setValue(QStringLiteral("fullyHighlightedBlockquotes"),
                       ui->fullyHighlightedBlockquotesCheckBox->isChecked());
+    settings.setValue(QStringLiteral("Editor/multilineInlineHighlighting"),
+                      ui->multilineInlineHighlightingCheckBox->isChecked());
     settings.setValue(QStringLiteral("Editor/autoBracketClosing"),
                       ui->autoBracketClosingCheckBox->isChecked());
     settings.setValue(QStringLiteral("Editor/autoBracketRemoval"),
@@ -156,10 +162,11 @@ void EditorSettingsWidget::on_cursorWidthResetButton_clicked() {
 }
 
 /**
- * Enables or disables the fully highlighted blockquotes checkbox
+ * Enables or disables the highlighting dependent checkboxes
  */
 void EditorSettingsWidget::on_markdownHighlightingCheckBox_toggled(bool checked) {
     ui->fullyHighlightedBlockquotesCheckBox->setEnabled(checked);
+    ui->multilineInlineHighlightingCheckBox->setEnabled(checked);
 }
 
 /**

src/widgets/settings/editorsettingswidget.cpp

@@ -13,12 +13,6 @@
   <layout class="QGridLayout" name="gridLayout">
    <item row="0" column="0">
     <widget class="QGroupBox" name="groupBox_17">
-     <property name="minimumSize">
-      <size>
-       <width>0</width>
-       <height>90</height>
-      </size>
-     </property>
      <property name="title">
       <string>Markdown highlighting</string>
      </property>
@@ -40,6 +34,16 @@
         </property>
        </widget>
       </item>
+      <item row="2" column="1" colspan="2">
+       <widget class="QCheckBox" name="multilineInlineHighlightingCheckBox">
+        <property name="toolTip">
+         <string>Allows emphasis, strong, underline and strikeout formatting to span multiple lines in the note editor</string>
+        </property>
+        <property name="text">
+         <string>Highlight and apply Markdown text formatting across multiple lines</string>
+        </property>
+       </widget>
+      </item>
      </layout>
     </widget>
    </item>

src/widgets/settings/editorsettingswidget.ui

@@ -230,6 +230,30 @@ void TestQMarkdownTextEdit::testMultilineInlineHighlighting() {
     QVERIFY(formatAt(editor.document()->firstBlock(), 6).fontUnderline());
 }
 
+void TestQMarkdownTextEdit::testMultilineInlineHighlightingDisabled() {
+    QMarkdownTextEdit editor;
+    editor.highlighter()->setMultilineInlineHighlightingEnabled(false);
+
+    editor.setPlainText(QStringLiteral("~~first line\nsecond line\nthird line~~"));
+    editor.highlighter()->rehighlight();
+    QVERIFY(!formatAt(editor.document()->findBlockByNumber(1), 0).fontStrikeOut());
+    QVERIFY(!formatAt(editor.document()->findBlockByNumber(2), 0).fontStrikeOut());
+
+    editor.setPlainText(QStringLiteral("**first line\nsecond line**"));
+    editor.highlighter()->rehighlight();
+    QVERIFY(formatAt(editor.document()->findBlockByNumber(1), 0).fontWeight() != int(QFont::Bold));
+
+    editor.setPlainText(QStringLiteral("*first line\nsecond line\nthird line*"));
+    editor.highlighter()->rehighlight();
+    QVERIFY(!formatAt(editor.document()->findBlockByNumber(1), 0).fontItalic());
+    QVERIFY(!formatAt(editor.document()->findBlockByNumber(2), 0).fontItalic());
+
+    // Turning it back on re-enables multi-line highlighting
+    editor.highlighter()->setMultilineInlineHighlightingEnabled(true);
+    QVERIFY(formatAt(editor.document()->findBlockByNumber(1), 0).fontItalic());
+    QVERIFY(formatAt(editor.document()->findBlockByNumber(2), 0).fontItalic());
+}
+
 void TestQMarkdownTextEdit::testWhitespaceMarkerHighlighting() {
     QCOMPARE(int(MarkdownHighlighter::LinkInternal), 34);
     QCOMPARE(int(MarkdownHighlighter::Whitespace), 35);

tests/unit_tests/testcases/app/test_qmarkdowntextedit.cpp

@@ -17,6 +17,7 @@ class TestQMarkdownTextEdit : public QObject {
     void testSqlCodeBlockHighlighting();
     void testForthCommentHighlighting();
     void testMultilineInlineHighlighting();
+    void testMultilineInlineHighlightingDisabled();
     void testWhitespaceMarkerHighlighting();
     void testLinkedCheckBoxDetectionInReadOnlyEditor();
     void testFootnoteNavigationAndHighlighting();