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

C++ editor: Remove scanning/caching of includes

Browse Source 
With the completion now in a separate thread this should
no longer be necessary.

Reviewed-by: Roberto Raggi
This commit is contained in:
Leandro Melo
2011-05-18 12:28:53 +02:00
parent 2d41159dab
commit ab40e9c78e
6 changed files with 24 additions and 173 deletions
Download Patch File Download Diff File Expand all files Collapse all files

28
src/plugins/cpptools/cppcompletionassist.cpp
View File

@@ -1156,20 +1156,22 @@ bool CppCompletionAssistProcessor::completeInclude(const QTextCursor &cursor)
}
// Make completion for all relevant includes
CppModelManagerInterface *manager = CppModelManagerInterface::instance();
QStringList includePaths = m_interface->includePaths();
const QString &currentFilePath = QFileInfo(m_interface->file()->fileName()).path();
if (!includePaths.contains(currentFilePath))
includePaths.append(currentFilePath);
const Core::MimeType mimeType =
Core::ICore::instance()->mimeDatabase()->findByType(QLatin1String("text/x-c++hdr"));
const QStringList suffixes = mimeType.suffixes();
foreach (const QString &includePath, includePaths) {
QString realPath = includePath;
if (!directoryPrefix.isEmpty()) {
realPath += QLatin1Char('/');
realPath += directoryPrefix;
}
foreach (const QString &itemText, manager->includesInPath(realPath))
addCompletionItem(itemText, m_icons.keywordIcon());
completeInclude(realPath, suffixes);
}
foreach (const QString &frameworkPath, m_interface->frameworkPaths()) {
@@ -1179,13 +1181,29 @@ bool CppCompletionAssistProcessor::completeInclude(const QTextCursor &cursor)
realPath += directoryPrefix;
realPath += QLatin1String(".framework/Headers");
}
foreach (const QString &itemText, manager->includesInPath(realPath))
addCompletionItem(itemText, m_icons.keywordIcon());
completeInclude(realPath, suffixes);
}
return !m_completions.isEmpty();
}
void CppCompletionAssistProcessor::completeInclude(const QString &realPath,
const QStringList &suffixes)
{
QDirIterator i(realPath, QDir::Files | QDir::Dirs | QDir::NoDotAndDotDot);
while (i.hasNext()) {
const QString fileName = i.next();
const QFileInfo fileInfo = i.fileInfo();
const QString suffix = fileInfo.suffix();
if (suffix.isEmpty() || suffixes.contains(suffix)) {
QString text = fileName.mid(realPath.length() + 1);
if (fileInfo.isDir())
text += QLatin1Char('/');
addCompletionItem(text, m_icons.keywordIcon());
}
}
}
void CppCompletionAssistProcessor::completePreprocessor()
{
foreach (const QString &preprocessorCompletion, preprocessorCompletions)