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

ClangCodeModel: Fix race condition

Browse Source 
... between semantic re-highlighting and document visibility update.
Make semanticRehighlight() a no-op if the document is not currently
visible, and call it explicitly on an editor change.

Fixes: QTCREATORBUG-24290
Change-Id: Ife61f61d3fb82e8b283bf93ab77d16517f6c6f9c
Reviewed-by: David Schulz <david.schulz@qt.io>
This commit is contained in:
Christian Kandeler
2020-07-15 16:11:26 +02:00
parent 52a4a83154
commit b20fa85bc0
2 changed files with 9 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

7
src/plugins/clangcodemodel/clangeditordocumentprocessor.cpp
View File

@@ -139,8 +139,13 @@ void ClangEditorDocumentProcessor::recalculateSemanticInfoDetached(bool force)
void ClangEditorDocumentProcessor::semanticRehighlight() void ClangEditorDocumentProcessor::semanticRehighlight()
{ {
m_semanticHighlighter.updateFormatMapFromFontSettings(); const auto matchesEditor = [this](const Core::IEditor *editor) {
return editor->document()->filePath() == m_document.filePath();
};
if (!Utils::contains(Core::EditorManager::visibleEditors(), matchesEditor))
return;
m_semanticHighlighter.updateFormatMapFromFontSettings();
if (m_projectPart) if (m_projectPart)
requestAnnotationsFromBackend(); requestAnnotationsFromBackend();
} }

4
src/plugins/clangcodemodel/clangmodelmanagersupport.cpp
View File

@@ -155,8 +155,10 @@ void ClangModelManagerSupport::onCurrentEditorChanged(Core::IEditor *editor)
return; return;
const ::Utils::FilePath filePath = editor->document()->filePath(); const ::Utils::FilePath filePath = editor->document()->filePath();
if (auto processor = ClangEditorDocumentProcessor::get(filePath.toString())) if (auto processor = ClangEditorDocumentProcessor::get(filePath.toString())) {
processor->semanticRehighlight();
processor->generateTaskHubIssues(); processor->generateTaskHubIssues();
}
} }
void ClangModelManagerSupport::connectTextDocumentToTranslationUnit(TextEditor::TextDocument *textDocument) void ClangModelManagerSupport::connectTextDocumentToTranslationUnit(TextEditor::TextDocument *textDocument)