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

TextEditor: Insert clang-format removal blocker at the end

Browse Source 
... of an "empty" line.
Otherwise previous leading whitespace will survive re-formatting.
Also reset the formatting cursors when setting a new change set.

Fixes: QTCREATORBUG-30244
Change-Id: I3fb8668b56c3823972d4acda8da9657fb0bbfe41
Reviewed-by: David Schulz <david.schulz@qt.io>
This commit is contained in:
Christian Kandeler
2024-01-29 12:42:09 +01:00
parent 43221e4953
commit 02de46110e
1 changed files with 6 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -202,6 +202,7 @@ void RefactoringFile::setChangeSet(const ChangeSet &changeSet)
return; return;
m_changes = changeSet; m_changes = changeSet;
m_formattingCursors.clear();
} }
void RefactoringFile::setOpenEditor(bool activate, int pos) void RefactoringFile::setOpenEditor(bool activate, int pos)
@@ -365,8 +366,11 @@ void RefactoringFile::doFormatting()
QTextBlock b = firstBlock; QTextBlock b = firstBlock;
while (true) { while (true) {
QTC_ASSERT(b.isValid(), break); QTC_ASSERT(b.isValid(), break);
if (b.text().simplified().isEmpty()) if (b.text().simplified().isEmpty()) {
QTextCursor(b).insertText(clangFormatLineRemovalBlocker); QTextCursor c(b);
c.movePosition(QTextCursor::EndOfBlock);
c.insertText(clangFormatLineRemovalBlocker);
}
if (b == lastBlock) if (b == lastBlock)
break; break;
b = b.next(); b = b.next();