From 1f0fd959fa9c8f4de6b448671ec63746ff42299a Mon Sep 17 00:00:00 2001 From: Nikolai Kosjar Date: Tue, 4 Mar 2014 09:45:41 -0300 Subject: CppEditor: Do not cancel highlighter on user interaction e.g. changing cursor position or editing text. CPPEditorWidget::updateUses() does not depend on the highlighter, but only on the semantic info update. Task-number: QTCREATORBUG-11367 Change-Id: Ia9f5ed7c2adc6899995a5d966a20e45b2f87d9e3 Reviewed-by: Erik Verbruggen --- src/plugins/cpptools/cpptoolseditorsupport.cpp | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) (limited to 'src/plugins/cpptools/cpptoolseditorsupport.cpp') diff --git a/src/plugins/cpptools/cpptoolseditorsupport.cpp b/src/plugins/cpptools/cpptoolseditorsupport.cpp index 664d6761a5..084f4822e9 100644 --- a/src/plugins/cpptools/cpptoolseditorsupport.cpp +++ b/src/plugins/cpptools/cpptoolseditorsupport.cpp @@ -391,10 +391,11 @@ void CppEditorSupport::startHighlighting() if (m_lastHighlightRevision == revision) return; - m_lastHighlightRevision = revision; + m_highlighter.cancel(); static const Document::Ptr dummyDoc; static const Snapshot dummySnapshot; m_highlighter = m_highlightingSupport->highlightingFuture(dummyDoc, dummySnapshot); + m_lastHighlightRevision = revision; emit highlighterStarted(&m_highlighter, m_lastHighlightRevision); } } -- cgit v1.2.1