diff --git a/src/plugins/cpptools/cppfileiterationorder.cpp b/src/plugins/cpptools/cppfileiterationorder.cpp
new file mode 100644
index 0000000000000000000000000000000000000000..807e26f8ff9f9dfbb288de38e1059dbe3d97b5f6
--- /dev/null
+++ b/src/plugins/cpptools/cppfileiterationorder.cpp
@@ -0,0 +1,161 @@
+/****************************************************************************
+**
+** Copyright (C) 2015 The Qt Company Ltd.
+** Contact: http://www.qt.io/licensing
+**
+** This file is part of Qt Creator.
+**
+** Commercial License Usage
+** Licensees holding valid commercial Qt licenses may use this file in
+** accordance with the commercial license agreement provided with the
+** Software or, alternatively, in accordance with the terms contained in
+** a written agreement between you and The Qt Company. For licensing terms and
+** conditions see http://www.qt.io/terms-conditions. For further information
+** use the contact form at http://www.qt.io/contact-us.
+**
+** GNU Lesser General Public License Usage
+** Alternatively, this file may be used under the terms of the GNU Lesser
+** General Public License version 2.1 or version 3 as published by the Free
+** Software Foundation and appearing in the file LICENSE.LGPLv21 and
+** LICENSE.LGPLv3 included in the packaging of this file. Please review the
+** following information to ensure the GNU Lesser General Public License
+** requirements will be met: https://www.gnu.org/licenses/lgpl.html and
+** http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html.
+**
+** In addition, as a special exception, The Qt Company gives you certain additional
+** rights. These rights are described in The Qt Company LGPL Exception
+** version 1.1, included in the file LGPL_EXCEPTION.txt in this package.
+**
+****************************************************************************/
+
+#include "cppfileiterationorder.h"
+
+#include <utils/qtcassert.h>
+
+namespace CppTools {
+
+FileIterationOrder::Entry::Entry(const QString &filePath,
+ const QString &projectPartId,
+ int commonPrefixLength,
+ int commonProjectPartPrefixLength)
+ : filePath(filePath)
+ , projectPartId(projectPartId)
+ , commonFilePathPrefixLength(commonPrefixLength)
+ , commonProjectPartPrefixLength(commonProjectPartPrefixLength)
+{}
+
+namespace {
+
+bool cmpPrefixLengthAndText(int prefixLength1, int prefixLength2)
+{
+ return prefixLength1 > prefixLength2;
+}
+
+bool cmpLessFilePath(const FileIterationOrder::Entry &first,
+ const FileIterationOrder::Entry &second)
+{
+ return cmpPrefixLengthAndText(first.commonFilePathPrefixLength,
+ second.commonFilePathPrefixLength);
+}
+
+bool cmpLessProjectPartId(const FileIterationOrder::Entry &first,
+ const FileIterationOrder::Entry &second)
+{
+ return cmpPrefixLengthAndText(first.commonProjectPartPrefixLength,
+ second.commonProjectPartPrefixLength);
+}
+
+bool hasProjectPart(const FileIterationOrder::Entry &entry)
+{
+ return !entry.projectPartId.isEmpty();
+}
+
+} // anonymous namespace
+
+bool operator<(const FileIterationOrder::Entry &first, const FileIterationOrder::Entry &second)
+{
+ if (hasProjectPart(first)) {
+ if (hasProjectPart(second)) {
+ if (first.projectPartId == second.projectPartId)
+ return cmpLessFilePath(first, second);
+ else
+ return cmpLessProjectPartId(first, second);
+ } else {
+ return true;
+ }
+ } else {
+ if (hasProjectPart(second))
+ return false;
+ else
+ return cmpLessFilePath(first, second);
+ }
+}
+
+FileIterationOrder::FileIterationOrder()
+{
+}
+
+FileIterationOrder::FileIterationOrder(const QString &referenceFilePath,
+ const QString &referenceProjectPartId)
+{
+ setReference(referenceFilePath, referenceProjectPartId);
+}
+
+void FileIterationOrder::setReference(const QString &filePath,
+ const QString &projectPartId)
+{
+ m_referenceFilePath = filePath;
+ m_referenceProjectPartId = projectPartId;
+}
+
+bool FileIterationOrder::isValid() const
+{
+ return !m_referenceFilePath.isEmpty();
+}
+
+static int commonPrefixLength(const QString &filePath1, const QString &filePath2)
+{
+ const auto mismatches = std::mismatch(filePath1.begin(),
+ filePath1.end(),
+ filePath2.begin());
+ return mismatches.first - filePath1.begin();
+}
+
+FileIterationOrder::Entry FileIterationOrder::createEntryFromFilePath(
+ const QString &filePath,
+ const QString &projectPartId) const
+{
+ const int filePrefixLength = commonPrefixLength(m_referenceFilePath, filePath);
+ const int projectPartPrefixLength = commonPrefixLength(m_referenceProjectPartId, projectPartId);
+ return Entry(filePath, projectPartId, filePrefixLength, projectPartPrefixLength);
+}
+
+void FileIterationOrder::insert(const QString &filePath, const QString &projectPartId)
+{
+ const Entry entry = createEntryFromFilePath(filePath, projectPartId);
+ m_set.insert(entry);
+}
+
+void FileIterationOrder::remove(const QString &filePath, const QString &projectPartId)
+{
+ const auto needleElement = createEntryFromFilePath(filePath, projectPartId);
+ const auto range = m_set.equal_range(needleElement);
+
+ const auto toRemove = std::find_if(range.first, range.second, [filePath] (const Entry &entry) {
+ return entry.filePath == filePath;
+ });
+ QTC_ASSERT(toRemove != range.second, return);
+ m_set.erase(toRemove);
+}
+
+QStringList FileIterationOrder::toStringList() const
+{
+ QStringList result;
+
+ for (const auto &entry : m_set)
+ result.append(entry.filePath);
+
+ return result;
+}
+
+} // namespace CppTools
diff --git a/src/plugins/cpptools/cppfileiterationorder.h b/src/plugins/cpptools/cppfileiterationorder.h
new file mode 100644
index 0000000000000000000000000000000000000000..aecd17d0360578cf1c65e935579fa55168a6e4f3
--- /dev/null
+++ b/src/plugins/cpptools/cppfileiterationorder.h
@@ -0,0 +1,84 @@
+/****************************************************************************
+**
+** Copyright (C) 2015 The Qt Company Ltd.
+** Contact: http://www.qt.io/licensing
+**
+** This file is part of Qt Creator.
+**
+** Commercial License Usage
+** Licensees holding valid commercial Qt licenses may use this file in
+** accordance with the commercial license agreement provided with the
+** Software or, alternatively, in accordance with the terms contained in
+** a written agreement between you and The Qt Company. For licensing terms and
+** conditions see http://www.qt.io/terms-conditions. For further information
+** use the contact form at http://www.qt.io/contact-us.
+**
+** GNU Lesser General Public License Usage
+** Alternatively, this file may be used under the terms of the GNU Lesser
+** General Public License version 2.1 or version 3 as published by the Free
+** Software Foundation and appearing in the file LICENSE.LGPLv21 and
+** LICENSE.LGPLv3 included in the packaging of this file. Please review the
+** following information to ensure the GNU Lesser General Public License
+** requirements will be met: https://www.gnu.org/licenses/lgpl.html and
+** http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html.
+**
+** In addition, as a special exception, The Qt Company gives you certain additional
+** rights. These rights are described in The Qt Company LGPL Exception
+** version 1.1, included in the file LGPL_EXCEPTION.txt in this package.
+**
+****************************************************************************/
+
+#ifndef FILEITERATIONORDER_H
+#define FILEITERATIONORDER_H
+
+#include "cpptools_global.h"
+
+#include <QStringList>
+
+#include <set>
+
+namespace CppTools {
+
+class CPPTOOLS_EXPORT FileIterationOrder {
+public:
+ struct Entry {
+ Entry(const QString &filePath,
+ const QString &projectPartId = QString(),
+ int commonFilePathPrefixLength = 0,
+ int commonProjectPartPrefixLength = 0);
+
+ friend CPPTOOLS_EXPORT bool operator<(const Entry &first, const Entry &second);
+
+ const QString filePath;
+ const QString projectPartId;
+ int commonFilePathPrefixLength = 0;
+ int commonProjectPartPrefixLength = 0;
+ };
+
+ FileIterationOrder();
+ FileIterationOrder(const QString &referenceFilePath,
+ const QString &referenceProjectPartId);
+
+ void setReference(const QString &filePath, const QString &projectPartId);
+ bool isValid() const;
+
+ void insert(const QString &filePath, const QString &projectPartId = QString());
+ void remove(const QString &filePath, const QString &projectPartId);
+ QStringList toStringList() const;
+
+private:
+ Entry createEntryFromFilePath(const QString &filePath,
+ const QString &projectPartId) const;
+
+private:
+ QString m_referenceFilePath;
+ QString m_referenceProjectPartId;
+ std::multiset<Entry> m_set;
+};
+
+CPPTOOLS_EXPORT bool operator<(const FileIterationOrder::Entry &first,
+ const FileIterationOrder::Entry &second);
+
+} // namespace CppTools
+
+#endif // FILEITERATIONORDER_H
diff --git a/src/plugins/cpptools/cppmodelmanager.cpp b/src/plugins/cpptools/cppmodelmanager.cpp
index 5cd9c98689fde1f1525a83ecf198e74d3e1660be..0b8ccc8fe6a4128008ce1c7d37e419a7857600d9 100644
--- a/src/plugins/cpptools/cppmodelmanager.cpp
+++ b/src/plugins/cpptools/cppmodelmanager.cpp
@@ -796,6 +796,8 @@ void CppModelManager::recalculateProjectPartMappings()
}
}
+
+ d->m_symbolFinder.clearCache();
}
void CppModelManager::updateCppEditorDocuments() const
diff --git a/src/plugins/cpptools/cpptools.pro b/src/plugins/cpptools/cpptools.pro
index 61a249026e0630a41d4ebd03245d0d5a3e32f612..b5433894560b52b1eb18a580dcf9ca4f9c204aaf 100644
--- a/src/plugins/cpptools/cpptools.pro
+++ b/src/plugins/cpptools/cpptools.pro
@@ -27,6 +27,7 @@ HEADERS += \
cppcurrentdocumentfilter.h \
cppeditoroutline.h \
cppdoxygen.h \
+ cppfileiterationorder.h \
cppfilesettingspage.h \
cppfindreferences.h \
cppfunctionsfilter.h \
@@ -92,6 +93,7 @@ SOURCES += \
cppcurrentdocumentfilter.cpp \
cppeditoroutline.cpp \
cppdoxygen.cpp \
+ cppfileiterationorder.cpp \
cppfilesettingspage.cpp \
cppfindreferences.cpp \
cppfunctionsfilter.cpp \
diff --git a/src/plugins/cpptools/cpptools.qbs b/src/plugins/cpptools/cpptools.qbs
index 065ea0e4c1155f51533dc907f97ab938f0573a7c..611316c4d962aaa008d1e2638a08ab18e0a49c11 100644
--- a/src/plugins/cpptools/cpptools.qbs
+++ b/src/plugins/cpptools/cpptools.qbs
@@ -49,6 +49,7 @@ QtcPlugin {
"cppcurrentdocumentfilter.cpp", "cppcurrentdocumentfilter.h",
"cppdoxygen.cpp", "cppdoxygen.h",
"cppeditoroutline.cpp", "cppeditoroutline.h",
+ "cppfileiterationorder.cpp", "cppfileiterationorder.h",
"cppfilesettingspage.cpp", "cppfilesettingspage.h", "cppfilesettingspage.ui",
"cppfindreferences.cpp", "cppfindreferences.h",
"cppfunctionsfilter.cpp", "cppfunctionsfilter.h",
diff --git a/src/plugins/cpptools/symbolfinder.cpp b/src/plugins/cpptools/symbolfinder.cpp
index 26df91bc049a8f47f8d5d4c0ce3625c18052f932..3bc72c00b50ba958727d7c560f39dfc283df8172 100644
--- a/src/plugins/cpptools/symbolfinder.cpp
+++ b/src/plugins/cpptools/symbolfinder.cpp
@@ -34,6 +34,8 @@
#include "symbolfinder.h"
+#include "cppmodelmanager.h"
+
#include <cplusplus/LookupContext.h>
#include <utils/qtcassert.h>
@@ -357,13 +359,20 @@ QStringList SymbolFinder::fileIterationOrder(const QString &referenceFile, const
insertCache(referenceFile, doc->fileName());
}
- QStringList files = m_filePriorityCache.value(referenceFile).values();
+ QStringList files = m_filePriorityCache.value(referenceFile).toStringList();
trackCacheUse(referenceFile);
return files;
}
+void SymbolFinder::clearCache()
+{
+ m_filePriorityCache.clear();
+ m_fileMetaCache.clear();
+ m_recent.clear();
+}
+
void SymbolFinder::checkCacheConsistency(const QString &referenceFile, const Snapshot &snapshot)
{
// We only check for "new" files, which which are in the snapshot but not in the cache.
@@ -376,18 +385,29 @@ void SymbolFinder::checkCacheConsistency(const QString &referenceFile, const Sna
}
}
+const QString projectPartIdForFile(const QString &filePath)
+{
+ const QList<ProjectPart::Ptr> parts = CppModelManager::instance()->projectPart(filePath);
+ if (!parts.isEmpty())
+ return parts.first()->id();
+ return QString();
+}
+
void SymbolFinder::clearCache(const QString &referenceFile, const QString &comparingFile)
{
- m_filePriorityCache[referenceFile].remove(computeKey(referenceFile, comparingFile),
- comparingFile);
+ m_filePriorityCache[referenceFile].remove(comparingFile, projectPartIdForFile(comparingFile));
m_fileMetaCache[referenceFile].remove(comparingFile);
}
void SymbolFinder::insertCache(const QString &referenceFile, const QString &comparingFile)
{
- // We want an ordering such that the documents with the most common path appear first.
- m_filePriorityCache[referenceFile].insert(computeKey(referenceFile, comparingFile),
- comparingFile);
+ FileIterationOrder &order = m_filePriorityCache[referenceFile];
+ if (!order.isValid()) {
+ const auto projectPartId = projectPartIdForFile(referenceFile);
+ order.setReference(referenceFile, projectPartId);
+ }
+ order.insert(comparingFile, projectPartIdForFile(comparingFile));
+
m_fileMetaCache[referenceFile].insert(comparingFile);
}
@@ -408,14 +428,3 @@ void SymbolFinder::trackCacheUse(const QString &referenceFile)
m_fileMetaCache.remove(oldest);
}
}
-
-int SymbolFinder::computeKey(const QString &referenceFile, const QString &comparingFile)
-{
- // As similar the path from the comparing file is to the path from the reference file,
- // the smaller the key is, which is then used for sorting the map.
- std::pair<QString::const_iterator,
- QString::const_iterator> r = std::mismatch(referenceFile.begin(),
- referenceFile.end(),
- comparingFile.begin());
- return referenceFile.length() - (r.first - referenceFile.begin());
-}
diff --git a/src/plugins/cpptools/symbolfinder.h b/src/plugins/cpptools/symbolfinder.h
index a71d9ed4d22c3495211471bc3e16dbd20f3fea12..45236eb1ad9931bd2d687d80493bfe08c1ad19ab 100644
--- a/src/plugins/cpptools/symbolfinder.h
+++ b/src/plugins/cpptools/symbolfinder.h
@@ -33,10 +33,12 @@
#include "cpptools_global.h"
+#include "cppfileiterationorder.h"
+
#include <QHash>
#include <QStringList>
-#include <QMultiMap>
-#include <QSet>
+
+#include <set>
namespace CPlusPlus {
class Class;
@@ -71,19 +73,18 @@ public:
QList<CPlusPlus::Declaration *> findMatchingDeclaration(const CPlusPlus::LookupContext &context,
CPlusPlus::Function *functionType);
+ void clearCache();
+
private:
QStringList fileIterationOrder(const QString &referenceFile,
const CPlusPlus::Snapshot &snapshot);
-
void checkCacheConsistency(const QString &referenceFile, const CPlusPlus::Snapshot &snapshot);
void clearCache(const QString &referenceFile, const QString &comparingFile);
void insertCache(const QString &referenceFile, const QString &comparingFile);
void trackCacheUse(const QString &referenceFile);
- static int computeKey(const QString &referenceFile, const QString &comparingFile);
-
- QHash<QString, QMultiMap<int, QString> > m_filePriorityCache;
+ QHash<QString, FileIterationOrder> m_filePriorityCache;
QHash<QString, QSet<QString> > m_fileMetaCache;
QStringList m_recent;
};
diff --git a/tests/auto/cplusplus/cplusplus.pro b/tests/auto/cplusplus/cplusplus.pro
index b44d24b6cf261749da2cdee9b7000fb4ca44cc95..edb96501f352531d67e391bd91cc50525ac2a613 100644
--- a/tests/auto/cplusplus/cplusplus.pro
+++ b/tests/auto/cplusplus/cplusplus.pro
@@ -14,4 +14,5 @@ SUBDIRS = \
cxx11 \
checksymbols \
lexer \
- translationunit
+ translationunit \
+ fileiterationorder
diff --git a/tests/auto/cplusplus/cplusplus.qbs b/tests/auto/cplusplus/cplusplus.qbs
index 973ec1bd459c6335da5286843da25ed26749b3c1..de1907d0c45d5bf338b6e28c2a3fa2269e0a5a3e 100644
--- a/tests/auto/cplusplus/cplusplus.qbs
+++ b/tests/auto/cplusplus/cplusplus.qbs
@@ -8,6 +8,7 @@ Project {
"checksymbols/checksymbols.qbs",
"codeformatter/codeformatter.qbs",
"cxx11/cxx11.qbs",
+ "fileiterationorder/fileiterationorder.qbs",
"findusages/findusages.qbs",
"lexer/lexer.qbs",
"lookup/lookup.qbs",
diff --git a/tests/auto/cplusplus/fileiterationorder/fileiterationorder.pro b/tests/auto/cplusplus/fileiterationorder/fileiterationorder.pro
new file mode 100644
index 0000000000000000000000000000000000000000..1f0f1331e2202aa9931da60c99b170893c72de77
--- /dev/null
+++ b/tests/auto/cplusplus/fileiterationorder/fileiterationorder.pro
@@ -0,0 +1,2 @@
+include(../shared/shared.pri)
+SOURCES += tst_fileiterationorder.cpp
diff --git a/tests/auto/cplusplus/fileiterationorder/fileiterationorder.qbs b/tests/auto/cplusplus/fileiterationorder/fileiterationorder.qbs
new file mode 100644
index 0000000000000000000000000000000000000000..5ef6630143d3c209403547a990cc29358e445004
--- /dev/null
+++ b/tests/auto/cplusplus/fileiterationorder/fileiterationorder.qbs
@@ -0,0 +1,7 @@
+import qbs
+import "../cplusplusautotest.qbs" as CPlusPlusAutotest
+
+CPlusPlusAutotest {
+ name: "CPlusPlus fileiterationorder autotest"
+ files: "tst_fileiterationorder.cpp"
+}
diff --git a/tests/auto/cplusplus/fileiterationorder/tst_fileiterationorder.cpp b/tests/auto/cplusplus/fileiterationorder/tst_fileiterationorder.cpp
new file mode 100644
index 0000000000000000000000000000000000000000..b320a28455b6ffb42c6906919fcca444df3e8d02
--- /dev/null
+++ b/tests/auto/cplusplus/fileiterationorder/tst_fileiterationorder.cpp
@@ -0,0 +1,107 @@
+/****************************************************************************
+**
+** Copyright (C) 2015 The Qt Company Ltd.
+** Contact: http://www.qt.io/licensing
+**
+** This file is part of Qt Creator.
+**
+** Commercial License Usage
+** Licensees holding valid commercial Qt licenses may use this file in
+** accordance with the commercial license agreement provided with the
+** Software or, alternatively, in accordance with the terms contained in
+** a written agreement between you and The Qt Company. For licensing terms and
+** conditions see http://www.qt.io/terms-conditions. For further information
+** use the contact form at http://www.qt.io/contact-us.
+**
+** GNU Lesser General Public License Usage
+** Alternatively, this file may be used under the terms of the GNU Lesser
+** General Public License version 2.1 or version 3 as published by the Free
+** Software Foundation and appearing in the file LICENSE.LGPLv21 and
+** LICENSE.LGPLv3 included in the packaging of this file. Please review the
+** following information to ensure the GNU Lesser General Public License
+** requirements will be met: https://www.gnu.org/licenses/lgpl.html and
+** http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html.
+**
+** In addition, as a special exception, The Qt Company gives you certain additional
+** rights. These rights are described in The Qt Company LGPL Exception
+** version 1.1, included in the file LGPL_EXCEPTION.txt in this package.
+**
+****************************************************************************/
+
+#include <cpptools/cppfileiterationorder.h>
+
+#include <QtTest>
+
+using namespace CppTools;
+
+//TESTED_COMPONENT=src/plugins/cpptools
+
+class tst_FileIterationOrder: public QObject
+{
+ Q_OBJECT
+
+private slots:
+ void preferWithProjectPart();
+ void preferWithReferenceProjectPart();
+ void preferWithCommonPrefixToReferenceProjectPart();
+ void preferWithCommonPrefixToReferenceFilePath();
+};
+
+void tst_FileIterationOrder::preferWithProjectPart()
+{
+ FileIterationOrder order("b.h", "p1");
+
+ order.insert("c.h", "p1");
+ order.insert("a.h");
+
+ const QStringList expected = {
+ "c.h",
+ "a.h",
+ };
+ QCOMPARE(order.toStringList(), expected);
+}
+
+void tst_FileIterationOrder::preferWithReferenceProjectPart()
+{
+ FileIterationOrder order("a.h", "/path/p1");
+
+ order.insert("a.cpp", "/path/p2");
+ order.insert("z.cpp", "/path/p1");
+
+ const QStringList expected = {
+ "z.cpp",
+ "a.cpp",
+ };
+ QCOMPARE(order.toStringList(), expected);
+}
+
+void tst_FileIterationOrder::preferWithCommonPrefixToReferenceProjectPart()
+{
+ FileIterationOrder order("a.h", "/some/path/p1");
+
+ order.insert("a.cpp", "/other/path/p3");
+ order.insert("z.cpp", "/some/path/p2");
+
+ const QStringList expected = {
+ "z.cpp",
+ "a.cpp",
+ };
+ QCOMPARE(order.toStringList(), expected);
+}
+
+void tst_FileIterationOrder::preferWithCommonPrefixToReferenceFilePath()
+{
+ FileIterationOrder order("b.h", QString());
+
+ order.insert("a.h");
+ order.insert("b.cpp");
+
+ const QStringList expected = {
+ "b.cpp",
+ "a.h",
+ };
+ QCOMPARE(order.toStringList(), expected);
+}
+
+QTEST_MAIN(tst_FileIterationOrder)
+#include "tst_fileiterationorder.moc"