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

do not wrap long lines, format constructors correctly

parent c66fb105
No related branches found
No related tags found
1 merge request!2Feature/autoformat
Pipeline #11898 passed
...@@ -42,7 +42,7 @@ public class AspectBlock extends AbstractBlock { ...@@ -42,7 +42,7 @@ public class AspectBlock extends AbstractBlock {
ASTNode child = myNode.getFirstChildNode(); ASTNode child = myNode.getFirstChildNode();
while (child != null) { while (child != null) {
if (child.getElementType() != TokenType.WHITE_SPACE) { 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); blocks.add(block);
} }
child = child.getTreeNext(); child = child.getTreeNext();
...@@ -58,6 +58,8 @@ public class AspectBlock extends AbstractBlock { ...@@ -58,6 +58,8 @@ public class AspectBlock extends AbstractBlock {
IElementType childType = myNode.getElementType(); IElementType childType = myNode.getElementType();
if (parentPsi instanceof JastAddAspectAspectBody && childType != AspectTypes.RBRACE) { if (parentPsi instanceof JastAddAspectAspectBody && childType != AspectTypes.RBRACE) {
return Indent.getNormalIndent(); 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)) { } else if (parentPsi instanceof JastAddAspectCollectionContribution && (childType == AspectTypes.WHEN || childType == AspectTypes.TO || childType == AspectTypes.FOR)) {
return Indent.getNormalIndent(); return Indent.getNormalIndent();
} }
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Please register or to comment