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

Remove special handling for NonInStatementArray

Browse Source
This commit is contained in:
Peter Vingelmann 2016-09-21 19:57:55 +02:00
parent f4ad8a3585
commit a3ccecfa4a
1 changed files with 2 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
src/ASBeautifier.cpp
View File

@ -1318,10 +1318,6 @@ void ASBeautifier::registerInStatementIndent(const string& line, int i, int spac
&& inStatementIndent < inStatementIndentStack->back()) && inStatementIndent < inStatementIndentStack->back())
inStatementIndent = inStatementIndentStack->back(); inStatementIndent = inStatementIndentStack->back();
// the block opener is not indented for a NonInStatementArray
if (isNonInStatementArray && !isInEnum && !bracketBlockStateStack->empty() && bracketBlockStateStack->back())
inStatementIndent = 0;
inStatementIndentStack->push_back(inStatementIndent); inStatementIndentStack->push_back(inStatementIndent);
} }
@ -3405,7 +3401,7 @@ void ASBeautifier::parseCurrentLine(const string& line)
{ {
// must bypass the header before registering the in statement // must bypass the header before registering the in statement
i += foundIndentableHeader->length() - 1; i += foundIndentableHeader->length() - 1;
if (!isInOperator && !isInTemplate && !isNonInStatementArray) if (!isInOperator && !isInTemplate)
{ {
registerInStatementIndent(line, i, spaceIndentCount, tabIncrementIn, 0, false); registerInStatementIndent(line, i, spaceIndentCount, tabIncrementIn, 0, false);
isInStatement = true; isInStatement = true;
@ -3595,7 +3591,7 @@ void ASBeautifier::parseCurrentLine(const string& line)
if (foundAssignmentOp->length() > 1) if (foundAssignmentOp->length() > 1)
i += foundAssignmentOp->length() - 1; i += foundAssignmentOp->length() - 1;
if (!isInOperator && !isInTemplate && (!isNonInStatementArray || isInEnum)) if (!isInOperator && !isInTemplate)
{ {
// don't indent an assignment if 'let' // don't indent an assignment if 'let'
if (isInLet) if (isInLet)