Initial work on #215

src/dfmt/config.d

@@ -19,6 +19,15 @@ enum BraceStyle
     stroustrup
 }
 
+enum TemplateConstraintStyle
+{
+	unspecified,
+    conditional_newline_indent,
+    conditional_newline,
+    always_newline,
+    always_newline_indent
+}
+
 /// Configuration options for formatting
 struct Config
 {
@@ -40,6 +49,8 @@ struct Config
     OptionalBoolean dfmt_selective_import_space;
     ///
     OptionalBoolean dfmt_compact_labeled_statements;
+    ///
+    TemplateConstraintStyle dfmt_template_constraint_style;
 
     mixin StandardEditorConfigFields;
 
@@ -65,6 +76,7 @@ struct Config
         dfmt_split_operator_at_line_end = OptionalBoolean.f;
         dfmt_selective_import_space = OptionalBoolean.t;
         dfmt_compact_labeled_statements = OptionalBoolean.t;
+        dfmt_template_constraint_style = TemplateConstraintStyle.conditional_newline_indent;
     }
 
     /**

src/dfmt/formatter.d

@@ -491,6 +491,48 @@ private:
             if (spaceAfterParens || parenDepth > 0)
                 write(" ");
         }
+        else if (peekIs(tok!"if") && !indents.topIsTemp())
+        {
+            writeToken();
+            if (!peekIs(tok!"("))
+                return;
+            // assume that "if" following ")" is a template constraint
+            with (TemplateConstraintStyle) final switch (config.dfmt_template_constraint_style)
+            {
+            case unspecified:
+                assert(false, "Config was not validated properly");
+            case conditional_newline:
+                immutable l = currentLineLength + betweenParenLength(tokens[index + 1 .. $]);
+                if (l > config.dfmt_soft_max_line_length)
+                {
+                    // The order of these two calls is intentional
+                    newline();
+                    pushWrapIndent(tok!"!");
+                }
+                else
+                    write(" ");
+                break;
+            case always_newline:
+                // The order of these two calls is intentional
+                newline();
+                pushWrapIndent(tok!"!");
+                break;
+            case conditional_newline_indent:
+                immutable l = currentLineLength + betweenParenLength(tokens[index + 1 .. $]);
+                if (l > config.dfmt_soft_max_line_length)
+                {
+                    pushWrapIndent(tok!"!");
+                    newline();
+                }
+                else
+                    write(" ");
+                break;
+            case always_newline_indent:
+                pushWrapIndent(tok!"!");
+                newline();
+                break;
+            }
+        }
         else if ((peekIsKeyword() || peekIs(tok!"@")) && spaceAfterParens
                 && !peekIs(tok!"in") && !peekIs(tok!"is"))
         {
@@ -540,7 +582,6 @@ private:
                     indents.push(tok!"@");
                 newline();
             }
-
         }
         else if (peekBackIs(tok!"identifier") && (peekBack2Is(tok!"{", true)
                 || peekBack2Is(tok!"}", true) || peekBack2Is(tok!";", true)
@@ -1352,6 +1393,8 @@ private:
                 formatStep();
         }
         while (index < tokens.length && parenDepth > 0);
+        if (indents.topIs(tok!"!"))
+            indents.pop();
         parenDepth = depth;
         spaceAfterParens = spaceAfter;
     }

src/dfmt/indentation.d

@@ -17,7 +17,7 @@ bool isWrapIndent(IdType type) pure nothrow @nogc @safe
 }
 
 /**
- * Returns: true if the given token type is a wrap indent type
+ * Returns: true if the given token type is a temporary indent type
  */
 bool isTempIndent(IdType type) pure nothrow @nogc @safe
 {

src/dfmt/main.d

@@ -60,6 +60,7 @@ else
 
         try
         {
+            // dfmt off
             getopt(args,
                 "version", &showVersion,
                 "align_switch_statements", &handleBooleans,
@@ -76,7 +77,9 @@ else
                 "selective_import_space", &handleBooleans,
                 "split_operator_at_line_end", &handleBooleans,
                 "compact_labeled_statements", &handleBooleans,
-                "tab_width", &optConfig.tab_width);
+                "tab_width", &optConfig.tab_width,
+                "template_constraint_style", &optConfig.dfmt_template_constraint_style);
+            // dfmt on
         }
         catch (GetOptException e)
         {
@@ -207,7 +210,8 @@ Formatting Options:
     --space_after_cast
     --selective_import_space
     --split_operator_at_line_end
-    --compact_labeled_statements`);
+    --compact_labeled_statements
+    --template_constraint_style	`, optionsToString!(typeof(Config.dfmt_template_constraint_style))());
 }
 
 private string createFilePath(bool readFromStdin, string fileName)

