From 0897c83e86c1f21aa842f98eaf9e6a348b7426c4 Mon Sep 17 00:00:00 2001 From: Prajwal S N Date: Thu, 14 Dec 2023 00:14:54 +0530 Subject: [PATCH] feat: non-conditional template constraints styles The non-conditional styles for `dfmt_template_constraint_style` are supported for now. The conditional ones will require line length tracking, which is yet to be implmented. Signed-off-by: Prajwal S N --- src/dfmt/ast.d | 26 ++++++++++++++++++++++++++ 1 file changed, 26 insertions(+) diff --git a/src/dfmt/ast.d b/src/dfmt/ast.d index 7b3b150..649973f 100644 --- a/src/dfmt/ast.d +++ b/src/dfmt/ast.d @@ -3224,12 +3224,38 @@ extern (C++) class FormatVisitor : SemanticTimeTransitiveVisitor { if (!constraint) return; + + final switch (config.dfmt_template_constraint_style) + { + case TemplateConstraintStyle._unspecified: + // Fallthrough to the default case + case TemplateConstraintStyle.conditional_newline_indent: + // This will be updated later on + goto case; + case TemplateConstraintStyle.always_newline_indent: + newline(); + depth++; + break; + case TemplateConstraintStyle.conditional_newline: + // This will be updated later on + goto case; + case TemplateConstraintStyle.always_newline: + newline(); + break; + } + write(" if"); if (config.dfmt_space_after_keywords) write(' '); write('('); writeExpr(constraint); write(')'); + + if (config.dfmt_template_constraint_style == TemplateConstraintStyle.always_newline_indent || + // This condition will be updated later on + config.dfmt_template_constraint_style == TemplateConstraintStyle + .conditional_newline_indent) + depth--; } override void visitBaseClasses(ASTCodegen.ClassDeclaration d)