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

TextEditor: Prevent overwriting of completion settings

Browse Source 
This was a regression introduced during the editor setup refactoring.

Task-number: QTCREATORBUG-12982
Change-Id: I7b26b4105dfb50357dd2cf97d07153031d0b2dc0
Reviewed-by: Campbell Barton <ideasman42@gmail.com>
Reviewed-by: hjk <hjk121@nokiamail.com>
This commit is contained in:
hjk
2014-09-10 17:07:32 +02:00
parent b1ab94301a
commit 47a36765df
1 changed files with 5 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
src/plugins/texteditor/basetexteditor.cpp
View File

@@ -7282,14 +7282,16 @@ BaseTextEditor *BaseTextEditorFactory::createEditorHelper(const BaseTextDocument
editor->d->m_origin = this; editor->d->m_origin = this;
editor->m_widget = widget; editor->m_widget = widget;
// Needs to go before setTextDocument as this copies the current settings.
if (m_autoCompleterCreator)
widget->setAutoCompleter(m_autoCompleterCreator());
widget->setTextDocument(document); widget->setTextDocument(document);
widget->d->m_codeAssistant.configure(widget); widget->d->m_codeAssistant.configure(widget);
widget->d->m_commentDefinition.setStyle(m_commentStyle); widget->d->m_commentDefinition.setStyle(m_commentStyle);
if (m_autoCompleterCreator)
widget->setAutoCompleter(m_autoCompleterCreator());
connect(widget, &BaseTextEditorWidget::markRequested, editor, connect(widget, &BaseTextEditorWidget::markRequested, editor,
[editor](int line, BaseTextEditor::MarkRequestKind kind) { [editor](int line, BaseTextEditor::MarkRequestKind kind) {
editor->markRequested(editor, line, kind); editor->markRequested(editor, line, kind);