New upstream release of qmdilib and qutepart

1) qmdilib: just a typo in a method name
2) Qutepart: completions contain more data (not just the completion, but
   a string to note where the string was found).

No real functional changes

Author: diegoiast

CMakeLists.txt

@@ -57,8 +57,8 @@ else()
     include(cmake/CPM.cmake)
     include(cmake/icons-breeze.cmake)
 
-    CPMAddPackage("gh:diegoiast/qmdilib#3439468d5cda4d676c714f03919bd9fd7431f5d4")
-    CPMAddPackage("gh:diegoiast/qutepart-cpp#c30aa3fd16e000b9762e58deae051d8384f8e074")
+    CPMAddPackage("gh:diegoiast/qmdilib#1510d981cb86354c7c1a5257606d34427c9ed683")
+    CPMAddPackage("gh:diegoiast/qutepart-cpp#eec2e9ae5b50b591f017296ee743ee2860a280e4")
     CPMAddPackage("gh:diegoiast/command-palette-widget#69eb447b61c9d042394a1404c71a0d0b54ac28c0")
     CPMAddPackage("gh:diegoiast/KodoTerm#9d016815076a451ad639fa021d46602585e91247")
     CPMAddPackage("gh:palacaze/image-viewer#125ea784f93327b471cd9b6b156285e40e70280a")

src/plugins/ProjectManager/ProjectManagerPlg.cpp

