HeeroYui-deprecated/astyle
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Fixed 4-space alignment if the line ends with (

Browse Source
This commit is contained in:
Peter Vingelmann 2016-09-22 22:50:24 +02:00
parent 81b77fc202
commit 27067bcbb5
1 changed files with 16 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

25
src/ASBeautifier.cpp
View File

@ -1260,17 +1260,25 @@ void ASBeautifier::registerInStatementIndent(const string& line, int i, int spac
// Get the next program char distance to determine if the remaining // Get the next program char distance to determine if the remaining
// text is comment-only // text is comment-only
int nextProgramChar = getNextProgramCharDistance(line, i); int nextProgramChar = getNextProgramCharDistance(line, i);
bool isLastProgramChar = (nextProgramChar == remainingCharNum); bool isLastProgramChar = (nextProgramChar == remainingCharNum);
// if indent is around the last char in the line or the line ends with '(', char lastProgramChar = getLastProgramChar(line, i);
// then add only one indent from the previous indent
if (isLastProgramChar || getLastProgramChar(line, i) == '(') // Special rules if this is the last char in the line, or if the line
// ends with '('
if (isLastProgramChar || lastProgramChar == '(')
{ {
int previousIndent = spaceTabCount_; int previousIndent = spaceTabCount_;
if (!inStatementIndentStack->empty()) if (!inStatementIndentStack->empty())
previousIndent = inStatementIndentStack->back(); previousIndent = inStatementIndentStack->back();
int currIndent = /*2*/ indentLength + previousIndent; // By default, add one indent from the previous indent
int currIndent = indentLength + previousIndent;
// If the line ends with '(', then the next line will be a continuation
// of the current line, so we do not increase the previous indent
if (lastProgramChar == '(' && previousIndent > spaceIndentCount)
{
currIndent = previousIndent;
}
if (currIndent > maxInStatementIndent && line[i] != '{') if (currIndent > maxInStatementIndent && line[i] != '{')
currIndent = indentLength * 2 + spaceTabCount_; currIndent = indentLength * 2 + spaceTabCount_;
inStatementIndentStack->push_back(currIndent); inStatementIndentStack->push_back(currIndent);
@ -3450,9 +3458,6 @@ void ASBeautifier::parseCurrentLine(const string& line)
i += foundIndentableHeader->length() - 1; i += foundIndentableHeader->length() - 1;
if (!isInOperator && !isInTemplate) if (!isInOperator && !isInTemplate)
{ {
// Do not align on the right side of the return statement
// if this is a continuation line that ends with '('
if (getLastProgramChar(line, i) != '(')
registerInStatementIndent(line, i, spaceIndentCount, tabIncrementIn, 0, false); registerInStatementIndent(line, i, spaceIndentCount, tabIncrementIn, 0, false);
isInStatement = true; isInStatement = true;
} }
@ -3652,9 +3657,7 @@ void ASBeautifier::parseCurrentLine(const string& line)
{ {
if (i == 0 && spaceIndentCount == 0) if (i == 0 && spaceIndentCount == 0)
spaceIndentCount += indentLength; spaceIndentCount += indentLength;
// Do not align on the right side of the '=' sign
// if this is a continuation line that ends with '('
if (getLastProgramChar(line, i) != '(')
registerInStatementIndent(line, i, spaceIndentCount, tabIncrementIn, 0, false); registerInStatementIndent(line, i, spaceIndentCount, tabIncrementIn, 0, false);
isInStatement = true; isInStatement = true;
} }