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

autoformatter now formats top-level elements in aspect correctly

parent 32d35778
No related branches found
No related tags found
1 merge request!2Feature/autoformat
Pipeline #11895 canceled
...@@ -9,9 +9,7 @@ import com.intellij.psi.codeStyle.CodeStyleSettings; ...@@ -9,9 +9,7 @@ import com.intellij.psi.codeStyle.CodeStyleSettings;
import com.intellij.psi.formatter.common.AbstractBlock; import com.intellij.psi.formatter.common.AbstractBlock;
import com.intellij.psi.formatter.common.InjectedLanguageBlockBuilder; import com.intellij.psi.formatter.common.InjectedLanguageBlockBuilder;
import com.intellij.psi.formatter.java.LeafBlock; import com.intellij.psi.formatter.java.LeafBlock;
import org.jastadd.tooling.aspect.psi.JastAddAspectAspectBody; import org.jastadd.tooling.aspect.psi.*;
import org.jastadd.tooling.aspect.psi.JastAddAspectAspectBodyDeclaration;
import org.jastadd.tooling.aspect.psi.JastAddAspectBlock;
import org.jetbrains.annotations.NotNull; import org.jetbrains.annotations.NotNull;
import org.jetbrains.annotations.Nullable; import org.jetbrains.annotations.Nullable;
...@@ -52,10 +50,8 @@ public class AspectBlock extends AbstractBlock { ...@@ -52,10 +50,8 @@ public class AspectBlock extends AbstractBlock {
@Override @Override
public Indent getIndent() { public Indent getIndent() {
if (myNode.getPsi() instanceof JastAddAspectAspectBodyDeclaration) { if (myNode.getTreeParent() != null && myNode.getTreeParent().getPsi() instanceof JastAddAspectAspectBody && myNode.getElementType() != AspectTypes.RBRACE) {
return Indent.getNormalIndent(); return Indent.getNormalIndent();
} else if (myNode.getPsi() instanceof JastAddAspectAspectBody) {
return Indent.getAbsoluteNoneIndent();
} else { } else {
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