@@ -1360,7 +1360,7 @@ auto ProjectManagerPlugin::addProjectFromDir(const QString &dirName) -> void {
 auto ProjectManagerPlugin::saveAllDocuments() -> bool {
     for (auto i = 0; i < mdiServer->getClientsCount(); i++) {
         auto c = mdiServer->getClient(i);
-        if (!c->saveClientConent()) {
+        if (!c->saveClientContent()) {
             return false;
         }
     }

src/widgets/qmdieditor.cpp

@@ -172,6 +172,7 @@ static auto createSubFollowSymbolSubmenu(const CommandArgs &data, QMenu *menu,
         auto const fieldType = tag[GlobalArguments::Type].toString();
         auto const fieldValue = tag[GlobalArguments::Value].toString();
         auto const rawAddress = tag[GlobalArguments::Raw].toString();
+        auto const lineNumber = tag[GlobalArguments::LineNumber].toInt();
         auto address = rawAddress;
         if (address.startsWith(START_MARKER) && address.endsWith(END_MARKER) &&
             address.length() > MIN_LENGTH) {
@@ -180,7 +181,16 @@ static auto createSubFollowSymbolSubmenu(const CommandArgs &data, QMenu *menu,
 
         auto fi = QFileInfo(fileName);
         auto simpleFileName = fi.fileName();
-        auto title = QString("%1 - %2 %3").arg(simpleFileName, fieldType, fieldValue);
+        auto title = QString();
+        if (lineNumber > 0) {
+            title = QString("%1:%2 - %3 %4")
+                        .arg(simpleFileName)
+                        .arg(lineNumber)
+                        .arg(fieldType, fieldValue);
+        } else {
+            title = QString("%1 - %2 %3").arg(simpleFileName, fieldType, fieldValue);
+        }
+
         auto a = new QAction(title, menu);
         QObject::connect(a, &QAction::triggered, a, [fileName, rawAddress, address, manager]() {
             auto nativeFileName = QDir::toNativeSeparators(fileName);
@@ -282,13 +292,13 @@ qmdiEditor::qmdiEditor(QWidget *p, Qutepart::ThemeManager *themes)
     auto layout = new QVBoxLayout(this);
 
     // Set up completion callback
-    textEditor->setCompletionCallback([this](const QString &prefix, const QString &previousWord,
-                                             const QString &separator) {
-        if (prefix.length() < 2 && separator.isEmpty()) {
-            return QFuture<QSet<QString>>();
-        }
-        return this->getTagCompletions(prefix, previousWord, separator);
-    });
+    textEditor->setCompletionCallback(
+        [this](const QString &prefix, const QString &previousWord, const QString &separator) {
+            if (prefix.length() < 2 && separator.isEmpty()) {
+                return QFuture<QSet<Qutepart::CompletionItem>>();
+            }
+            return this->getTagCompletions(prefix, previousWord, separator);
+        });
 
     operationsWidget->hide();
     setupActions();
@@ -479,7 +489,7 @@ qmdiEditor::~qmdiEditor() {
     mdiServer = nullptr;
 }
 
-bool qmdiEditor::saveClientConent() {
+bool qmdiEditor::saveClientContent() {
     deleteBackup();
     return doSave();
 }
@@ -1090,7 +1100,7 @@ void qmdiEditor::handleTabDeselected() {
     loadingTimer = nullptr;
 }
 
-QFuture<QSet<QString>> qmdiEditor::getTagCompletions(const QString &prefix, const QString &previousWord,
+QFuture<QSet<Qutepart::CompletionItem>> qmdiEditor::getTagCompletions(const QString &prefix, const QString &previousWord,
                                              const QString &separator) {
     if (!mdiServer || !mdiServer->mdiHost) {
         return {};
@@ -1114,19 +1124,35 @@ QFuture<QSet<QString>> qmdiEditor::getTagCompletions(const QString &prefix, cons
 
     auto future = pluginManager->handleCommandAsync(GlobalCommands::VariableInfo, args);
 
-    // Transform the result to QSet<QString> using QtConcurrent::run
-    return future.then([](const QFuture<CommandArgs> &f) -> QSet<QString> {
-        QSet<QString> completions;
-        if (f.isFinished() && f.isValid()) {
-            auto result = f.result();
-            if (result.contains(GlobalArguments::Tags)) {
-                auto tags = result[GlobalArguments::Tags].toList();
-                for (const QVariant &item : std::as_const(tags)) {
-                    auto const tag = item.toHash();
-                    auto const name = tag[GlobalArguments::Name].toString();
-                    if (!name.isEmpty()) {
-                        completions.insert(name);
+    return future.then([](const QFuture<CommandArgs> &f) -> QSet<Qutepart::CompletionItem> {
+        auto completions = QSet<Qutepart::CompletionItem>();
+        if (!f.isFinished() || !f.isValid()) {
+            return completions;
+        }
+
+        auto result = f.result();
+        if (result.contains(GlobalArguments::Tags)) {
+            auto tags = result[GlobalArguments::Tags].toList();
+            for (const QVariant &item : std::as_const(tags)) {
+                auto const tag = item.toHash();
+                auto const name = tag[GlobalArguments::Name].toString();
+                auto const type = tag[GlobalArguments::Type].toString();
+                auto const fileName = tag[GlobalArguments::FileName].toString();
+                auto const lineNumber = tag[GlobalArguments::LineNumber].toInt();
+
+                if (!name.isEmpty()) {
+                    QString sourceName = "TreeSitter";
+                    if (type == "tag" || type.isEmpty()) sourceName = "CTags";
+
+                    QString sourceInfo = sourceName;
+                    if (!fileName.isEmpty()) {
+                        QFileInfo fi(fileName);
+                        sourceInfo += "/" + fi.fileName();
+                        if (lineNumber > 0) {
+                            sourceInfo += ":" + QString::number(lineNumber);
+                        }
                     }
+                    completions.insert(Qutepart::CompletionItem(name, sourceInfo));
                 }
             }
         }

src/widgets/qmdieditor.h

@@ -50,7 +50,7 @@ class qmdiEditor : public QWidget, public qmdiClient {
     qmdiEditor(QWidget *p, Qutepart::ThemeManager *theme);
     ~qmdiEditor();
 
-    virtual bool saveClientConent() override;
+    virtual bool saveClientContent() override;
     virtual bool canCloseClient(CloseReason reason = CloseReason::CloseTab) override;
     virtual QString mdiClientFileName() override;
     virtual std::optional<std::tuple<int, int, int>> get_coordinates() const override;
@@ -204,8 +204,8 @@ class qmdiEditor : public QWidget, public qmdiClient {
     QFuture<CommandArgs> getCommandForLocation(const QPoint &localPosition, const QString &cmd);
     QFuture<CommandArgs> getSuggestionsForCurrentWord(const QPoint &localPosition);
     QFuture<CommandArgs> getTooltipsForPosition(const QPoint &localPosition);
-    QFuture<QSet<QString>> getTagCompletions(const QString &prefix, const QString &previousWord,
-                                             const QString &separator);
+    QFuture<QSet<Qutepart::CompletionItem>>
+    getTagCompletions(const QString &prefix, const QString &previousWord, const QString &separator);
 
   private:
     QString getShortFileName();