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

C++: handle file type changes for choosing highlighters.

Browse Source 
If the file type (mime type) of an editor changes, it might need a
different kind of highlighter/highlighting-support.

Change-Id: I470dbf69e71856c9593d201416c4d4bd2958aaec
Reviewed-by: Nikolai Kosjar <nikolai.kosjar@digia.com>
This commit is contained in:
Erik Verbruggen
2013-05-02 11:42:33 +02:00
committed by Nikolai Kosjar
parent dc4822d123
commit 033ad8875b
5 changed files with 26 additions and 14 deletions
Download Patch File Download Diff File Expand all files Collapse all files

7
src/plugins/cppeditor/cppeditor.cpp
View File

@@ -1166,7 +1166,7 @@ void CPPEditorWidget::finishHighlightSymbolUsages()
if (editorRevision() != m_highlightRevision)
return; // outdated
else if (m_highlighter.isCanceled())
if (m_highlighter.isCanceled())
return; // aborted
TextEditor::SyntaxHighlighter *highlighter = baseTextDocument()->syntaxHighlighter();
@@ -1174,11 +1174,6 @@ void CPPEditorWidget::finishHighlightSymbolUsages()
TextEditor::SemanticHighlighter::clearExtraAdditionalFormatsUntilEnd(
highlighter, m_highlighter);
if (m_modelManager)
m_modelManager->setExtraDiagnostics(m_lastSemanticInfo.doc->fileName(),
QLatin1String("CppEditor.SemanticsDiagnostics"),
m_lastSemanticInfo.doc->diagnosticMessages());
}
void CPPEditorWidget::switchDeclarationDefinition(bool inNextSplit)