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

Properly handle initializer blocks with double block openers. For example:

Browse Source 
std::map<uint32_t, uint32_t> generation_map(
    { {0, 100}, {1, 100}, {2, 100}, {3, 10}, {4, 10} });
This commit is contained in:
Peter Vingelmann 2016-09-29 00:20:55 +02:00
parent d39345f7cd
commit fab103cb47
1 changed files with 3 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
src/ASBeautifier.cpp
View File

@ -2909,12 +2909,13 @@ void ASBeautifier::parseCurrentLine(const string& line)
if (!inStatementIndentStack->empty()) if (!inStatementIndentStack->empty())
{ {
bool initializerBlock = bool initializerBlock =
(isInStatement && (prevNonSpaceCh == ',' || prevNonSpaceCh == '(')); (prevNonSpaceCh == ',' || prevNonSpaceCh == '('
|| prevNonSpaceCh == '{');
// Purge the inStatementIndentStack if the line begins with '{' // Purge the inStatementIndentStack if the line begins with '{'
// and this is not a possible initializer block in a statement, // and this is not a possible initializer block in a statement,
// for example: function(arg, { 1, 2, 3, 4 }); // for example: function(arg, { 1, 2, 3, 4 });
if (lineBeginsWithOpenBracket && !initializerBlock) if (i == 0 && !initializerBlock)
{ {
while (!inStatementIndentStack->empty()) while (!inStatementIndentStack->empty())
popLastInStatementIndent(); popLastInStatementIndent();