MDS/openide
1
0
Fork 0
mirror of https://gitflic.ru/project/openide/openide.git synced 2026-09-27 10:03:11 +07:00
Code Issues Packages Projects Releases Wiki Activity

Return null if alignment condition is not satisfied

Browse Source
This commit is contained in:
Yaroslav Lepenkin
2015-08-28 09:42:13 +03:00
parent 742901a497
commit 7cd7e104f6
2 changed files with 15 additions and 13 deletions
Download Patch File Download Diff File Expand all files Collapse all files
java/java-impl/src/com/intellij/psi/formatter/java/ArrayInitializerBlocksBuilder.java
+2 -2
View File
@@ -59,12 +59,12 @@ public class ArrayInitializerBlocksBuilder {
.setDefaultAlignment(alignment)
.setNoAlignment(JavaTokenType.COMMA)
.setNoAlignment(JavaTokenType.LBRACE)
.setAlignmentIf(JavaTokenType.RBRACE, alignment, new Condition<ASTNode>() {
.setNoAlignmentIf(JavaTokenType.RBRACE, new Condition<ASTNode>() {
@Override
public boolean value(ASTNode node) {
PsiElement prev = PsiTreeUtil.skipSiblingsBackward(node.getPsi(), PsiWhiteSpace.class);
if (prev == null) return false;
return prev.getNode().getElementType() == JavaTokenType.COMMA;
return prev.getNode().getElementType() != JavaTokenType.COMMA;
}
});
java/java-impl/src/com/intellij/psi/formatter/java/ChildrenBlocksBuilder.java
+13 -11
View File
@@ -64,7 +64,7 @@ public class ChildrenBlocksBuilder {
private Map<IElementType, Indent> myIndents = ContainerUtil.newHashMap();
private Map<IElementType, Wrap> myWraps = ContainerUtil.newHashMap();
private Map<IElementType, Condition<ASTNode>> myApplyAlignCondition = ContainerUtil.newHashMap();
private Map<IElementType, Condition<ASTNode>> myNoneAlignmentCondition = ContainerUtil.newHashMap();
private Alignment myDefaultAlignment;
private Indent myDefaultIndent;
@@ -99,9 +99,8 @@ public class ChildrenBlocksBuilder {
return this;
}
public Config setAlignmentIf(IElementType elementType, Alignment alignment, Condition<ASTNode> applyAlignCondition) {
myAlignments.put(elementType, alignment);
myApplyAlignCondition.put(elementType, applyAlignCondition);
public Config setNoAlignmentIf(IElementType elementType, Condition<ASTNode> applyAlignCondition) {
myNoneAlignmentCondition.put(elementType, applyAlignCondition);
return this;
}
@@ -117,14 +116,17 @@ public class ChildrenBlocksBuilder {
private Alignment getAlignment(ASTNode node) {
IElementType elementType = node.getElementType();
Alignment alignment = myAlignments.get(elementType);
if (alignment != null) {
Condition<ASTNode> applyAlignCondition = myApplyAlignCondition.get(elementType);
if (applyAlignCondition == null || applyAlignCondition.value(node)) {
return alignment == NO_ALIGNMENT ? null : alignment;
}
Condition<ASTNode> noneAlignmentCondition = myNoneAlignmentCondition.get(elementType);
if (noneAlignmentCondition != null && noneAlignmentCondition.value(node)) {
return null;
}
return myDefaultAlignment;
Alignment alignment = myAlignments.get(elementType);
if (alignment == null) {
return myDefaultAlignment;
}
return alignment == NO_ALIGNMENT ? null : alignment;
}
private Wrap getWrap(IElementType elementType) {