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

Make "Edit/Advanced/Clean_Whitespace work on the current

Browse Source 
selection (if there is one)
This commit is contained in:
mae
2009-09-09 16:37:09 +02:00
parent 16e7f0c16f
commit 99435d5f0e
3 changed files with 16 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files

22
src/plugins/texteditor/basetextdocument.cpp
View File

@@ -301,13 +301,15 @@ void BaseTextDocument::setSyntaxHighlighter(QSyntaxHighlighter *highlighter)
void BaseTextDocument::cleanWhitespace() void BaseTextDocument::cleanWhitespace(const QTextCursor &cursor)
{ {
QTextCursor cursor(m_document); bool hasSelection = cursor.hasSelection();
cursor.beginEditBlock(); QTextCursor copyCursor = cursor;
cleanWhitespace(cursor, true, true); copyCursor.beginEditBlock();
ensureFinalNewLine(cursor); cleanWhitespace(copyCursor, true, true);
cursor.endEditBlock(); if (!hasSelection)
ensureFinalNewLine(copyCursor);
copyCursor.endEditBlock();
} }
void BaseTextDocument::cleanWhitespace(QTextCursor& cursor, bool cleanIndentation, bool inEntireDocument) void BaseTextDocument::cleanWhitespace(QTextCursor& cursor, bool cleanIndentation, bool inEntireDocument)
@@ -315,8 +317,12 @@ void BaseTextDocument::cleanWhitespace(QTextCursor& cursor, bool cleanIndentatio
TextEditDocumentLayout *documentLayout = qobject_cast<TextEditDocumentLayout*>(m_document->documentLayout()); TextEditDocumentLayout *documentLayout = qobject_cast<TextEditDocumentLayout*>(m_document->documentLayout());
QTextBlock block = m_document->firstBlock(); QTextBlock block = m_document->findBlock(cursor.selectionStart());
while (block.isValid()) { QTextBlock end;
if (cursor.hasSelection())
end = m_document->findBlock(cursor.selectionEnd()-1).next();
while (block.isValid() && block != end) {
if (inEntireDocument || block.revision() > documentLayout->lastSaveRevision) { if (inEntireDocument || block.revision() > documentLayout->lastSaveRevision) {

2
src/plugins/texteditor/basetextdocument.h
View File

@@ -110,7 +110,7 @@ public:
void reload(QTextCodec *codec); void reload(QTextCodec *codec);
void cleanWhitespace(); void cleanWhitespace(const QTextCursor &cursor);
signals: signals:
void titleChanged(QString title); void titleChanged(QString title);

2
src/plugins/texteditor/basetexteditor.cpp
View File

@@ -833,7 +833,7 @@ void BaseTextEditor::moveLineUpDown(bool up)
void BaseTextEditor::cleanWhitespace() void BaseTextEditor::cleanWhitespace()
{ {
d->m_document->cleanWhitespace(); d->m_document->cleanWhitespace(textCursor());
} }
void BaseTextEditor::keyPressEvent(QKeyEvent *e) void BaseTextEditor::keyPressEvent(QKeyEvent *e)