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

Editor: Fix whitespace cleaning.

Browse Source 
Task-number: QTCREATORBUG-7994
Change-Id: I6c197ccc3a148555018e8f8184d116c88d7ea400
Reviewed-by: Christian Stenger <christian.stenger@theqtcompany.com>
Reviewed-by: Eike Ziller <eike.ziller@theqtcompany.com>
This commit is contained in:
David Schulz
2016-01-13 14:32:23 +01:00
parent bc921b46a2
commit 9aa51d4857
22 changed files with 346 additions and 200 deletions
Download Patch File Download Diff File Expand all files Collapse all files

46
src/plugins/android/javaindenter.cpp
View File

@@ -48,40 +48,36 @@ bool JavaIndenter::isElectricCharacter(const QChar &ch) const
}
void JavaIndenter::indentBlock(QTextDocument *doc,
const QTextBlock &block,
const QChar &typedChar,
const TextEditor::TabSettings &tabSettings)
const QTextBlock &block,
const QChar &typedChar,
const TextEditor::TabSettings &tabSettings)
{
// At beginning: Leave as is.
if (block == doc->begin())
return;
const int tabsize = tabSettings.m_indentSize;
Q_UNUSED(doc);
int indent = indentFor(block, tabSettings);
if (typedChar == QLatin1Char('}'))
indent -= tabSettings.m_indentSize;
tabSettings.indentLine(block, qMax(0, indent));
}
int JavaIndenter::indentFor(const QTextBlock &block,
const TextEditor::TabSettings &tabSettings)
{
QTextBlock previous = block.previous();
if (!previous.isValid())
return 0;
QString previousText = previous.text();
while (previousText.trimmed().isEmpty()) {
previous = previous.previous();
if (previous == doc->begin())
return;
if (!previous.isValid())
return 0;
previousText = previous.text();
}
int adjust = 0;
if (previousText.contains(QLatin1Char('{')))
adjust = tabsize;
int indent = tabSettings.indentationColumn(previousText);
if (block.text().contains(QLatin1Char('}')) || typedChar == QLatin1Char('}'))
adjust += -tabsize;
int adjust = previousText.count(QLatin1Char('{')) - previousText.count(QLatin1Char('}'));
adjust *= tabSettings.m_indentSize;
// Count the indentation of the previous line.
int i = 0;
while (i < previousText.size()) {
if (!previousText.at(i).isSpace()) {
tabSettings.indentLine(block, tabSettings.columnAt(previousText, i)
+ adjust);
break;
}
++i;
}
return qMax(0, indent + adjust);
}