1 files changed, 46 insertions, 103 deletions

diff --git a/src/plugins/cppeditor/cppincludesfilter.cpp b/src/plugins/cppeditor/cppincludesfilter.cpp
index 9f637f6582b..9711b6f52de 100644
--- a/src/plugins/cppeditor/cppincludesfilter.cpp
+++ b/src/plugins/cppeditor/cppincludesfilter.cpp
@@ -7,11 +7,11 @@
 #include "cppeditortr.h"
 #include "cppmodelmanager.h"
 
-#include <cplusplus/CppDocument.h>
 #include <coreplugin/editormanager/documentmodel.h>
+
 #include <projectexplorer/project.h>
 #include <projectexplorer/projectexplorer.h>
-#include <projectexplorer/session.h>
+#include <projectexplorer/projectmanager.h>
 
 using namespace Core;
 using namespace ProjectExplorer;
@@ -19,79 +19,33 @@ using namespace Utils;
 
 namespace CppEditor::Internal {
 
-class CppIncludesIterator final : public BaseFileFilter::Iterator
-{
-public:
-    CppIncludesIterator(CPlusPlus::Snapshot snapshot, const QSet<FilePath> &seedPaths)
-        : m_snapshot(snapshot),
-          m_paths(seedPaths)
-    {
-        toFront();
-    }
-
-    void toFront() override;
-    bool hasNext() const override;
-    Utils::FilePath next() override;
-    Utils::FilePath filePath() const override;
-
-private:
-    void fetchMore();
-
-    CPlusPlus::Snapshot m_snapshot;
-    QSet<FilePath> m_paths;
-    QSet<FilePath> m_queuedPaths;
-    QSet<FilePath> m_allResultPaths;
-    FilePaths m_resultQueue;
-    FilePath m_currentPath;
-};
-
-
-
-void CppIncludesIterator::toFront()
-{
-    m_queuedPaths = m_paths;
-    m_allResultPaths.clear();
-    m_resultQueue.clear();
-    fetchMore();
-}
-
-bool CppIncludesIterator::hasNext() const
-{
-    return !m_resultQueue.isEmpty();
-}
-
-FilePath CppIncludesIterator::next()
+static FilePaths generateFilePaths(const QFuture<void> &future,
+                                   const CPlusPlus::Snapshot &snapshot,
+                                   const std::unordered_set<FilePath> &inputFilePaths)
 {
-    if (m_resultQueue.isEmpty())
-        return {};
-    m_currentPath = m_resultQueue.takeFirst();
-    if (m_resultQueue.isEmpty())
-        fetchMore();
-    return m_currentPath;
-}
-
-FilePath CppIncludesIterator::filePath() const
-{
-    return m_currentPath;
-}
-
-void CppIncludesIterator::fetchMore()
-{
-    while (!m_queuedPaths.isEmpty() && m_resultQueue.isEmpty()) {
-        const FilePath filePath = *m_queuedPaths.begin();
-        m_queuedPaths.remove(filePath);
-        CPlusPlus::Document::Ptr doc = m_snapshot.document(filePath);
+    FilePaths results;
+    std::unordered_set<FilePath> resultsCache;
+    std::unordered_set<FilePath> queuedPaths = inputFilePaths;
+
+    while (!queuedPaths.empty()) {
+        if (future.isCanceled())
+            return {};
+
+        const auto iterator = queuedPaths.cbegin();
+        const FilePath filePath = *iterator;
+        queuedPaths.erase(iterator);
+        const CPlusPlus::Document::Ptr doc = snapshot.document(filePath);
         if (!doc)
             continue;
         const FilePaths includedFiles = doc->includedFiles();
-        for (const FilePath &includedPath : includedFiles ) {
-            if (!m_allResultPaths.contains(includedPath)) {
-                m_allResultPaths.insert(includedPath);
-                m_queuedPaths.insert(includedPath);
-                m_resultQueue.append(includedPath);
+        for (const FilePath &includedFile : includedFiles) {
+            if (resultsCache.emplace(includedFile).second) {
+                queuedPaths.emplace(includedFile);
+                results.append(includedFile);
             }
         }
     }
+    return results;
 }
 
 CppIncludesFilter::CppIncludesFilter()
@@ -99,61 +53,50 @@ CppIncludesFilter::CppIncludesFilter()
     setId(Constants::INCLUDES_FILTER_ID);
     setDisplayName(Tr::tr(Constants::INCLUDES_FILTER_DISPLAY_NAME));
     setDescription(
-        Tr::tr("Matches all files that are included by all C++ files in all projects. Append "
+        Tr::tr("Locates files that are included by C++ files of any open project. Append "
                "\"+<number>\" or \":<number>\" to jump to the given line number. Append another "
                "\"+<number>\" or \":<number>\" to jump to the column number as well."));
     setDefaultShortcutString("ai");
     setDefaultIncludedByDefault(true);
+    const auto invalidate = [this] { m_cache.invalidate(); };
+    setRefreshRecipe(Tasking::Sync([invalidate] { invalidate(); return true; }));
     setPriority(ILocatorFilter::Low);
 
     connect(ProjectExplorerPlugin::instance(), &ProjectExplorerPlugin::fileListChanged,
-            this, &CppIncludesFilter::markOutdated);
+            this, invalidate);
     connect(CppModelManager::instance(), &CppModelManager::documentUpdated,
-            this, &CppIncludesFilter::markOutdated);
+            this, invalidate);
     connect(CppModelManager::instance(), &CppModelManager::aboutToRemoveFiles,
-            this, &CppIncludesFilter::markOutdated);
+            this, invalidate);
     connect(DocumentModel::model(), &QAbstractItemModel::rowsInserted,
-            this, &CppIncludesFilter::markOutdated);
+            this, invalidate);
     connect(DocumentModel::model(), &QAbstractItemModel::rowsRemoved,
-            this, &CppIncludesFilter::markOutdated);
+            this, invalidate);
     connect(DocumentModel::model(), &QAbstractItemModel::dataChanged,
-            this, &CppIncludesFilter::markOutdated);
+            this, invalidate);
     connect(DocumentModel::model(), &QAbstractItemModel::modelReset,
-            this, &CppIncludesFilter::markOutdated);
-}
+            this, invalidate);
 
