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

Clang: Avoid running pointless UpdateDocumentJobs

Browse Source 
Opening a document (without typing in it), switching away and back to it
resulted in running UpdateDocumentJobs for that document for nothing.

As for documents we are going to reset, simply set opened documents
initially dirty.

Change-Id: I8edc2d1fb8f6f92950b4e2067f60609176bd5b26
Reviewed-by: Ivan Donchevskii <ivan.donchevskii@qt.io>
This commit is contained in:
Nikolai Kosjar
2018-10-18 14:38:50 +02:00
parent aac1bebace
commit f1290da3cd
2 changed files with 7 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

9
src/tools/clangbackend/source/clangcodemodelserver.cpp
View File

@@ -102,9 +102,11 @@ void ClangCodeModelServer::documentsOpened(const ClangBackEnd::DocumentsOpenedMe
QVector<FileContainer> toCreate;
categorizeFileContainers(message.fileContainers, toCreate, toReset);
const std::vector<Document> createdDocuments = documents.create(toCreate);
for (const auto &document : createdDocuments)
std::vector<Document> createdDocuments = documents.create(toCreate);
for (auto &document : createdDocuments) {
document.setDirtyIfDependencyIsMet(document.filePath());
documentProcessors().create(document);
}
const std::vector<Document> resetDocuments_ = resetDocuments(toReset);
unsavedFiles.createOrUpdate(message.fileContainers);
@@ -341,8 +343,7 @@ void ClangCodeModelServer::processJobsForVisibleDocuments()
void ClangCodeModelServer::processJobsForCurrentDocument()
{
auto currentDocuments = documents.filtered([](const Document &document) {
return document.isUsedByCurrentEditor()
&& (document.isDirty() || document.documentRevision() == 1);
return document.isUsedByCurrentEditor() && document.isDirty();
});
QTC_CHECK(currentDocuments.size() <= 1);

4
tests/unit/unittest/clangcodemodelserver-test.cpp
View File

@@ -311,11 +311,11 @@ TEST_F(ClangCodeModelServerSlowTest, GetNewCodeCompletionAfterUpdatingUnsavedFil
requestCompletionsInFileA();
}
TEST_F(ClangCodeModelServerSlowTest, TranslationUnitAfterCreationIsNotDirty)
TEST_F(ClangCodeModelServerSlowTest, OpenedDocumentsAreDirty)
{
openDocument(filePathA, AnnotationJobsMultiplier);
ASSERT_THAT(clangServer, HasDirtyDocument(filePathA, 0U, false, false));
ASSERT_THAT(clangServer, HasDirtyDocument(filePathA, 0U, true, false));
}
TEST_F(ClangCodeModelServerSlowTest, SetCurrentAndVisibleEditor)