From e08f3f4063050f70a643ffd94cfb15c35aabb2da Mon Sep 17 00:00:00 2001
From: Johannes Mey <johannes.mey@tu-dresden.de>
Date: Fri, 19 Nov 2021 00:15:24 +0100
Subject: [PATCH] autoformatter now formats top-level elements in aspect
correctly
---
src/main/java/org/jastadd/tooling/aspect/AspectBlock.java | 8 ++------
1 file changed, 2 insertions(+), 6 deletions(-)
diff --git a/src/main/java/org/jastadd/tooling/aspect/AspectBlock.java b/src/main/java/org/jastadd/tooling/aspect/AspectBlock.java
index 694bcc4..409c55c 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();
}
--
GitLab