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

Do not try to align multiple assignments if line ends with comma

Browse Source
This commit is contained in:
Peter Vingelmann 2016-09-15 02:07:08 +02:00
parent 53696ac249
commit b1259192ff
1 changed files with 1 additions and 17 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

18
src/ASBeautifier.cpp
View File

@ -2347,7 +2347,6 @@ void ASBeautifier::parseCurrentLine(const string& line)
bool isInOperator = false; bool isInOperator = false;
bool isSpecialChar = false; bool isSpecialChar = false;
bool haveCaseIndent = false; bool haveCaseIndent = false;
bool haveAssignmentThisLine = false;
bool closingBracketReached = false; bool closingBracketReached = false;
bool previousLineProbation = (probationHeader != NULL); bool previousLineProbation = (probationHeader != NULL);
char ch = ' '; char ch = ' ';
@ -3514,23 +3513,8 @@ void ASBeautifier::parseCurrentLine(const string& line)
if (!isInOperator && !isInTemplate && (!isNonInStatementArray || isInEnum)) if (!isInOperator && !isInTemplate && (!isNonInStatementArray || isInEnum))
{ {
// if multiple assignments, align on the previous word
if (foundAssignmentOp == &AS_ASSIGN
&& prevNonSpaceCh != ']' // an array
&& statementEndsWithComma(line, i))
{
if (!haveAssignmentThisLine) // only one assignment indent per line
{
// register indent at previous word
haveAssignmentThisLine = true;
int prevWordIndex = getInStatementIndentAssign(line, i);
int inStatementIndent = prevWordIndex + spaceIndentCount + tabIncrementIn;
inStatementIndentStack->push_back(inStatementIndent);
isInStatement = true;
}
}
// don't indent an assignment if 'let' // don't indent an assignment if 'let'
else if (isInLet) if (isInLet)
{ {
isInLet = false; isInLet = false;
} }