[formatter-core] minor refactoring

This commit is contained in:
Yaroslav Lepenkin
2016-06-30 19:03:05 +03:00
parent f82ae5e6ed
commit 62602c5f80
@@ -162,8 +162,7 @@ public class InitialInfoBuilder {
collectAlignments(rootBlock);
if (isInsideFormattingRanges(rootBlock, rootBlockIsRightBlock)
|| myCollectAlignmentsInsideFormattingRange && isInsideExtendedAffectedRange(rootBlock)) {
if (isInsideFormattingRanges(rootBlock, rootBlockIsRightBlock) || shouldCollectAlignmentsAround(rootBlock)) {
final List<Block> subBlocks = rootBlock.getSubBlocks();
if (subBlocks.isEmpty()) {
final AbstractBlockWrapper wrapper = buildLeafBlock(rootBlock, parent, false, index, parentBlock);
@@ -179,6 +178,10 @@ public class InitialInfoBuilder {
}
}
private boolean shouldCollectAlignmentsAround(Block rootBlock) {
return myCollectAlignmentsInsideFormattingRange && isInsideExtendedAffectedRange(rootBlock);
}
private void collectAlignments(Block rootBlock) {
if (myCollectAlignmentsInsideFormattingRange && rootBlock.getAlignment() != null
&& isAffectedByFormatting(rootBlock) && !myInsideFormatRestrictingTag)