From 73297288a19b46362cdb6836914cb98663d5a491 Mon Sep 17 00:00:00 2001
From: Johannes Mey <johannes.mey@tu-dresden.de>
Date: Thu, 25 Nov 2021 23:48:29 +0100
Subject: [PATCH] improve formatting (mostly expressions now supported)
---
src/main/java/org/jastadd/tooling/aspect/AspectBlock.java | 6 ++++--
1 file changed, 4 insertions(+), 2 deletions(-)
diff --git a/src/main/java/org/jastadd/tooling/aspect/AspectBlock.java b/src/main/java/org/jastadd/tooling/aspect/AspectBlock.java
index af11eb3..f6c6d7b 100644
--- a/src/main/java/org/jastadd/tooling/aspect/AspectBlock.java
+++ b/src/main/java/org/jastadd/tooling/aspect/AspectBlock.java
@@ -38,6 +38,8 @@ public class AspectBlock extends AbstractBlock {
myInjectedBlockBuilder.addInjectedBlocks(blocks, myNode, Wrap.createWrap(WrapType.NONE, false), null, Indent.getIndent(Indent.Type.NONE, false, true));
} else if (myNode.getPsi() instanceof JastAddAspectBlock) {
myInjectedBlockBuilder.addInjectedBlocks(blocks, myNode, Wrap.createWrap(WrapType.NONE, false), null, Indent.getIndent(Indent.Type.NONE, false, true));
+ } else if (myNode.getPsi() instanceof JastAddAspectExpression) {
+ myInjectedBlockBuilder.addInjectedBlocks(blocks, myNode, Wrap.createWrap(WrapType.NONE, false), null, Indent.getIndent(Indent.Type.NONE, false, true));
} else {
ASTNode child = myNode.getFirstChildNode();
while (child != null) {
@@ -60,6 +62,8 @@ public class AspectBlock extends AbstractBlock {
return Indent.getNormalIndent();
} else if (parentPsi instanceof JastAddAspectAspectConstructorDeclaration && (myNode.getPsi() instanceof JastAddAspectExplicitConstructorInvocation || myNode.getPsi() instanceof JastAddAspectBlockStatement)) {
return Indent.getNormalIndent();
+ } else if (parentPsi instanceof JastAddAspectCollectionAttribute && (childType == AspectTypes.LBRACKET || childType == AspectTypes.ROOT)) {
+ return Indent.getNormalIndent();
} else if (parentPsi instanceof JastAddAspectCollectionContribution && (childType == AspectTypes.WHEN || childType == AspectTypes.TO || childType == AspectTypes.FOR)) {
return Indent.getNormalIndent();
}
@@ -69,8 +73,6 @@ public class AspectBlock extends AbstractBlock {
}
if (nonBlankSuccecssor != null && nonBlankSuccecssor.getElementType() == AspectTypes.ASSIGN) {
return Indent.getContinuationIndent();
- } else if (nonBlankSuccecssor != null) {
- //System.out.println(nonBlankSuccecssor.getElementType().getDebugName());
}
}
return Indent.getNoneIndent();
--
GitLab