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

Editor: Separate auto insert brace and quote magic.

Browse Source 
To allow enabling/disabling both features separately.

Change-Id: Ica154e3b400823de7cf22daf006958802d751c64
Reviewed-by: Nikolai Kosjar <nikolai.kosjar@qt.io>
This commit is contained in:
David Schulz
2016-04-14 09:00:05 +02:00
parent 94fc57c005
commit 7595aaa227
17 changed files with 485 additions and 335 deletions
Download Patch File Download Diff File Expand all files Collapse all files

19
src/plugins/texteditor/texteditor.cpp
View File

@@ -2331,15 +2331,15 @@ void TextEditorWidget::keyPressEvent(QKeyEvent *e)
if (e->modifiers() == Qt::NoModifier) {
AutoCompleter *ac = d->m_autoCompleter.data();
if (inOverwriteMode) {
ac->setAutoParenthesesEnabled(d->autoParenthesisOverwriteBackup);
ac->setSurroundWithEnabled(d->surroundWithEnabledOverwriteBackup);
ac->setAutoInsertBracketsEnabled(d->autoParenthesisOverwriteBackup);
ac->setSurroundWithBracketsEnabled(d->surroundWithEnabledOverwriteBackup);
setOverwriteMode(false);
viewport()->update();
} else {
d->autoParenthesisOverwriteBackup = ac->isAutoParenthesesEnabled();
d->surroundWithEnabledOverwriteBackup = ac->isSurroundWithEnabled();
ac->setAutoParenthesesEnabled(false);
ac->setSurroundWithEnabled(false);
d->autoParenthesisOverwriteBackup = ac->isAutoInsertBracketsEnabled();
d->surroundWithEnabledOverwriteBackup = ac->isSurroundWithBracketsEnabled();
ac->setAutoInsertBracketsEnabled(false);
ac->setSurroundWithBracketsEnabled(false);
setOverwriteMode(true);
}
e->accept();
@@ -6545,9 +6545,10 @@ void TextEditorWidget::setStorageSettings(const StorageSettings &storageSettings
void TextEditorWidget::setCompletionSettings(const CompletionSettings &completionSettings)
{
d->m_autoCompleter->setAutoParenthesesEnabled(completionSettings.m_autoInsertBrackets);
d->m_autoCompleter->setSurroundWithEnabled(completionSettings.m_autoInsertBrackets
&& completionSettings.m_surroundingAutoBrackets);
d->m_autoCompleter->setAutoInsertBracketsEnabled(completionSettings.m_autoInsertBrackets);
d->m_autoCompleter->setSurroundWithBracketsEnabled(completionSettings.m_surroundingAutoBrackets);
d->m_autoCompleter->setAutoInsertQuotesEnabled(completionSettings.m_autoInsertQuotes);
d->m_autoCompleter->setSurroundWithQuotesEnabled(completionSettings.m_surroundingAutoQuotes);
d->m_codeAssistant.updateFromCompletionSettings(completionSettings);
}