From 0c062e5827f44f1833a97b9d48a144f843b20241 Mon Sep 17 00:00:00 2001 From: Tobias Hunger Date: Thu, 22 Aug 2019 11:21:00 +0200 Subject: [PATCH] Locator: Do not consider generated files in the project-related searches It is unlikely that a user will want to look at generated files -- and if she wants to, there is always file search. Task-number: QTCREATORBUG-20176 Change-Id: Iefb0aece1dbd6b39aa8892388411c10162319102 Reviewed-by: Eike Ziller --- src/plugins/cpptools/cppincludesfilter.cpp | 2 +- src/plugins/projectexplorer/allprojectsfilter.cpp | 2 +- src/plugins/projectexplorer/allprojectsfind.cpp | 3 ++- src/plugins/projectexplorer/currentprojectfilter.cpp | 2 +- src/plugins/projectexplorer/fileinsessionfinder.cpp | 2 +- 5 files changed, 6 insertions(+), 5 deletions(-) diff --git a/src/plugins/cpptools/cppincludesfilter.cpp b/src/plugins/cpptools/cppincludesfilter.cpp index db52f4e5baf..f40763e052a 100644 --- a/src/plugins/cpptools/cppincludesfilter.cpp +++ b/src/plugins/cpptools/cppincludesfilter.cpp @@ -150,7 +150,7 @@ void CppIncludesFilter::prepareSearch(const QString &entry) m_needsUpdate = false; QSet seedPaths; for (Project *project : SessionManager::projects()) { - const Utils::FilePathList allFiles = project->files(Project::AllFiles); + const Utils::FilePathList allFiles = project->files(Project::SourceFiles); for (const Utils::FilePath &filePath : allFiles ) seedPaths.insert(filePath.toString()); } diff --git a/src/plugins/projectexplorer/allprojectsfilter.cpp b/src/plugins/projectexplorer/allprojectsfilter.cpp index 9068c6bcce9..81be5ebe473 100644 --- a/src/plugins/projectexplorer/allprojectsfilter.cpp +++ b/src/plugins/projectexplorer/allprojectsfilter.cpp @@ -59,7 +59,7 @@ void AllProjectsFilter::prepareSearch(const QString &entry) if (!fileIterator()) { Utils::FilePathList paths; for (Project *project : SessionManager::projects()) - paths.append(project->files(Project::AllFiles)); + paths.append(project->files(Project::SourceFiles)); Utils::sort(paths); setFileIterator(new BaseFileFilter::ListIterator(paths)); } diff --git a/src/plugins/projectexplorer/allprojectsfind.cpp b/src/plugins/projectexplorer/allprojectsfind.cpp index d41f21f1b7a..feb80bad050 100644 --- a/src/plugins/projectexplorer/allprojectsfind.cpp +++ b/src/plugins/projectexplorer/allprojectsfind.cpp @@ -88,7 +88,8 @@ Utils::FileIterator *AllProjectsFind::filesForProjects(const QStringList &nameFi QTextCodec *projectCodec = config->useGlobalSettings() ? Core::EditorManager::defaultTextCodec() : config->textCodec(); - const QStringList filteredFiles = filterFiles(Utils::transform(project->files(Project::AllFiles), &Utils::FilePath::toString)); + const QStringList filteredFiles = filterFiles( + Utils::transform(project->files(Project::SourceFiles), &Utils::FilePath::toString)); for (const QString &fileName : filteredFiles) { QTextCodec *codec = openEditorEncodings.value(fileName); if (!codec) diff --git a/src/plugins/projectexplorer/currentprojectfilter.cpp b/src/plugins/projectexplorer/currentprojectfilter.cpp index 0ce954d1fd9..c0875fc1327 100644 --- a/src/plugins/projectexplorer/currentprojectfilter.cpp +++ b/src/plugins/projectexplorer/currentprojectfilter.cpp @@ -58,7 +58,7 @@ void CurrentProjectFilter::prepareSearch(const QString &entry) if (!fileIterator()) { Utils::FilePathList paths; if (m_project) - paths = m_project->files(Project::AllFiles); + paths = m_project->files(Project::SourceFiles); setFileIterator(new BaseFileFilter::ListIterator(paths)); } BaseFileFilter::prepareSearch(entry); diff --git a/src/plugins/projectexplorer/fileinsessionfinder.cpp b/src/plugins/projectexplorer/fileinsessionfinder.cpp index e4c62e405f2..8d42c409ad9 100644 --- a/src/plugins/projectexplorer/fileinsessionfinder.cpp +++ b/src/plugins/projectexplorer/fileinsessionfinder.cpp @@ -72,7 +72,7 @@ FilePathList FileInSessionFinder::doFindFile(const FilePath &filePath) : FilePath()); FilePathList allFiles; for (const Project * const p : SessionManager::projects()) - allFiles << p->files(Project::AllFiles); + allFiles << p->files(Project::SourceFiles); m_finder.setProjectFiles(allFiles); m_finderIsUpToDate = true; }