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

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>
This commit is contained in:
The Dlang Bot 2018-10-10 13:43:57 +02:00 committed by GitHub
parent 810e4b464f b928eb6d84
commit 18eea577f8
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
9 changed files with 18 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
src/dfmt/formatter.d
View File

@ -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);
}

2
tests/allman/attribute_constraint.d.ref
View File

@ -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))
{

2
tests/allman/issue0153.d.ref
View File

@ -1,4 +1,4 @@
class Foo(T) : FirstInterfaceWithVeryLongName, SecondInterfaceWithVeryLongName
class Foo(T) : FirstInterfaceWithVeryLongName, SecondInterfaceWithVeryLongName
if (is(T : Bar))
{
void foo()

4
tests/allman/issue0345.d.ref Normal file
View File

@ -0,0 +1,4 @@
class Bar(A) : Foo
if (isFloating!A)
{
}

1
tests/issue0345.args Normal file
View File

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

1
tests/issue0345.d Normal file
View File

@ -0,0 +1 @@
class Bar(A) : Foo if (isFloating!A){}

2
tests/otbs/attribute_constraint.d.ref
View File

@ -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)) {
}

2
tests/otbs/issue0153.d.ref
View File

@ -1,4 +1,4 @@
class Foo(T) : FirstInterfaceWithVeryLongName, SecondInterfaceWithVeryLongName
class Foo(T) : FirstInterfaceWithVeryLongName, SecondInterfaceWithVeryLongName
if (is(T : Bar)) {
void foo() {
}

3
tests/otbs/issue0345.d.ref Normal file
View File

@ -0,0 +1,3 @@
class Bar(A) : Foo
if (isFloating!A) {
}