feedc0de/qt-creator
1
0
Fork 0
forked from qt-creator/qt-creator
Code Pull Requests Activity

Locator: Do not consider generated files in the project-related searches

Browse Source 
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 <eike.ziller@qt.io>
This commit is contained in:
Tobias Hunger
2019-08-22 11:21:00 +02:00
parent 550c51c75e
commit 0c062e5827
5 changed files with 6 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
src/plugins/cpptools/cppincludesfilter.cpp
View File

@@ -150,7 +150,7 @@ void CppIncludesFilter::prepareSearch(const QString &entry)
m_needsUpdate = false; m_needsUpdate = false;
QSet<QString> seedPaths; QSet<QString> seedPaths;
for (Project *project : SessionManager::projects()) { 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 ) for (const Utils::FilePath &filePath : allFiles )
seedPaths.insert(filePath.toString()); seedPaths.insert(filePath.toString());
} }

2
src/plugins/projectexplorer/allprojectsfilter.cpp
View File

@@ -59,7 +59,7 @@ void AllProjectsFilter::prepareSearch(const QString &entry)
if (!fileIterator()) { if (!fileIterator()) {
Utils::FilePathList paths; Utils::FilePathList paths;
for (Project *project : SessionManager::projects()) for (Project *project : SessionManager::projects())
paths.append(project->files(Project::AllFiles)); paths.append(project->files(Project::SourceFiles));
Utils::sort(paths); Utils::sort(paths);
setFileIterator(new BaseFileFilter::ListIterator(paths)); setFileIterator(new BaseFileFilter::ListIterator(paths));
} }

3
src/plugins/projectexplorer/allprojectsfind.cpp
View File

@@ -88,7 +88,8 @@ Utils::FileIterator *AllProjectsFind::filesForProjects(const QStringList &nameFi
QTextCodec *projectCodec = config->useGlobalSettings() QTextCodec *projectCodec = config->useGlobalSettings()
? Core::EditorManager::defaultTextCodec() ? Core::EditorManager::defaultTextCodec()
: config->textCodec(); : 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) { for (const QString &fileName : filteredFiles) {
QTextCodec *codec = openEditorEncodings.value(fileName); QTextCodec *codec = openEditorEncodings.value(fileName);
if (!codec) if (!codec)

2
src/plugins/projectexplorer/currentprojectfilter.cpp
View File

@@ -58,7 +58,7 @@ void CurrentProjectFilter::prepareSearch(const QString &entry)
if (!fileIterator()) { if (!fileIterator()) {
Utils::FilePathList paths; Utils::FilePathList paths;
if (m_project) if (m_project)
paths = m_project->files(Project::AllFiles); paths = m_project->files(Project::SourceFiles);
setFileIterator(new BaseFileFilter::ListIterator(paths)); setFileIterator(new BaseFileFilter::ListIterator(paths));
} }
BaseFileFilter::prepareSearch(entry); BaseFileFilter::prepareSearch(entry);

2
src/plugins/projectexplorer/fileinsessionfinder.cpp
View File

@@ -72,7 +72,7 @@ FilePathList FileInSessionFinder::doFindFile(const FilePath &filePath)
: FilePath()); : FilePath());
FilePathList allFiles; FilePathList allFiles;
for (const Project * const p : SessionManager::projects()) for (const Project * const p : SessionManager::projects())
allFiles << p->files(Project::AllFiles); allFiles << p->files(Project::SourceFiles);
m_finder.setProjectFiles(allFiles); m_finder.setProjectFiles(allFiles);
m_finderIsUpToDate = true; m_finderIsUpToDate = true;
} }