From 98760306910c540c5269624d038f28535f7eddb7 Mon Sep 17 00:00:00 2001
From: Johannes Mey <johannes.mey@tu-dresden.de>
Date: Tue, 23 Nov 2021 00:55:09 +0100
Subject: [PATCH] do not wrap long lines, format constructors correctly

---
 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 7dc6b9a..af11eb3 100644
--- a/src/main/java/org/jastadd/tooling/aspect/AspectBlock.java
+++ b/src/main/java/org/jastadd/tooling/aspect/AspectBlock.java
@@ -42,7 +42,7 @@ public class AspectBlock extends AbstractBlock {
       ASTNode child = myNode.getFirstChildNode();
       while (child != null) {
         if (child.getElementType() != TokenType.WHITE_SPACE) {
-          Block block = new AspectBlock(child, Wrap.createWrap(WrapType.NORMAL, false), null, spacingBuilder);
+          Block block = new AspectBlock(child, Wrap.createWrap(WrapType.NONE, false), null, spacingBuilder);
           blocks.add(block);
         }
         child = child.getTreeNext();
@@ -55,9 +55,11 @@ public class AspectBlock extends AbstractBlock {
   public Indent getIndent() {
     if (myNode.getTreeParent() != null) {
       PsiElement parentPsi = myNode.getTreeParent().getPsi();
-      IElementType childType =  myNode.getElementType();
+      IElementType childType = myNode.getElementType();
       if (parentPsi instanceof JastAddAspectAspectBody && childType != AspectTypes.RBRACE) {
         return Indent.getNormalIndent();
+      } else if (parentPsi instanceof JastAddAspectAspectConstructorDeclaration && (myNode.getPsi() instanceof JastAddAspectExplicitConstructorInvocation || myNode.getPsi() instanceof JastAddAspectBlockStatement)) {
+        return Indent.getNormalIndent();
       } else if (parentPsi instanceof JastAddAspectCollectionContribution && (childType == AspectTypes.WHEN || childType == AspectTypes.TO || childType == AspectTypes.FOR)) {
         return Indent.getNormalIndent();
       }
-- 
GitLab