qmdiEditor, ProjectManagerPlugin: search for header/impl (178)

The `qmdiEditor` will try to look the file near the original file, like
before. But if it fails - we now ask through the plugin system for a
better file.

Meaning, if the include/source files are in different locations in a
project, pressing F4 will work as expected.

closes #178

Author: diegoiast

src/GlobalCommands.hpp

@@ -42,6 +42,9 @@ inline constexpr const char *KeywordTooltip = "KeywordTooltip";
 // Open a new editor, with the attached document
 inline constexpr const char *DisplayText = "DisplayText";
 
+// Used when pressing F4 on the editor
+inline constexpr const char *FindMatchingFile = "FindMatchingFile";
+
 } // namespace GlobalCommands
 
 namespace GlobalArguments {

src/plugins/ProjectManager/ProjectManagerPlg.cpp

@@ -850,6 +850,9 @@ int ProjectManagerPlugin::canHandleAsyncCommand(const QString &command, const Co
     if (command == GlobalCommands::ClosedFile) {
         return true;
     }
+    if (command == GlobalCommands::FindMatchingFile) {
+        return true;
+    }
     return false;
 }
 
@@ -891,6 +894,9 @@ auto verifyRunnable(const QString &fileName) -> bool {
     return false;
 }
 
+static const QStringList cExtensions = {"c", "cpp", "cxx", "cc", "c++"};
+static const QStringList headerExtensions = {"h", "hpp", "hh"};
+
 QFuture<CommandArgs> ProjectManagerPlugin::handleCommandAsync(const QString &command,
                                                               const CommandArgs &args) {
     if (command == GlobalCommands::LoadedFile) {
@@ -920,6 +926,33 @@ QFuture<CommandArgs> ProjectManagerPlugin::handleCommandAsync(const QString &com
         }
         return {};
     }
+    if (command == GlobalCommands::FindMatchingFile) {
+        auto filename = args[GlobalArguments::FileName].toString();
+        auto allFiles = gui->filesList->getAllFiles();
+        auto fileInfo = QFileInfo(filename);
+        auto baseName = fileInfo.baseName();
+        auto suffix = fileInfo.suffix().toLower();
+        auto targetExtensions = QStringList();
+
+        if (cExtensions.contains(suffix)) {
+            targetExtensions = headerExtensions;
+        } else if (headerExtensions.contains(suffix)) {
+            targetExtensions = cExtensions;
+        }
+
+        if (!targetExtensions.isEmpty()) {
+            for (const auto &file : allFiles) {
+                auto fi = QFileInfo(file);
+                if (fi.baseName() == baseName && targetExtensions.contains(fi.suffix().toLower())) {
+                    auto fullFileName =
+                        gui->filesList->getDir() + QDir::separator() + fi.filePath();
+                    fullFileName = QDir::cleanPath(fullFileName);
+                    return QtFuture::makeReadyValueFuture(
+                        CommandArgs{{GlobalArguments::FileName, fullFileName}});
+                }
+            }
+        }
+    }
     return {};
 }
 

src/widgets/qmdieditor.cpp

@@ -64,32 +64,41 @@
 #define PLATFORM_LINE_ENDING "\n"
 #endif
 
-auto static getCorrespondingFile(const QString &fileName) -> QFuture<QString> {
-    return QtConcurrent::run([fileName]() {
-        auto static const cExtensions = QStringList{"c", "cpp", "cxx", "cc", "c++"};
-        auto static const headerExtensions = QStringList{"h", "hpp", "hh"};
-
-        auto fileInfo = QFileInfo(fileName);
-        auto baseName = fileInfo.baseName();
-        auto dirPath = fileInfo.absolutePath();
-
-        if (cExtensions.contains(fileInfo.suffix(), Qt::CaseInsensitive)) {
-            for (const auto &headerExt : headerExtensions) {
-                auto headerFileName = dirPath + QDir::separator() + baseName + "." + headerExt;
-                if (QFileInfo::exists(headerFileName)) {
-                    return headerFileName;
-                }
+auto static const cExtensions = QStringList{"c", "cpp", "cxx", "cc", "c++"};
+auto static const headerExtensions = QStringList{"h", "hpp", "hh"};
+
+auto static getCorrespondingFile(PluginManager *manager, const QString &fileName)
+    -> QFuture<QString> {
+
+    // First - choose easy solution, file aside the original one
+    auto fileInfo = QFileInfo(fileName);
+    auto baseName = fileInfo.baseName();
+    auto dirPath = fileInfo.absolutePath();
+
+    if (cExtensions.contains(fileInfo.suffix(), Qt::CaseInsensitive)) {
+        for (const auto &headerExt : headerExtensions) {
+            auto headerFileName = dirPath + QDir::separator() + baseName + "." + headerExt;
+            if (QFileInfo::exists(headerFileName)) {
+                return QtFuture::makeReadyValueFuture(headerFileName);
             }
-        } else if (headerExtensions.contains(fileInfo.suffix(), Qt::CaseInsensitive)) {
-            for (const auto &cExt : cExtensions) {
-                auto cFileName = dirPath + QDir::separator() + baseName + "." + cExt;
-                if (QFileInfo::exists(cFileName)) {
-                    return cFileName;
-                }
+        }
+    } else if (headerExtensions.contains(fileInfo.suffix(), Qt::CaseInsensitive)) {
+        for (const auto &cExt : cExtensions) {
+            auto cFileName = dirPath + QDir::separator() + baseName + "." + cExt;
+            if (QFileInfo::exists(cFileName)) {
+                return QtFuture::makeReadyValueFuture(cFileName);
             }
         }
-        return QString{};
-    });
+    }
+
+    // Did not work, lets ask someone - find me the corresponding file
+    // This should be the project manager replying to this, from currently
+    // active project. Or maybe from all active projects.
+    return manager->handleCommandAsync(GlobalCommands::FindMatchingFile,
+                                       {
+                                           {GlobalArguments::FileName, fileName},
+                                       })
+        .then([](const CommandArgs &args) { return args.value(GlobalArguments::FileName).toString(); });
 }
 
 auto static runningUnderGnome() -> bool {
@@ -1365,7 +1374,8 @@ void qmdiEditor::fileMessage_clicked(const QString &s) {
 }
 
 void qmdiEditor::toggleHeaderImpl() {
-    getCorrespondingFile(fileName).then(this, [this](const QString &otherFile) {
+    auto manager = dynamic_cast<PluginManager *>(mdiServer->mdiHost);
+    getCorrespondingFile(manager, fileName).then(this, [this](const QString &otherFile) {
         auto nativeFile = QDir::toNativeSeparators(otherFile);
         if (!nativeFile.isEmpty()) {
             auto pluginManager = dynamic_cast<PluginManager *>(mdiServer->mdiHost);