Merge pull request #398 from LaurentTreguier/issue-345

Fix #345 - Case of trailing white space merged-on-behalf-of: BBasile <BBasile@users.noreply.github.com>
dlang-community · Oct 10, 2018 · 18eea57 · 18eea57
2 parents 810e4b4 + b928eb6
commit 18eea57
Show file tree

Hide file tree

Showing 9 changed files with 18 additions and 8 deletions.
diff --git a/src/dfmt/formatter.d b/src/dfmt/formatter.d
@@ -308,7 +308,7 @@ private:
                             || peekBack2Is(tok!")")
                             || peekBack2Is(tok!"]") )
                         && currentIs(tok!("(") )
-                    || isBasicType(current.type) || currentIs(tok!"@") || currentIs(tok!"if")
+                    || isBasicType(current.type) || currentIs(tok!"@")
                     || isNumberLiteral(tokens[index].type)
                     || (inAsm  && peekBack2Is(tok!";") && currentIs(tok!"["))
             )))
@@ -337,7 +337,7 @@ private:
             immutable l = currentLineLength + betweenParenLength(tokens[index + 1 .. $]);
             if (l > config.dfmt_soft_max_line_length)
                 newline();
-            else if (peekBackIs(tok!")"))
+            else if (peekBackIs(tok!")") || peekBackIs(tok!"identifier"))
                 write(" ");
             break;
         case always_newline:
@@ -351,7 +351,7 @@ private:
                     pushWrapIndent() : pushWrapIndent(tok!"!");
                 newline();
             }
-            else if (peekBackIs(tok!")"))
+            else if (peekBackIs(tok!")") || peekBackIs(tok!"identifier"))
                 write(" ");
             break;
         case always_newline_indent:
@@ -646,7 +646,7 @@ private:
         }
         else if (index < tokens.length && (currentIs(tok!"@")
                 || isBasicType(tokens[index].type)
-                || currentIs(tok!"identifier") || currentIs(tok!"if"))
+                || currentIs(tok!"identifier"))
                 && !currentIsIndentedTemplateConstraint())
             write(" ");
     }
@@ -1161,6 +1161,7 @@ private:
         return index < tokens.length
             && astInformation.constraintLocations.canFindIndex(current.index)
             && (config.dfmt_template_constraint_style == TemplateConstraintStyle.always_newline
+                || config.dfmt_template_constraint_style == TemplateConstraintStyle.always_newline_indent
                 || currentLineLength >= config.dfmt_soft_max_line_length);
     }
 

diff --git a/tests/allman/attribute_constraint.d.ref b/tests/allman/attribute_constraint.d.ref
@@ -6,7 +6,7 @@ struct SomeStructName
         {
             static if (condition)
             {
-                void longFunctionName(AAAAAAAA)(AAAAAAAA a) @property 
+                void longFunctionName(AAAAAAAA)(AAAAAAAA a) @property
                         if (someThingsAreTrue!AAAAAAAA && long_condition
                             && is(elaborate == expression))
                 {

diff --git a/tests/allman/issue0153.d.ref b/tests/allman/issue0153.d.ref
@@ -1,4 +1,4 @@
-class Foo(T) : FirstInterfaceWithVeryLongName, SecondInterfaceWithVeryLongName 
+class Foo(T) : FirstInterfaceWithVeryLongName, SecondInterfaceWithVeryLongName
         if (is(T : Bar))
 {
     void foo()

diff --git a/tests/allman/issue0345.d.ref b/tests/allman/issue0345.d.ref
@@ -0,0 +1,4 @@
+class Bar(A) : Foo
+if (isFloating!A)
+{
+}
diff --git a/tests/issue0345.args b/tests/issue0345.args
@@ -0,0 +1 @@
+--template_constraint_style=always_newline
diff --git a/tests/issue0345.d b/tests/issue0345.d
@@ -0,0 +1 @@
+class Bar(A) : Foo if (isFloating!A){}
diff --git a/tests/otbs/attribute_constraint.d.ref b/tests/otbs/attribute_constraint.d.ref
@@ -2,7 +2,7 @@ struct SomeStructName {
     static struct InnerStruct {
         version (linux) {
             static if (condition) {
-                void longFunctionName(AAAAAAAA)(AAAAAAAA a) @property 
+                void longFunctionName(AAAAAAAA)(AAAAAAAA a) @property
                         if (someThingsAreTrue!AAAAAAAA && long_condition
                             && is(elaborate == expression)) {
                 }

diff --git a/tests/otbs/issue0153.d.ref b/tests/otbs/issue0153.d.ref
@@ -1,4 +1,4 @@
-class Foo(T) : FirstInterfaceWithVeryLongName, SecondInterfaceWithVeryLongName 
+class Foo(T) : FirstInterfaceWithVeryLongName, SecondInterfaceWithVeryLongName
         if (is(T : Bar)) {
     void foo() {
     }

diff --git a/tests/otbs/issue0345.d.ref b/tests/otbs/issue0345.d.ref
@@ -0,0 +1,3 @@
+class Bar(A) : Foo
+if (isFloating!A) {
+}