-void CppIncludesFilter::prepareSearch(const QString &entry)
-{
-    Q_UNUSED(entry)
-    if (m_needsUpdate) {
-        m_needsUpdate = false;
-        QSet<FilePath> seedPaths;
-        for (Project *project : SessionManager::projects()) {
+    const auto generatorProvider = [] {
+        // This body runs in main thread
+        std::unordered_set<FilePath> inputFilePaths;
+        for (Project *project : ProjectManager::projects()) {
             const FilePaths allFiles = project->files(Project::SourceFiles);
-            for (const FilePath &filePath : allFiles )
-                seedPaths.insert(filePath);
+            for (const FilePath &filePath : allFiles)
+                inputFilePaths.insert(filePath);
         }
         const QList<DocumentModel::Entry *> entries = DocumentModel::entries();
         for (DocumentModel::Entry *entry : entries) {
             if (entry)
-                seedPaths.insert(entry->filePath());
+                inputFilePaths.insert(entry->filePath());
         }
-        CPlusPlus::Snapshot snapshot = CppModelManager::instance()->snapshot();
-        setFileIterator(new CppIncludesIterator(snapshot, seedPaths));
-    }
-    BaseFileFilter::prepareSearch(entry);
-}
-
-void CppIncludesFilter::refresh(QFutureInterface<void> &future)
-{
-    Q_UNUSED(future)
-    QMetaObject::invokeMethod(this, &CppIncludesFilter::markOutdated, Qt::QueuedConnection);
-}
-
-void CppIncludesFilter::markOutdated()
-{
-    m_needsUpdate = true;
-    setFileIterator(nullptr); // clean up
+        const CPlusPlus::Snapshot snapshot = CppModelManager::instance()->snapshot();
+        return [snapshot, inputFilePaths](const QFuture<void> &future) {
+            // This body runs in non-main thread
+            return generateFilePaths(future, snapshot, inputFilePaths);
+        };
+    };
+    m_cache.setGeneratorProvider(generatorProvider);
 }
 
 } // namespace CppEditor::Internal