forks
/
dfmt
mirror of https://github.com/dlang-community/dfmt.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

feat: conditional template constraint style 

Signed-off-by: Prajwal S N <prajwalnadig21@gmail.com>
This commit is contained in:
Prajwal S N 2023-12-29 14:06:43 +05:30
parent 6e97ea81d1
commit 7f81285c1f
No known key found for this signature in database
GPG Key ID: 60701A603988FAC2
1 changed files with 26 additions and 20 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

46
src/dfmt/ast.d
View File

@ -65,13 +65,12 @@ extern (C++) class FormatVisitor : SemanticTimeTransitiveVisitor
void indent() void indent()
{ {
if (depth) if (!depth)
{ return;
auto indent = config.indent_style == IndentStyle.space ? ' '.repeat() auto indent = config.indent_style == IndentStyle.space ? ' '.repeat()
.take(depth * 4) : '\t'.repeat().take(depth); .take(depth * 4) : '\t'.repeat().take(depth);
buf.put(indent.array); buf.put(indent.array);
length += indent.length; length += indent.length;
}
} }
void newline() void newline()
@ -82,8 +81,17 @@ extern (C++) class FormatVisitor : SemanticTimeTransitiveVisitor
isNewline = true; isNewline = true;
} }
void write(T)(T data) void conditionalNewline(T)(T data)
if (is(T : char) || is(T : dchar)) {
// If the current length is crosses the soft limit OR
// if the current length + data length crosses the hard limit,
// insert a newline.
if (length > config.dfmt_soft_max_line_length
|| (length + data.length) > config.max_line_length)
newline();
}
void write(T)(T data) if (is(T : char) || is(T : dchar))
{ {
if (isNewline) if (isNewline)
{ {
@ -94,8 +102,7 @@ extern (C++) class FormatVisitor : SemanticTimeTransitiveVisitor
length += 1; length += 1;
} }
extern (D) void write(T)(T data) extern (D) void write(T)(T data) if (!(is(T : char) || is(T : dchar)))
if (!(is(T : char) || is(T : dchar)))
{ {
if (isNewline) if (isNewline)
{ {
@ -106,7 +113,6 @@ extern (C++) class FormatVisitor : SemanticTimeTransitiveVisitor
length += data.length; length += data.length;
} }
/******************************************* /*******************************************
* Helpers to write different AST nodes to buffer * Helpers to write different AST nodes to buffer
*/ */
@ -3250,15 +3256,16 @@ extern (C++) class FormatVisitor : SemanticTimeTransitiveVisitor
case TemplateConstraintStyle._unspecified: case TemplateConstraintStyle._unspecified:
// Fallthrough to the default case // Fallthrough to the default case
case TemplateConstraintStyle.conditional_newline_indent: case TemplateConstraintStyle.conditional_newline_indent:
// This will be updated later on conditionalNewline();
goto case; depth++;
break;
case TemplateConstraintStyle.always_newline_indent: case TemplateConstraintStyle.always_newline_indent:
newline(); newline();
depth++; depth++;
break; break;
case TemplateConstraintStyle.conditional_newline: case TemplateConstraintStyle.conditional_newline:
// This will be updated later on conditionalNewline();
goto case; break;
case TemplateConstraintStyle.always_newline: case TemplateConstraintStyle.always_newline:
newline(); newline();
break; break;
@ -3271,10 +3278,9 @@ extern (C++) class FormatVisitor : SemanticTimeTransitiveVisitor
writeExpr(constraint); writeExpr(constraint);
write(')'); write(')');
if (config.dfmt_template_constraint_style == TemplateConstraintStyle.always_newline_indent || if (config.dfmt_template_constraint_style == TemplateConstraintStyle.always_newline_indent
// This condition will be updated later on || config.dfmt_template_constraint_style
config.dfmt_template_constraint_style == TemplateConstraintStyle == TemplateConstraintStyle.conditional_newline_indent)
.conditional_newline_indent)
depth--; depth--;
} }