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

Prepared padding support (as opposed to indent)

Browse Source 
This will be hooked up with the new indenter.
If you use tabs for spaces, and have tabSize==indentSize, we
will be able to preserve spaces for padding nonetheless.
This commit is contained in:
mae
2010-07-02 15:21:36 +02:00
parent df6fcd363a
commit bc0d5e38e4
2 changed files with 33 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

36
src/plugins/texteditor/tabsettings.cpp
View File

@@ -143,6 +143,18 @@ int TabSettings::indentationColumn(const QString &text) const
return columnAt(text, firstNonSpace(text)); return columnAt(text, firstNonSpace(text));
} }
int TabSettings::maximumPadding(const QString &text) const
{
int fns = columnAt(text, firstNonSpace(text));
int i = fns;
while (i > 0) {
if (text.at(i-1) != QLatin1Char(' '))
break;
--i;
}
return fns - i;
}
int TabSettings::trailingWhitespaces(const QString &text) const int TabSettings::trailingWhitespaces(const QString &text) const
{ {
@@ -286,7 +298,7 @@ QString TabSettings::indentationString(int startColumn, int targetColumn, const
return s; return s;
} }
void TabSettings::indentLine(QTextBlock block, int newIndent) const void TabSettings::indentLine(QTextBlock block, int newIndent, int padding) const
{ {
const QString text = block.text(); const QString text = block.text();
const int oldBlockLength = text.size(); const int oldBlockLength = text.size();
@@ -295,8 +307,15 @@ void TabSettings::indentLine(QTextBlock block, int newIndent) const
if (indentationColumn(text) == newIndent) if (indentationColumn(text) == newIndent)
return; return;
const QString indentString = indentationString(0, newIndent, block); QString indentString;
newIndent = indentString.length();
if (!m_spacesForTabs && m_tabSize == m_indentSize) {
// user likes tabs for spaces and uses tabs for indentation, preserve padding
indentString = indentationString(0, newIndent - padding, block);
indentString += QString(padding, QLatin1Char(' '));
} else {
indentString = indentationString(0, newIndent, block);
}
if (oldBlockLength == indentString.length() && text == indentString) if (oldBlockLength == indentString.length() && text == indentString)
return; return;
@@ -321,8 +340,15 @@ void TabSettings::reindentLine(QTextBlock block, int delta) const
if (oldIndent == newIndent) if (oldIndent == newIndent)
return; return;
const QString indentString = indentationString(0, newIndent, block); QString indentString;
newIndent = indentString.length(); if (!m_spacesForTabs && m_tabSize == m_indentSize) {
// user likes tabs for spaces and uses tabs for indentation, preserve padding
int padding = qMin(maximumPadding(text), newIndent);
indentString = indentationString(0, newIndent - padding, block);
indentString += QString(padding, QLatin1Char(' '));
} else {
indentString = indentationString(0, newIndent, block);
}
if (oldBlockLength == indentString.length() && text == indentString) if (oldBlockLength == indentString.length() && text == indentString)
return; return;

3
src/plugins/texteditor/tabsettings.h
View File

@@ -65,10 +65,11 @@ struct TEXTEDITOR_EXPORT TabSettings
QString indentationString(int startColumn, int targetColumn, const QTextBlock &currentBlock = QTextBlock()) const; QString indentationString(int startColumn, int targetColumn, const QTextBlock &currentBlock = QTextBlock()) const;
QString indentationString(const QString &text) const; QString indentationString(const QString &text) const;
int indentationColumn(const QString &text) const; int indentationColumn(const QString &text) const;
int maximumPadding(const QString &text) const;
bool cursorIsAtBeginningOfLine(const QTextCursor &cursor) const; bool cursorIsAtBeginningOfLine(const QTextCursor &cursor) const;
void indentLine(QTextBlock block, int newIndent) const; void indentLine(QTextBlock block, int newIndent, int padding = 0) const;
void reindentLine(QTextBlock block, int delta) const; void reindentLine(QTextBlock block, int delta) const;
int trailingWhitespaces(const QString &text) const; int trailingWhitespaces(const QString &text) const;