Skip to content
Snippets Groups Projects
Commit 73297288 authored by Johannes Mey's avatar Johannes Mey
Browse files

improve formatting (mostly expressions now supported)

parent 0320894b
Branches
Tags
1 merge request!2Feature/autoformat
Pipeline #11972 passed
...@@ -38,6 +38,8 @@ public class AspectBlock extends AbstractBlock { ...@@ -38,6 +38,8 @@ public class AspectBlock extends AbstractBlock {
myInjectedBlockBuilder.addInjectedBlocks(blocks, myNode, Wrap.createWrap(WrapType.NONE, false), null, Indent.getIndent(Indent.Type.NONE, false, true)); myInjectedBlockBuilder.addInjectedBlocks(blocks, myNode, Wrap.createWrap(WrapType.NONE, false), null, Indent.getIndent(Indent.Type.NONE, false, true));
} else if (myNode.getPsi() instanceof JastAddAspectBlock) { } else if (myNode.getPsi() instanceof JastAddAspectBlock) {
myInjectedBlockBuilder.addInjectedBlocks(blocks, myNode, Wrap.createWrap(WrapType.NONE, false), null, Indent.getIndent(Indent.Type.NONE, false, true)); myInjectedBlockBuilder.addInjectedBlocks(blocks, myNode, Wrap.createWrap(WrapType.NONE, false), null, Indent.getIndent(Indent.Type.NONE, false, true));
} else if (myNode.getPsi() instanceof JastAddAspectExpression) {
myInjectedBlockBuilder.addInjectedBlocks(blocks, myNode, Wrap.createWrap(WrapType.NONE, false), null, Indent.getIndent(Indent.Type.NONE, false, true));
} else { } else {
ASTNode child = myNode.getFirstChildNode(); ASTNode child = myNode.getFirstChildNode();
while (child != null) { while (child != null) {
...@@ -60,6 +62,8 @@ public class AspectBlock extends AbstractBlock { ...@@ -60,6 +62,8 @@ public class AspectBlock extends AbstractBlock {
return Indent.getNormalIndent(); return Indent.getNormalIndent();
} else if (parentPsi instanceof JastAddAspectAspectConstructorDeclaration && (myNode.getPsi() instanceof JastAddAspectExplicitConstructorInvocation || myNode.getPsi() instanceof JastAddAspectBlockStatement)) { } else if (parentPsi instanceof JastAddAspectAspectConstructorDeclaration && (myNode.getPsi() instanceof JastAddAspectExplicitConstructorInvocation || myNode.getPsi() instanceof JastAddAspectBlockStatement)) {
return Indent.getNormalIndent(); return Indent.getNormalIndent();
} else if (parentPsi instanceof JastAddAspectCollectionAttribute && (childType == AspectTypes.LBRACKET || childType == AspectTypes.ROOT)) {
return Indent.getNormalIndent();
} else if (parentPsi instanceof JastAddAspectCollectionContribution && (childType == AspectTypes.WHEN || childType == AspectTypes.TO || childType == AspectTypes.FOR)) { } else if (parentPsi instanceof JastAddAspectCollectionContribution && (childType == AspectTypes.WHEN || childType == AspectTypes.TO || childType == AspectTypes.FOR)) {
return Indent.getNormalIndent(); return Indent.getNormalIndent();
} }
...@@ -69,8 +73,6 @@ public class AspectBlock extends AbstractBlock { ...@@ -69,8 +73,6 @@ public class AspectBlock extends AbstractBlock {
} }
if (nonBlankSuccecssor != null && nonBlankSuccecssor.getElementType() == AspectTypes.ASSIGN) { if (nonBlankSuccecssor != null && nonBlankSuccecssor.getElementType() == AspectTypes.ASSIGN) {
return Indent.getContinuationIndent(); return Indent.getContinuationIndent();
} else if (nonBlankSuccecssor != null) {
//System.out.println(nonBlankSuccecssor.getElementType().getDebugName());
} }
} }
return Indent.getNoneIndent(); return Indent.getNoneIndent();
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Please register or to comment