From 2a2b009535a49380ecc3c8078f934ae0fdf386ee Mon Sep 17 00:00:00 2001 From: Yaroslav Lepenkin Date: Wed, 3 Dec 2014 15:19:08 +0200 Subject: [PATCH] SimpleJavaBlock: removed unnecessary strategy calculation - it will be overwritten in AbstractJavaBlock#processChild after retrieving alignment from AbstractJavaBlock#arrangeChildWrap and wrapping it into strategy. Field in column alignment will be retrived in arrangeChildWrap method by invoking getVariableDeclarationSubElementAlignment. --- .../com/intellij/psi/formatter/java/SimpleJavaBlock.java | 8 +------- 1 file changed, 1 insertion(+), 7 deletions(-) diff --git a/java/java-impl/src/com/intellij/psi/formatter/java/SimpleJavaBlock.java b/java/java-impl/src/com/intellij/psi/formatter/java/SimpleJavaBlock.java index 55bc787ccdda..3733b156a671 100644 --- a/java/java-impl/src/com/intellij/psi/formatter/java/SimpleJavaBlock.java +++ b/java/java-impl/src/com/intellij/psi/formatter/java/SimpleJavaBlock.java @@ -85,7 +85,7 @@ public class SimpleJavaBlock extends AbstractJavaBlock { while (myCurrentChild != null) { if (isNotEmptyNode(myCurrentChild)) { final ASTNode astNode = myCurrentChild; - AlignmentStrategy alignmentStrategyToUse = getAlignmentStrategy(myCurrentChild); + AlignmentStrategy alignmentStrategyToUse = AlignmentStrategy.wrap(chooseAlignment(myReservedAlignment, myReservedAlignment2, myCurrentChild)); myCurrentChild = processChild(result, astNode, alignmentStrategyToUse, childWrap, myCurrentIndent, myCurrentOffset); if (astNode != myCurrentChild && myCurrentChild != null) { myCurrentOffset = myCurrentChild.getTextRange().getStartOffset(); @@ -124,12 +124,6 @@ public class SimpleJavaBlock extends AbstractJavaBlock { } } - private AlignmentStrategy getAlignmentStrategy(ASTNode child) { - return JavaElementType.FIELD == myNode.getElementType() - ? myAlignmentStrategy - : AlignmentStrategy.wrap(chooseAlignment(myReservedAlignment, myReservedAlignment2, child)); - } - private boolean isNotEmptyNode(@NotNull ASTNode child) { return !FormatterUtil.containsWhiteSpacesOnly(child) && child.getTextLength() > 0; }