TouchInstinct
/
checkstyle
306
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Issue #1566: partial fix of ReturnCount violations

This commit is contained in:
Ruslan Diachenko 2015-08-26 22:47:24 +01:00 committed by Roman Ivanov
parent 5478613082
commit 2af34e2adc
1 changed files with 4 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
src/main/java/com/puppycrawl/tools/checkstyle/checks/indentation/BlockParentHandler.java
View File

@ -289,20 +289,21 @@ public class BlockParentHandler extends AbstractExpressionHandler {
* @return indentation level expected for children
*/
protected IndentLevel getChildrenExpectedLevel() {
IndentLevel indentLevel = new IndentLevel(getLevel(), getBasicOffset());
// if we have multileveled expected level then we should
// try to suggest single level to children using curlies'
// levels.
if (getLevel().isMultiLevel() && hasCurlys()) {
if (startsLine(getLCurly())) {
return new IndentLevel(expandedTabsColumnNo(getLCurly()) + getBasicOffset());
indentLevel = new IndentLevel(expandedTabsColumnNo(getLCurly()) + getBasicOffset());
}
else if (startsLine(getRCurly())) {
final IndentLevel level = new IndentLevel(curlyLevel(), getBasicOffset());
level.addAcceptedIndent(level.getFirstIndentLevel() + getLineWrappingIndent());
return level;
indentLevel = level;
}
}
return new IndentLevel(getLevel(), getBasicOffset());
return indentLevel;
}
@Override