diff --git a/src/main/java/org/jastadd/tooling/aspect/AspectBlock.java b/src/main/java/org/jastadd/tooling/aspect/AspectBlock.java index 7dc6b9a49cd8440e797af6d6053f5ffaec8dea7b..af11eb3130ab23a400e2a1cf100cc19fe360320d 100644 --- a/src/main/java/org/jastadd/tooling/aspect/AspectBlock.java +++ b/src/main/java/org/jastadd/tooling/aspect/AspectBlock.java @@ -42,7 +42,7 @@ public class AspectBlock extends AbstractBlock { ASTNode child = myNode.getFirstChildNode(); while (child != null) { if (child.getElementType() != TokenType.WHITE_SPACE) { - Block block = new AspectBlock(child, Wrap.createWrap(WrapType.NORMAL, false), null, spacingBuilder); + Block block = new AspectBlock(child, Wrap.createWrap(WrapType.NONE, false), null, spacingBuilder); blocks.add(block); } child = child.getTreeNext(); @@ -55,9 +55,11 @@ public class AspectBlock extends AbstractBlock { public Indent getIndent() { if (myNode.getTreeParent() != null) { PsiElement parentPsi = myNode.getTreeParent().getPsi(); - IElementType childType = myNode.getElementType(); + IElementType childType = myNode.getElementType(); if (parentPsi instanceof JastAddAspectAspectBody && childType != AspectTypes.RBRACE) { return Indent.getNormalIndent(); + } else if (parentPsi instanceof JastAddAspectAspectConstructorDeclaration && (myNode.getPsi() instanceof JastAddAspectExplicitConstructorInvocation || myNode.getPsi() instanceof JastAddAspectBlockStatement)) { + return Indent.getNormalIndent(); } else if (parentPsi instanceof JastAddAspectCollectionContribution && (childType == AspectTypes.WHEN || childType == AspectTypes.TO || childType == AspectTypes.FOR)) { return Indent.getNormalIndent(); }