src/dfmt/tokens.d

@@ -10,6 +10,28 @@ import dparse.lexer;
 /// Length of an invalid token
 enum int INVALID_TOKEN_LENGTH = -1;
 
+uint betweenParenLength(const Token[] tokens) pure @safe @nogc
+in
+{
+    assert(tokens[0].type == tok!"(");
+}
+body
+{
+    uint length = 0;
+    size_t i = 1;
+    int depth = 1;
+    while (i < tokens.length && depth > 0)
+    {
+        if (tokens[i].type == tok!"(")
+            depth++;
+        else if (tokens[i].type == tok!")")
+            depth--;
+        length += tokenLength(tokens[i]);
+        i++;
+    }
+    return length;
+}
+
 int tokenLength(ref const Token t) pure @safe @nogc
 {
     import std.algorithm : countUntil;

tests/allman/issue0215a.d.ref

@@ -0,0 +1,18 @@
+module example;
+
+bool aTemplatedFunction(One)(One alpha) if (isNumeric!One)
+{
+}
+
+unittest
+{
+    {
+        bool anotherTemplatedFunction(One, Two, Three)(One alpha, Two bravo,
+            Three charlie, double delta)
+            if (isNumeric!One && isNumeric!Two && isNumeric!Three && echo
+            && foxtrot && golf && hotel && india && juliet)
+        {
+
+        }
+    }
+}

tests/allman/issue0215b.d.ref

@@ -0,0 +1,18 @@
+module example;
+
+bool aTemplatedFunction(One)(One alpha) if (isNumeric!One)
+{
+}
+
+unittest
+{
+    {
+        bool anotherTemplatedFunction(One, Two, Three)(One alpha, Two bravo,
+            Three charlie, double delta)
+        if (isNumeric!One && isNumeric!Two && isNumeric!Three && echo
+            && foxtrot && golf && hotel && india && juliet)
+        {
+
+        }
+    }
+}

tests/allman/issue0215c.d.ref

@@ -0,0 +1,19 @@
+module example;
+
+bool aTemplatedFunction(One)(One alpha)
+if (isNumeric!One)
+{
+}
+
+unittest
+{
+    {
+        bool anotherTemplatedFunction(One, Two, Three)(One alpha, Two bravo,
+            Three charlie, double delta)
+        if (isNumeric!One && isNumeric!Two && isNumeric!Three && echo
+            && foxtrot && golf && hotel && india && juliet)
+        {
+
+        }
+    }
+}

tests/allman/issue0215d.d.ref

@@ -0,0 +1,19 @@
+module example;
+
+bool aTemplatedFunction(One)(One alpha)
+    if (isNumeric!One)
+{
+}
+
+unittest
+{
+    {
+        bool anotherTemplatedFunction(One, Two, Three)(One alpha, Two bravo,
+            Three charlie, double delta)
+            if (isNumeric!One && isNumeric!Two && isNumeric!Three && echo
+            && foxtrot && golf && hotel && india && juliet)
+        {
+
+        }
+    }
+}

tests/issue0215a.args

@@ -0,0 +1 @@
+--template_constraint_style=conditional_newline_indent

tests/issue0215a.d

@@ -0,0 +1,15 @@
+module example;
+
+bool aTemplatedFunction(One)(One alpha) if (isNumeric!One)
+{
+}
+
+unittest
+{
+	{
+		bool anotherTemplatedFunction(One, Two, Three)(One alpha, Two bravo, Three charlie, double delta) if (isNumeric!One && isNumeric!Two && isNumeric!Three && echo && foxtrot && golf && hotel && india && juliet)
+		{
+
+		}
+	}
+}

tests/issue0215b.args

@@ -0,0 +1 @@
+--template_constraint_style=conditional_newline

tests/issue0215b.d

@@ -0,0 +1,15 @@
+module example;
+
+bool aTemplatedFunction(One)(One alpha) if (isNumeric!One)
+{
+}
+
+unittest
+{
+	{
+		bool anotherTemplatedFunction(One, Two, Three)(One alpha, Two bravo, Three charlie, double delta) if (isNumeric!One && isNumeric!Two && isNumeric!Three && echo && foxtrot && golf && hotel && india && juliet)
+		{
+
+		}
+	}
+}

tests/issue0215c.args

@@ -0,0 +1 @@
+--template_constraint_style=always_newline

tests/issue0215c.d

@@ -0,0 +1,15 @@
+module example;
+
+bool aTemplatedFunction(One)(One alpha) if (isNumeric!One)
+{
+}
+
+unittest
+{
+	{
+		bool anotherTemplatedFunction(One, Two, Three)(One alpha, Two bravo, Three charlie, double delta) if (isNumeric!One && isNumeric!Two && isNumeric!Three && echo && foxtrot && golf && hotel && india && juliet)
+		{
+
+		}
+	}
+}

tests/issue0215d.args

@@ -0,0 +1 @@
+--template_constraint_style=always_newline_indent

tests/issue0215d.d

@@ -0,0 +1,15 @@
+module example;
+
+bool aTemplatedFunction(One)(One alpha) if (isNumeric!One)
+{
+}
+
+unittest
+{
+	{
+		bool anotherTemplatedFunction(One, Two, Three)(One alpha, Two bravo, Three charlie, double delta) if (isNumeric!One && isNumeric!Two && isNumeric!Three && echo && foxtrot && golf && hotel && india && juliet)
+		{
+
+		}
+	}
+}

tests/otbs/issue0215a.d.ref

@@ -0,0 +1,15 @@
+module example;
+
+bool aTemplatedFunction(One)(One alpha) if (isNumeric!One) {
+}
+
+unittest {
+    {
+        bool anotherTemplatedFunction(One, Two, Three)(One alpha, Two bravo,
+            Three charlie, double delta)
+            if (isNumeric!One && isNumeric!Two && isNumeric!Three && echo
+            && foxtrot && golf && hotel && india && juliet) {
+
+        }
+    }
+}

tests/otbs/issue0215b.d.ref

@@ -0,0 +1,15 @@
+module example;
+
+bool aTemplatedFunction(One)(One alpha) if (isNumeric!One) {
+}
+
+unittest {
+    {
+        bool anotherTemplatedFunction(One, Two, Three)(One alpha, Two bravo,
+            Three charlie, double delta)
+        if (isNumeric!One && isNumeric!Two && isNumeric!Three && echo
+            && foxtrot && golf && hotel && india && juliet) {
+
+        }
+    }
+}

tests/otbs/issue0215c.d.ref

@@ -0,0 +1,16 @@
+module example;
+
+bool aTemplatedFunction(One)(One alpha)
+if (isNumeric!One) {
+}
+
+unittest {
+    {
+        bool anotherTemplatedFunction(One, Two, Three)(One alpha, Two bravo,
+            Three charlie, double delta)
+        if (isNumeric!One && isNumeric!Two && isNumeric!Three && echo
+            && foxtrot && golf && hotel && india && juliet) {
+
+        }
+    }
+}

tests/otbs/issue0215d.d.ref

@@ -0,0 +1,16 @@
+module example;
+
+bool aTemplatedFunction(One)(One alpha)
+    if (isNumeric!One) {
+}
+
+unittest {
+    {
+        bool anotherTemplatedFunction(One, Two, Three)(One alpha, Two bravo,
+            Three charlie, double delta)
+            if (isNumeric!One && isNumeric!Two && isNumeric!Three && echo
+            && foxtrot && golf && hotel && india && juliet) {
+
+        }
+    }
+}