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

CMake: indent closing ) one level down

Browse Source 
Fixes: QTCREATORBUG-26700
Change-Id: I1b6609d0adea4a2093ca2afabac72b02a2f496f9
Reviewed-by: <github-actions-qt-creator@cristianadam.eu>
Reviewed-by: David Schulz <david.schulz@qt.io>
This commit is contained in:
Kai Köhne
2021-12-08 14:59:39 +01:00
committed by Kai Koehne
parent da10ed2483
commit 11435ebedb
1 changed files with 22 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files

31
src/plugins/cmakeprojectmanager/cmakeindenter.cpp
View File

@@ -37,6 +37,19 @@ bool CMakeIndenter::isElectricCharacter(const QChar &ch) const
return ch == QLatin1Char('(') || ch == QLatin1Char(')');
}
static int startsWithChar(const QString &line, char character)
{
int occurrences = 0;
for (int i = 0; i < line.size(); ++i) {
if (line.at(i) == character) {
occurrences++;
} else if (!line.at(i).isSpace()) {
break;
}
}
return occurrences;
}
static bool lineContainsFunction(const QString &line, const QString &function)
{
const int indexOfFunction = line.indexOf(function);
@@ -88,12 +101,8 @@ static int paranthesesLevel(const QString &line)
const QString beforeComment = line.mid(0, line.indexOf(QLatin1Char('#')));
const int opening = beforeComment.count(QLatin1Char('('));
const int closing = beforeComment.count(QLatin1Char(')'));
if (opening == closing)
return 0;
else if (opening > closing)
return 1;
else
return -1;
return opening - closing;
}
int CMakeIndenter::indentFor(const QTextBlock &block,
@@ -114,10 +123,14 @@ int CMakeIndenter::indentFor(const QTextBlock &block,
if (lineStartsBlock(previousLine))
indentation += tabSettings.m_indentSize;
if (lineEndsBlock(currentLine))
indentation = qMax(0, indentation - tabSettings.m_indentSize);
indentation -= tabSettings.m_indentSize;
// increase/decrease/keep the indentation level depending on if we have more opening or closing parantheses
return qMax(0, indentation + tabSettings.m_indentSize * paranthesesLevel(previousLine));
// de-dent lines that start with closing parantheses immediately
indentation -= tabSettings.m_indentSize * startsWithChar(currentLine, ')');
if (int paranthesesCount = paranthesesLevel(previousLine) - startsWithChar(previousLine, ')'))
indentation += tabSettings.m_indentSize * (paranthesesCount > 0 ? 1 : -1);
return qMax(0, indentation);
}
} // namespace Internal