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/cpptools/cppqtstyleindenter.cpp | 13 +++++++++---- 1 file changed, 9 insertions(+), 4 deletions(-) (limited to 'src/plugins/cpptools/cppqtstyleindenter.cpp') diff --git a/src/plugins/cpptools/cppqtstyleindenter.cpp b/src/plugins/cpptools/cppqtstyleindenter.cpp index 97ffd666e3..fe9b17828e 100644 --- a/src/plugins/cpptools/cppqtstyleindenter.cpp +++ b/src/plugins/cpptools/cppqtstyleindenter.cpp @@ -93,7 +93,8 @@ static bool isElectricInLine(const QChar ch, const QString &text) void CppQtStyleIndenter::indentBlock(const QTextBlock &block, const QChar &typedChar, - const TextEditor::TabSettings &tabSettings) + const TextEditor::TabSettings &tabSettings, + int /*cursorPositionInEditor*/) { QtStyleCodeFormatter codeFormatter(tabSettings, codeStyleSettings()); @@ -121,7 +122,8 @@ void CppQtStyleIndenter::indentBlock(const QTextBlock &block, void CppQtStyleIndenter::indent(const QTextCursor &cursor, const QChar &typedChar, - const TextEditor::TabSettings &tabSettings) + const TextEditor::TabSettings &tabSettings, + int /*cursorPositionInEditor*/) { if (cursor.hasSelection()) { QTextBlock block = m_doc->findBlock(cursor.selectionStart()); @@ -160,7 +162,8 @@ void CppQtStyleIndenter::invalidateCache() } int CppQtStyleIndenter::indentFor(const QTextBlock &block, - const TextEditor::TabSettings &tabSettings) + const TextEditor::TabSettings &tabSettings, + int /*cursorPositionInEditor*/) { QtStyleCodeFormatter codeFormatter(tabSettings, codeStyleSettings()); @@ -180,7 +183,9 @@ CppCodeStyleSettings CppQtStyleIndenter::codeStyleSettings() const } TextEditor::IndentationForBlock CppQtStyleIndenter::indentationForBlocks( - const QVector &blocks, const TextEditor::TabSettings &tabSettings) + const QVector &blocks, + const TextEditor::TabSettings &tabSettings, + int /*cursorPositionInEditor*/) { QtStyleCodeFormatter codeFormatter(tabSettings, codeStyleSettings()); -- cgit v1.2.1