From 7fa11c850557633c73b99d63d2871d076afcc097 Mon Sep 17 00:00:00 2001 From: Hackerpilot Date: Mon, 18 Jan 2016 17:59:26 -0800 Subject: [PATCH] Initial work on #215 --- src/dfmt/config.d | 12 ++++++++++ src/dfmt/formatter.d | 45 ++++++++++++++++++++++++++++++++++- src/dfmt/indentation.d | 2 +- src/dfmt/main.d | 8 +++++-- src/dfmt/tokens.d | 22 +++++++++++++++++ tests/allman/issue0215a.d.ref | 18 ++++++++++++++ tests/allman/issue0215b.d.ref | 18 ++++++++++++++ tests/allman/issue0215c.d.ref | 19 +++++++++++++++ tests/allman/issue0215d.d.ref | 19 +++++++++++++++ tests/issue0215a.args | 1 + tests/issue0215a.d | 15 ++++++++++++ tests/issue0215b.args | 1 + tests/issue0215b.d | 15 ++++++++++++ tests/issue0215c.args | 1 + tests/issue0215c.d | 15 ++++++++++++ tests/issue0215d.args | 1 + tests/issue0215d.d | 15 ++++++++++++ tests/otbs/issue0215a.d.ref | 15 ++++++++++++ tests/otbs/issue0215b.d.ref | 15 ++++++++++++ tests/otbs/issue0215c.d.ref | 16 +++++++++++++ tests/otbs/issue0215d.d.ref | 16 +++++++++++++ 21 files changed, 285 insertions(+), 4 deletions(-) create mode 100644 tests/allman/issue0215a.d.ref create mode 100644 tests/allman/issue0215b.d.ref create mode 100644 tests/allman/issue0215c.d.ref create mode 100644 tests/allman/issue0215d.d.ref create mode 100644 tests/issue0215a.args create mode 100644 tests/issue0215a.d create mode 100644 tests/issue0215b.args create mode 100644 tests/issue0215b.d create mode 100644 tests/issue0215c.args create mode 100644 tests/issue0215c.d create mode 100644 tests/issue0215d.args create mode 100644 tests/issue0215d.d create mode 100644 tests/otbs/issue0215a.d.ref create mode 100644 tests/otbs/issue0215b.d.ref create mode 100644 tests/otbs/issue0215c.d.ref create mode 100644 tests/otbs/issue0215d.d.ref diff --git a/src/dfmt/config.d b/src/dfmt/config.d index f83f656..060fdab 100644 --- a/src/dfmt/config.d +++ b/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; } /** diff --git a/src/dfmt/formatter.d b/src/dfmt/formatter.d index 05b18b3..842bec2 100644 --- a/src/dfmt/formatter.d +++ b/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; } diff --git a/src/dfmt/indentation.d b/src/dfmt/indentation.d index 55ea95e..8211af2 100644 --- a/src/dfmt/indentation.d +++ b/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 { diff --git a/src/dfmt/main.d b/src/dfmt/main.d index 12d1953..00fbeca 100644 --- a/src/dfmt/main.d +++ b/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) diff --git a/src/dfmt/tokens.d b/src/dfmt/tokens.d index c5d09e7..8ef032c 100644 --- a/src/dfmt/tokens.d +++ b/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; diff --git a/tests/allman/issue0215a.d.ref b/tests/allman/issue0215a.d.ref new file mode 100644 index 0000000..d0a9509 --- /dev/null +++ b/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) + { + + } + } +} diff --git a/tests/allman/issue0215b.d.ref b/tests/allman/issue0215b.d.ref new file mode 100644 index 0000000..cdaabfd --- /dev/null +++ b/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) + { + + } + } +} diff --git a/tests/allman/issue0215c.d.ref b/tests/allman/issue0215c.d.ref new file mode 100644 index 0000000..7b8bf0c --- /dev/null +++ b/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) + { + + } + } +} diff --git a/tests/allman/issue0215d.d.ref b/tests/allman/issue0215d.d.ref new file mode 100644 index 0000000..f43d9d5 --- /dev/null +++ b/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) + { + + } + } +} diff --git a/tests/issue0215a.args b/tests/issue0215a.args new file mode 100644 index 0000000..76819e0 --- /dev/null +++ b/tests/issue0215a.args @@ -0,0 +1 @@ +--template_constraint_style=conditional_newline_indent diff --git a/tests/issue0215a.d b/tests/issue0215a.d new file mode 100644 index 0000000..4386760 --- /dev/null +++ b/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) + { + + } + } +} diff --git a/tests/issue0215b.args b/tests/issue0215b.args new file mode 100644 index 0000000..a420be3 --- /dev/null +++ b/tests/issue0215b.args @@ -0,0 +1 @@ +--template_constraint_style=conditional_newline diff --git a/tests/issue0215b.d b/tests/issue0215b.d new file mode 100644 index 0000000..4386760 --- /dev/null +++ b/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) + { + + } + } +} diff --git a/tests/issue0215c.args b/tests/issue0215c.args new file mode 100644 index 0000000..65552f6 --- /dev/null +++ b/tests/issue0215c.args @@ -0,0 +1 @@ +--template_constraint_style=always_newline diff --git a/tests/issue0215c.d b/tests/issue0215c.d new file mode 100644 index 0000000..4386760 --- /dev/null +++ b/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) + { + + } + } +} diff --git a/tests/issue0215d.args b/tests/issue0215d.args new file mode 100644 index 0000000..81e7ccf --- /dev/null +++ b/tests/issue0215d.args @@ -0,0 +1 @@ +--template_constraint_style=always_newline_indent diff --git a/tests/issue0215d.d b/tests/issue0215d.d new file mode 100644 index 0000000..4386760 --- /dev/null +++ b/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) + { + + } + } +} diff --git a/tests/otbs/issue0215a.d.ref b/tests/otbs/issue0215a.d.ref new file mode 100644 index 0000000..9daad81 --- /dev/null +++ b/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) { + + } + } +} diff --git a/tests/otbs/issue0215b.d.ref b/tests/otbs/issue0215b.d.ref new file mode 100644 index 0000000..af5a581 --- /dev/null +++ b/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) { + + } + } +} diff --git a/tests/otbs/issue0215c.d.ref b/tests/otbs/issue0215c.d.ref new file mode 100644 index 0000000..702571e --- /dev/null +++ b/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) { + + } + } +} diff --git a/tests/otbs/issue0215d.d.ref b/tests/otbs/issue0215d.d.ref new file mode 100644 index 0000000..05c935d --- /dev/null +++ b/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) { + + } + } +}