From ff913b83aebb131ba0ffc9dc79968b8f147286e1 Mon Sep 17 00:00:00 2001 From: Marco Bubke Date: Tue, 1 Dec 2015 14:02:39 +0100 Subject: [PATCH] Clang: Use revision from file container Change-Id: Ie084677fb910fc6e415afcdf7533369150162f8f Reviewed-by: Nikolai Kosjar --- src/plugins/clangcodemodel/clangbackendipcintegration.cpp | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) diff --git a/src/plugins/clangcodemodel/clangbackendipcintegration.cpp b/src/plugins/clangcodemodel/clangbackendipcintegration.cpp index 3471f84b191..635edb1ed45 100644 --- a/src/plugins/clangcodemodel/clangbackendipcintegration.cpp +++ b/src/plugins/clangcodemodel/clangbackendipcintegration.cpp @@ -512,12 +512,13 @@ CppTools::CppEditorDocumentHandle *cppDocument(const QString &filePath) return CppTools::CppModelManager::instance()->cppEditorDocument(filePath); } -bool documentHasChanged(const QString &filePath) +bool documentHasChanged(const QString &filePath, + uint revision) { auto *document = cppDocument(filePath); if (document) - return document->sendTracker().shouldSendRevision(document->revision()); + return document->sendTracker().shouldSendRevision(revision); return true; } @@ -562,7 +563,7 @@ void IpcCommunicator::updateTranslationUnitWithRevisionCheck(const FileContainer if (m_sendMode == IgnoreSendRequests) return; - if (documentHasChanged(fileContainer.filePath())) { + if (documentHasChanged(fileContainer.filePath(), fileContainer.documentRevision())) { updateTranslationUnitsForEditor({fileContainer}); setLastSentDocumentRevision(fileContainer.filePath(), fileContainer.documentRevision());