summaryrefslogtreecommitdiff
path: root/src/plugins
diff options
context:
space:
mode:
authorChristian Kamm <christian.d.kamm@nokia.com>2011-11-14 13:22:44 +0100
committerChristian Kamm <christian.d.kamm@nokia.com>2011-11-14 13:25:48 +0100
commitb182606193f30ecfb587fc9d69bae83ef304e2b7 (patch)
tree4397a32879d7d86af87922b78225c3cb25e2b477 /src/plugins
parent3df6b712e40acce3e00573d1ed22350a4f9879e2 (diff)
downloadqt-creator-b182606193f30ecfb587fc9d69bae83ef304e2b7.tar.gz
C++ editor: Reparse after applying rename.
Fixes using quick fixes directly after finishing a rename. Task-number: QTCREATORBUG-6412 Change-Id: I22ee1df5f64189e87f6a3b3ae41781ed4b24afb4 Reviewed-by: Leandro Melo <leandro.melo@nokia.com>
Diffstat (limited to 'src/plugins')
-rw-r--r--src/plugins/cppeditor/cppeditor.cpp4
1 files changed, 3 insertions, 1 deletions
diff --git a/src/plugins/cppeditor/cppeditor.cpp b/src/plugins/cppeditor/cppeditor.cpp
index 088b6d1241..5af734e633 100644
--- a/src/plugins/cppeditor/cppeditor.cpp
+++ b/src/plugins/cppeditor/cppeditor.cpp
@@ -633,6 +633,8 @@ void CPPEditorWidget::abortRename()
m_currentRenameSelectionBegin = QTextCursor();
m_currentRenameSelectionEnd = QTextCursor();
setExtraSelections(CodeSemanticsSelection, m_renameSelections);
+
+ rehighlight();
}
void CPPEditorWidget::rehighlight(bool force)
@@ -2131,7 +2133,7 @@ TextEditor::IAssistInterface *CPPEditorWidget::createAssistInterface(
includePaths,
frameworkPaths);
} else if (kind == TextEditor::QuickFix) {
- if (!semanticInfo().doc || semanticInfo().revision != editorRevision())
+ if (!semanticInfo().doc || isOutdated())
return 0;
return new CppQuickFixAssistInterface(const_cast<CPPEditorWidget *>(this), reason);
}