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

ClangFormat: Fix text indentation after inserted snippet

Browse Source 
Limit the range of text which is indented to the last
non-empty character inside the block.

Fixes: QTCREATORBUG-21385
Change-Id: If9bc271e7ecf81482cb682efd0f09770e6fa02f5
Reviewed-by: Marco Bubke <marco.bubke@qt.io>
This commit is contained in:
Ivan Donchevskii
2018-11-07 09:27:00 +01:00
parent ce9b813c37
commit 0a29e12d0c
1 changed files with 14 additions and 12 deletions
Download Patch File Download Diff File Expand all files Collapse all files

26
src/plugins/clangformat/clangformatindenter.cpp
View File

@@ -78,7 +78,7 @@ Replacements filteredReplacements(const Replacements &replacements,
Replacements filtered;
for (const Replacement &replacement : replacements) {
int replacementOffset = static_cast<int>(replacement.getOffset());
if (replacementOffset > offset + lengthForFilter)
if (replacementOffset >= offset + lengthForFilter)
break;
if (replacementOffset + 1 >= offset)
@@ -234,13 +234,9 @@ Replacements replacements(QByteArray buffer,
if (!status.FormatComplete)
Replacements();
int lengthForFilter = 0;
if (block == nullptr)
lengthForFilter = utf8Length;
return filteredReplacements(replacements,
utf8Offset,
lengthForFilter,
utf8Length,
extraOffset);
}
@@ -330,6 +326,17 @@ void applyReplacements(const QTextBlock &block,
}
}
QString selectedLines(QTextDocument *doc, const QTextBlock &startBlock, const QTextBlock &endBlock)
{
QString text = Utils::Text::textAt(
QTextCursor(doc),
startBlock.position(),
std::max(0, endBlock.position() + endBlock.length() - startBlock.position() - 1));
while (!text.isEmpty() && text.rbegin()->isSpace())
text.chop(1);
return text;
}
} // anonymous namespace
bool ClangFormatIndenter::isElectricCharacter(const QChar &ch) const
@@ -366,12 +373,7 @@ void ClangFormatIndenter::indent(QTextDocument *doc,
const QTextBlock end = doc->findBlock(cursor.selectionEnd());
utf8Offset = Utils::Text::utf8NthLineOffset(doc, buffer, start.blockNumber() + 1);
QTC_ASSERT(utf8Offset >= 0, return;);
utf8Length =
Utils::Text::textAt(
QTextCursor(doc),
start.position(),
std::max(0, end.position() + end.length() - start.position() - 1))
.toUtf8().size();
utf8Length = selectedLines(doc, start, end).toUtf8().size();
applyReplacements(start,
utf8Offset,
buffer,