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

CppTools: Fix updating pending queue in CppLocatorData

Browse Source 
Fix that the invocations

  CppLocatorData::onDocumentUpdated(Document{"bla.cpp", revision=5}),
  CppLocatorData::onDocumentUpdated(Document{"bla.cpp", revision=3}),

would add two entries in m_pendingDocuments. The document from the
latter invocation should be ignored due to its outdated revision.

Change-Id: I5e9eb4de77f59633d5525d808bd60ca1259f894d
Reviewed-by: Christian Stenger <christian.stenger@qt.io>
This commit is contained in:
Nikolai Kosjar
2019-07-16 11:48:08 +02:00
parent 56dc926b9d
commit 2778a5adab
1 changed files with 7 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
src/plugins/cpptools/cpplocatordata.cpp
View File

@@ -44,16 +44,18 @@ void CppLocatorData::onDocumentUpdated(const CPlusPlus::Document::Ptr &document)
{ {
QMutexLocker locker(&m_pendingDocumentsMutex); QMutexLocker locker(&m_pendingDocumentsMutex);
int i = 0, ei = m_pendingDocuments.size(); bool isPending = false;
for (; i < ei; ++i) { for (int i = 0, ei = m_pendingDocuments.size(); i < ei; ++i) {
const CPlusPlus::Document::Ptr &doc = m_pendingDocuments.at(i); const CPlusPlus::Document::Ptr &doc = m_pendingDocuments.at(i);
if (doc->fileName() == document->fileName() && doc->revision() <= document->revision()) { if (doc->fileName() == document->fileName()) {
isPending = true;
if (document->revision() >= doc->revision())
m_pendingDocuments[i] = document; m_pendingDocuments[i] = document;
break; break;
} }
} }
if (i == ei && QFileInfo(document->fileName()).suffix() != "moc") if (!isPending && QFileInfo(document->fileName()).suffix() != "moc")
m_pendingDocuments.append(document); m_pendingDocuments.append(document);
flushPendingDocument(false); flushPendingDocument(false);