#3181 linkdialog: use highlighting states of QOwnNotesMarkdownTextEdi…

…t to get list of headings Signed-off-by: Patrizio Bekerle <[email protected]>
pbek · Feb 2, 2025 · 1ad4e4a · 1ad4e4a
1 parent 158eb5c
commit 1ad4e4a
Show file tree

Hide file tree

Showing 6 changed files with 14 additions and 27 deletions.
diff --git a/src/dialogs/linkdialog.cpp b/src/dialogs/linkdialog.cpp
@@ -17,6 +17,7 @@
 
 #include "services/settingsservice.h"
 #include "ui_linkdialog.h"
+#include "widgets/navigationwidget.h"
 
 LinkDialog::LinkDialog(int page, const QString &dialogTitle, QWidget *parent)
     : MasterDialog(parent), ui(new Ui::LinkDialog) {
@@ -25,6 +26,7 @@ LinkDialog::LinkDialog(int page, const QString &dialogTitle, QWidget *parent)
     ui->tabWidget->setCurrentIndex(page);
     on_tabWidget_currentChanged(page);
     ui->downloadProgressBar->hide();
+    _markdownTextEdit = new QOwnNotesMarkdownTextEdit();
     _networkManager = new QNetworkAccessManager(this);
     QObject::connect(_networkManager, SIGNAL(finished(QNetworkReply *)), this,
                      SLOT(slotReplyFinished(QNetworkReply *)));
@@ -65,7 +67,7 @@ LinkDialog::LinkDialog(int page, const QString &dialogTitle, QWidget *parent)
     setupFileUrlMenu();
 }
 
-LinkDialog::~LinkDialog() { delete ui; }
+LinkDialog::~LinkDialog() { delete ui; delete _markdownTextEdit; }
 
 void LinkDialog::on_searchLineEdit_textChanged(const QString &arg1) {
     // search notes when at least 2 characters were entered
@@ -397,9 +399,14 @@ void LinkDialog::on_headingSearchLineEdit_textChanged(const QString &arg1) {
 
 void LinkDialog::loadNoteHeadings() const {
     auto note = getSelectedNote();
+    _markdownTextEdit->setPlainText(note.getNoteText());
+    auto nodes = NavigationWidget::parseDocument(_markdownTextEdit->document());
+    QStringList headingTexts;
+    std::transform(nodes.begin(), nodes.end(), std::back_inserter(headingTexts),
+                   [](const Node& node) { return node.text; });
 
     ui->headingListWidget->clear();
-    ui->headingListWidget->addItems(note.getHeadingList());
+    ui->headingListWidget->addItems(headingTexts);
 }
 
 void LinkDialog::on_notesListWidget_currentItemChanged(QListWidgetItem *current,

diff --git a/src/dialogs/linkdialog.h b/src/dialogs/linkdialog.h
@@ -4,6 +4,7 @@
 #include <QNetworkAccessManager>
 
 #include "masterdialog.h"
+#include "widgets/qownnotesmarkdowntextedit.h"
 
 namespace Ui {
 class LinkDialog;
@@ -54,6 +55,7 @@ class LinkDialog : public MasterDialog {
     bool eventFilter(QObject *obj, QEvent *event) override;
     QString selectedNoteText;
     QNetworkAccessManager *_networkManager;
+    QOwnNotesMarkdownTextEdit *_markdownTextEdit;
     void setupFileUrlMenu();
     void loadNoteHeadings() const;
     void doAccept();

diff --git a/src/entities/note.cpp b/src/entities/note.cpp
@@ -4250,27 +4250,6 @@ QVector<CommandSnippet> Note::getParsedCommandSnippets() const {
 
 void Note::resetNoteTextHtmlConversionHash() { _noteTextHtmlConversionHash = QLatin1String(""); }
 
-/**
- * Get a list of all headings in a note starting with #
- *
- * @return
- */
-QStringList Note::getHeadingList() {
-    QStringList headingList;
-
-    static const QRegularExpression re(QStringLiteral(R"(^#+ (.+)$)"),
-                                       QRegularExpression::MultilineOption);
-    QRegularExpressionMatchIterator i = re.globalMatch(_noteText);
-
-    while (i.hasNext()) {
-        QRegularExpressionMatch match = i.next();
-        // Trim the heading text, in case there are trailing carriage return characters leaking in Windows
-        headingList << match.captured(1).trimmed();
-    }
-
-    return headingList;
-}
-
 bool Note::applyIgnoredNotesSetting(QStringList &fileNames) {
     const SettingsService settings;
     const QStringList ignoredFileRegExpList =

diff --git a/src/entities/note.h b/src/entities/note.h
@@ -379,8 +379,6 @@ class Note {
 
     static QString removeNameSearchPrefix(QString searchTerm);
 
-    QStringList getHeadingList();
-
     static bool applyIgnoredNotesSetting(QStringList &fileNames);
 
     QSet<Note> findBacklinks() const;

diff --git a/src/widgets/navigationwidget.cpp b/src/widgets/navigationwidget.cpp
@@ -88,7 +88,8 @@ QVector<Node> NavigationWidget::parseDocument(const QTextDocument *const documen
             continue;
         }
         static const QRegularExpression re(QStringLiteral("^#+\\s+"));
-        QString text = block.text().remove(re);
+        // Trim the heading text, in case there are trailing carriage return characters leaking in Windows
+        QString text = block.text().remove(re).trimmed();
 
         if (text.isEmpty()) {
             continue;

diff --git a/src/widgets/qownnotesmarkdowntextedit.cpp b/src/widgets/qownnotesmarkdowntextedit.cpp
@@ -29,7 +29,7 @@ QOwnNotesMarkdownTextEdit::QOwnNotesMarkdownTextEdit(QWidget *parent)
     // We need to set the internal variable to true, because we start with a highlighter
     _highlightingEnabled = true;
     _highlighter = nullptr;
-    if (parent->objectName() != QStringLiteral("LogWidget")) {
+    if (!parent || parent->objectName() != QStringLiteral("LogWidget")) {
         _highlighter = new QOwnNotesMarkdownHighlighter(document());
 
         setStyles();