From 7229e51126b801550d9514ff35dc814341bedc26 Mon Sep 17 00:00:00 2001 From: Johannes Mey <johannes.mey@tu-dresden.de> Date: Sat, 27 Nov 2021 01:24:34 +0100 Subject: [PATCH] add folding of enum body --- .../jastadd/tooling/aspect/AspectFoldingBuilder.java | 11 +++++++---- 1 file changed, 7 insertions(+), 4 deletions(-) diff --git a/src/main/java/org/jastadd/tooling/aspect/AspectFoldingBuilder.java b/src/main/java/org/jastadd/tooling/aspect/AspectFoldingBuilder.java index 62b269d..9fc57f8 100644 --- a/src/main/java/org/jastadd/tooling/aspect/AspectFoldingBuilder.java +++ b/src/main/java/org/jastadd/tooling/aspect/AspectFoldingBuilder.java @@ -9,10 +9,7 @@ import com.intellij.openapi.editor.FoldingGroup; import com.intellij.openapi.util.TextRange; import com.intellij.psi.PsiElement; import com.intellij.psi.util.PsiTreeUtil; -import org.jastadd.tooling.aspect.psi.JastAddAspectAspectDeclaration; -import org.jastadd.tooling.aspect.psi.JastAddAspectBlock; -import org.jastadd.tooling.aspect.psi.JastAddAspectClassDeclaration; -import org.jastadd.tooling.aspect.psi.JastAddAspectConstructorDeclaration; +import org.jastadd.tooling.aspect.psi.*; import org.jetbrains.annotations.NotNull; import org.jetbrains.annotations.Nullable; @@ -37,6 +34,12 @@ public class AspectFoldingBuilder extends FoldingBuilderEx { new TextRange(classDeclaration.getClassBody().getTextRange().getStartOffset() + 1, classDeclaration.getClassBody().getTextRange().getEndOffset() - 1))); } + Collection<JastAddAspectEnumBody> enumBodies = PsiTreeUtil.findChildrenOfType(root, JastAddAspectEnumBody.class); + for (final JastAddAspectEnumBody enumBody : enumBodies) { + descriptors.add(new FoldingDescriptor(enumBody.getNode(), + new TextRange(enumBody.getTextRange().getStartOffset() + 1, + enumBody.getTextRange().getEndOffset() - 1))); + } Collection<JastAddAspectBlock> aspectBlocks = PsiTreeUtil.findChildrenOfType(root, JastAddAspectBlock.class); for (final JastAddAspectBlock block : aspectBlocks) { descriptors.add(new FoldingDescriptor(block.getNode(), -- GitLab