From 1dee275f58e9f9df2e2719325157cfdec42fe1cf Mon Sep 17 00:00:00 2001 From: Ivan Donchevskii Date: Mon, 28 Jan 2019 08:11:20 +0100 Subject: ClangFormat: Add cursor position to the indenter interface Sometimes it's imnportant where the cursor currently is to properly format the code without affecting the current line. Change-Id: I8b1fb11d2303adb5f960c7cb80a0ed2e6e45010f Reviewed-by: Nikolai Kosjar Reviewed-by: Marco Bubke --- src/plugins/texteditor/texteditor.cpp | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'src/plugins/texteditor/texteditor.cpp') diff --git a/src/plugins/texteditor/texteditor.cpp b/src/plugins/texteditor/texteditor.cpp index 7907259306..4e9de84f10 100644 --- a/src/plugins/texteditor/texteditor.cpp +++ b/src/plugins/texteditor/texteditor.cpp @@ -2491,7 +2491,7 @@ void TextEditorWidget::keyPressEvent(QKeyEvent *e) --extraBlocks; ensureVisible.movePosition(QTextCursor::NextBlock); if (tps.m_autoIndent) - d->m_document->autoIndent(ensureVisible); + d->m_document->autoIndent(ensureVisible, QChar::Null, cursorPosition); else if (!previousIndentationString.isEmpty()) ensureVisible.insertText(previousIndentationString); if (d->m_animateAutoComplete || d->m_highlightAutoComplete) { @@ -2773,7 +2773,7 @@ void TextEditorWidget::keyPressEvent(QKeyEvent *e) cursor.setPosition(pos, QTextCursor::KeepAnchor); } if (!electricChar.isNull() && d->m_autoCompleter->contextAllowsElectricCharacters(cursor)) - d->m_document->autoIndent(cursor, electricChar); + d->m_document->autoIndent(cursor, electricChar, cursor.position()); if (!autoText.isEmpty()) cursor.setPosition(autoText.length() == 1 ? cursor.position() : cursor.anchor()); -- cgit v1.2.1