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

CppTools: Do not re-use semantic document if dependencies changed

Browse Source 
Changes from the current editor snapshot to the previous one represent
dependency changes (include paths, defines, ...) for the document. Use
this to stop the semantic info updater from re-using the previous
document for highlighthing.

Task-number: QTCREATORBUG-12267
Change-Id: I91308700122ded7c458c267b685c00b966874a64
Reviewed-by: Orgad Shaneh <orgads@gmail.com>
Reviewed-by: Fawzi Mohamed <fawzi.mohamed@digia.com>
This commit is contained in:
Nikolai Kosjar
2014-10-14 11:37:40 +02:00
parent 756fba0dfb
commit 0c107b33d1
3 changed files with 9 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
src/libs/cplusplus/CppDocument.cpp
View File

@@ -825,6 +825,11 @@ void Snapshot::updateDependencyTable() const
m_deps.build(*this); m_deps.build(*this);
} }
bool Snapshot::operator==(const Snapshot &other) const
{
return _documents == other._documents;
}
void Snapshot::allIncludesForDocument_helper(const QString &fileName, QSet<QString> &result) const void Snapshot::allIncludesForDocument_helper(const QString &fileName, QSet<QString> &result) const
{ {
if (Document::Ptr doc = document(fileName)) { if (Document::Ptr doc = document(fileName)) {

2
src/libs/cplusplus/CppDocument.h
View File

@@ -431,6 +431,8 @@ public:
QStringList filesDependingOn(const QString &fileName) const; QStringList filesDependingOn(const QString &fileName) const;
void updateDependencyTable() const; void updateDependencyTable() const;
bool operator==(const Snapshot &other) const;
private: private:
void allIncludesForDocument_helper(const QString &fileName, QSet<QString> &result) const; void allIncludesForDocument_helper(const QString &fileName, QSet<QString> &result) const;

3
src/plugins/cpptools/cppsemanticinfoupdater.cpp
View File

@@ -148,7 +148,8 @@ bool SemanticInfoUpdaterPrivate::reuseCurrentSemanticInfo(const SemanticInfo::So
&& currentSemanticInfo.doc && currentSemanticInfo.doc
&& currentSemanticInfo.doc->translationUnit()->ast() && currentSemanticInfo.doc->translationUnit()->ast()
&& currentSemanticInfo.doc->fileName() == source.fileName && currentSemanticInfo.doc->fileName() == source.fileName
&& !currentSemanticInfo.snapshot.isEmpty()) { && !currentSemanticInfo.snapshot.isEmpty()
&& currentSemanticInfo.snapshot == source.snapshot) {
SemanticInfo newSemanticInfo; SemanticInfo newSemanticInfo;
newSemanticInfo.revision = source.revision; newSemanticInfo.revision = source.revision;
newSemanticInfo.snapshot = source.snapshot; newSemanticInfo.snapshot = source.snapshot;