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

Do not dedent comments in multiline class headers + Do not add InStatementIndent for commas in class headers

Browse Source
This commit is contained in:
Peter Vingelmann 2016-09-10 03:25:39 +02:00
parent 7b791f1827
commit a28cde5425
1 changed files with 3 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

15
src/ASBeautifier.cpp
View File

@ -2097,21 +2097,13 @@ void ASBeautifier::computePreliminaryIndentation()
++indentCount;
isInSwitch = true;
}
} // end of for loop
if (isInClassHeader)
{
if (!isJavaStyle())
isInClassHeaderTab = true;
if (lineOpensWithLineComment || lineStartsInComment || lineOpensWithComment)
{
if (!lineBeginsWithOpenBracket)
--indentCount;
if (!inStatementIndentStack->empty())
spaceIndentCount -= inStatementIndentStack->back();
}
else if (blockIndent)
if (blockIndent)
{
if (!lineBeginsWithOpenBracket)
++indentCount;
@ -2979,7 +2971,6 @@ void ASBeautifier::parseCurrentLine(const string& line)
if (isSharpStyle() && findKeyword(line, i, AS_LET))
isInLet = true;
} // isPotentialHeader
if (ch == '?')
@ -3103,7 +3094,8 @@ void ASBeautifier::parseCurrentLine(const string& line)
// do nothing for now
}
// register indent at second word on the line
else if (!isInTemplate && !isInClassHeaderTab && !isInClassInitializer)
else if (!isInTemplate && !isInClassHeaderTab && !isInClassInitializer
&& !isInClassHeader)
{
int prevWord = getInStatementIndentComma(line, i);
int inStatementIndent = prevWord + spaceIndentCount + tabIncrementIn;
@ -3479,5 +3471,4 @@ void ASBeautifier::parseCurrentLine(const string& line)
}
} // end of for loop * end of for loop * end of for loop * end of for loop * end of for loop *
}
} // end namespace astyle