From e8a6b404329b7e333046198648c7e3a9eca7dd96 Mon Sep 17 00:00:00 2001 From: Hackerpilot Date: Wed, 20 Jan 2016 02:43:10 -0800 Subject: [PATCH] Fix issue where constraints would not be detected correctly while formatting. --- dub.json | 2 +- libdparse | 2 +- src/dfmt/ast_info.d | 10 +++ src/dfmt/formatter.d | 89 ++++++++++++++----------- tests/allman/attribute_constraint.d.ref | 17 +++++ tests/attribute_constraint.d | 15 +++++ tests/otbs/attribute_constraint.d.ref | 12 ++++ 7 files changed, 106 insertions(+), 41 deletions(-) create mode 100644 tests/allman/attribute_constraint.d.ref create mode 100644 tests/attribute_constraint.d create mode 100644 tests/otbs/attribute_constraint.d.ref diff --git a/dub.json b/dub.json index 6c90822..ab7d152 100644 --- a/dub.json +++ b/dub.json @@ -4,6 +4,6 @@ "targetType": "executable", "license": "BSL-1.0", "dependencies": { - "libdparse": "~>0.3.0" + "libdparse": "~>0.4.0" } } diff --git a/libdparse b/libdparse index db1a936..cd5f597 160000 --- a/libdparse +++ b/libdparse @@ -1 +1 @@ -Subproject commit db1a9364b1815eec82ac853a9765d5532571db43 +Subproject commit cd5f59744129649b0bc01c7b9a41293771a8229f diff --git a/src/dfmt/ast_info.d b/src/dfmt/ast_info.d index 4703888..043d3d3 100644 --- a/src/dfmt/ast_info.d +++ b/src/dfmt/ast_info.d @@ -29,6 +29,7 @@ struct ASTInformation sort(conditionalStatementLocations); sort(arrayStartLocations); sort(contractLocations); + sort(constraintLocations); } /// Locations of end braces for struct bodies @@ -69,6 +70,9 @@ struct ASTInformation /// Locations of "in" and "out" tokens that begin contracts size_t[] contractLocations; + + /// Locations of template constraint "if" tokens + size_t[] constraintLocations; } /// Collects information from the AST that is useful for the formatter @@ -109,6 +113,12 @@ final class FormatVisitor : ASTVisitor dec.accept(this); } + override void visit(const Constraint constraint) + { + astInformation.constraintLocations ~= constraint.location; + constraint.accept(this); + } + override void visit(const ConditionalStatement statement) { auto condition = statement.compileCondition; diff --git a/src/dfmt/formatter.d b/src/dfmt/formatter.d index 9fa70ad..c8395c3 100644 --- a/src/dfmt/formatter.d +++ b/src/dfmt/formatter.d @@ -152,6 +152,8 @@ private: void formatStep() { + import std.range : assumeSorted; + assert(index < tokens.length); if (currentIs(tok!"comment")) { @@ -207,7 +209,11 @@ private: else if ((isBlockHeader() || currentIs(tok!"version") || currentIs(tok!"debug")) && peekIs(tok!"(", false)) { - formatBlockHeader(); + if (!assumeSorted(astInformation.constraintLocations) + .equalRange(current.index).empty) + formatConstrtaint(); + else + formatBlockHeader(); } else if (currentIs(tok!"do")) { @@ -273,6 +279,47 @@ private: writeToken(); } + void formatConstrtaint() + { + 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) + { + newline(); + } + else + write(" "); + break; + case always_newline: + newline(); + 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; + } + // if + writeToken(); + // assume that the parens are present, otherwise the parser would not + // have told is there was a constraint here + write(" "); + writeParens(false); + } + string commentText(size_t i) { import std.string : strip; @@ -479,6 +526,8 @@ private: body { parenDepth--; + if (parenDepth == 0 && indents.topIs(tok!"!")) + indents.pop(); indents.popWrapIndents(); if (indents.topIs(tok!"(")) indents.pop(); @@ -492,44 +541,6 @@ 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) - { - newline(); - } - else - write(" "); - break; - case always_newline: - newline(); - 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")) { diff --git a/tests/allman/attribute_constraint.d.ref b/tests/allman/attribute_constraint.d.ref new file mode 100644 index 0000000..71da591 --- /dev/null +++ b/tests/allman/attribute_constraint.d.ref @@ -0,0 +1,17 @@ +struct SomeStructName +{ + static struct InnerStruct + { + version (linux) + { + static if (condition) + { + void longFunctionName(AAAAAAAA)(AAAAAAAA a) @property + if (someThingsAreTrue!AAAAAAAA && long_condition + && is(some < elaborate && expression)) + { + } + } + } + } +} diff --git a/tests/attribute_constraint.d b/tests/attribute_constraint.d new file mode 100644 index 0000000..6ffd3df --- /dev/null +++ b/tests/attribute_constraint.d @@ -0,0 +1,15 @@ +struct SomeStructName +{ + static struct InnerStruct + { + version (linux) + { + static if (condition) + { + void longFunctionName(AAAAAAAA)(AAAAAAAA a) @property if (someThingsAreTrue!AAAAAAAA && long_condition && is(some < elaborate && expression)) + { + } + } + } + } +} diff --git a/tests/otbs/attribute_constraint.d.ref b/tests/otbs/attribute_constraint.d.ref new file mode 100644 index 0000000..08280d2 --- /dev/null +++ b/tests/otbs/attribute_constraint.d.ref @@ -0,0 +1,12 @@ +struct SomeStructName { + static struct InnerStruct { + version (linux) { + static if (condition) { + void longFunctionName(AAAAAAAA)(AAAAAAAA a) @property + if (someThingsAreTrue!AAAAAAAA && long_condition + && is(some < elaborate && expression)) { + } + } + } + } +}