diff --git a/src/main/java/org/jastadd/tooling/aspect/AspectBlock.java b/src/main/java/org/jastadd/tooling/aspect/AspectBlock.java index 694bcc42f21e9bcab1793d2da12c72d8b367dc90..409c55c1e4a80b0130d0e132312693b869784f84 100644 --- a/src/main/java/org/jastadd/tooling/aspect/AspectBlock.java +++ b/src/main/java/org/jastadd/tooling/aspect/AspectBlock.java @@ -9,9 +9,7 @@ import com.intellij.psi.codeStyle.CodeStyleSettings; import com.intellij.psi.formatter.common.AbstractBlock; import com.intellij.psi.formatter.common.InjectedLanguageBlockBuilder; import com.intellij.psi.formatter.java.LeafBlock; -import org.jastadd.tooling.aspect.psi.JastAddAspectAspectBody; -import org.jastadd.tooling.aspect.psi.JastAddAspectAspectBodyDeclaration; -import org.jastadd.tooling.aspect.psi.JastAddAspectBlock; +import org.jastadd.tooling.aspect.psi.*; import org.jetbrains.annotations.NotNull; import org.jetbrains.annotations.Nullable; @@ -52,10 +50,8 @@ public class AspectBlock extends AbstractBlock { @Override public Indent getIndent() { - if (myNode.getPsi() instanceof JastAddAspectAspectBodyDeclaration) { + if (myNode.getTreeParent() != null && myNode.getTreeParent().getPsi() instanceof JastAddAspectAspectBody && myNode.getElementType() != AspectTypes.RBRACE) { return Indent.getNormalIndent(); - } else if (myNode.getPsi() instanceof JastAddAspectAspectBody) { - return Indent.getAbsoluteNoneIndent(); } else { return Indent.getNoneIndent(); }