summaryrefslogtreecommitdiff
path: root/src/plugins/cpptools/builtineditordocumentprocessor.cpp
diff options
context:
space:
mode:
authorNikolai Kosjar <nikolai.kosjar@theqtcompany.com>2015-12-09 12:59:10 +0100
committerNikolai Kosjar <nikolai.kosjar@theqtcompany.com>2015-12-09 14:16:07 +0000
commit536e7fb8931946ff70af73f5ac3c15b814daae0d (patch)
treeab40a89c54aecbe1f13c8d93bbe30c89814d351b /src/plugins/cpptools/builtineditordocumentprocessor.cpp
parent6e5f90917f4cbe092816ac82434f827f67082f4d (diff)
downloadqt-creator-536e7fb8931946ff70af73f5ac3c15b814daae0d.tar.gz
CppTools: Apply font settings for diagnostics immediately
...and not on document reload. Change-Id: Idb6a9ba640a573c153aeab304dd280b6f6cf8ea0 Reviewed-by: Marco Bubke <marco.bubke@theqtcompany.com>
Diffstat (limited to 'src/plugins/cpptools/builtineditordocumentprocessor.cpp')
-rw-r--r--src/plugins/cpptools/builtineditordocumentprocessor.cpp5
1 files changed, 5 insertions, 0 deletions
diff --git a/src/plugins/cpptools/builtineditordocumentprocessor.cpp b/src/plugins/cpptools/builtineditordocumentprocessor.cpp
index c6213dd668..689d92ca76 100644
--- a/src/plugins/cpptools/builtineditordocumentprocessor.cpp
+++ b/src/plugins/cpptools/builtineditordocumentprocessor.cpp
@@ -190,6 +190,11 @@ void BuiltinEditorDocumentProcessor::recalculateSemanticInfoDetached(bool force)
void BuiltinEditorDocumentProcessor::semanticRehighlight()
{
if (m_semanticHighlighter && m_semanticInfoUpdater.semanticInfo().doc) {
+ if (const CPlusPlus::Document::Ptr document = m_documentSnapshot.document(filePath())) {
+ m_codeWarnings = toTextEditorSelections(document->diagnosticMessages(), textDocument());
+ m_codeWarningsUpdated = false;
+ }
+
m_semanticHighlighter->updateFormatMapFromFontSettings();
m_semanticHighlighter->run();
}