From 6df66e883fae36d96efaa0d3976e11e895c0c9b7 Mon Sep 17 00:00:00 2001 From: Nikolai Kosjar Date: Tue, 18 Jun 2013 16:26:40 +0200 Subject: CppTools: Do not hand over partly reloaded files to the code model When a reloading operation was in progress, CppEditorSupport::contents() could return a partly reloaded file to the code model leading to parse errors and incomplete highlighting. Fixed by checking if the file is currently being reloaded. Task-number: QTCREATORBUG-9382 Change-Id: Iee97e10444763c0cbf481132afa4617c5cdbd15c Reviewed-by: Erik Verbruggen --- src/plugins/cpptools/cpptoolseditorsupport.h | 4 ++++ 1 file changed, 4 insertions(+) (limited to 'src/plugins/cpptools/cpptoolseditorsupport.h') diff --git a/src/plugins/cpptools/cpptoolseditorsupport.h b/src/plugins/cpptools/cpptoolseditorsupport.h index a63ee7e6e5..f3bce1b546 100644 --- a/src/plugins/cpptools/cpptoolseditorsupport.h +++ b/src/plugins/cpptools/cpptoolseditorsupport.h @@ -121,6 +121,9 @@ signals: private slots: void onMimeTypeChanged(); + void onAboutToReload(); + void onReloadFinished(); + void updateDocument(); void updateDocumentNow(); @@ -166,6 +169,7 @@ private: // content caching mutable QString m_cachedContents; mutable int m_cachedContentsEditorRevision; + bool m_fileIsBeingReloaded; QTimer *m_updateEditorTimer; EditorUpdates m_editorUpdates; -- cgit v1.2.1