Merge pull request #179 from Hackerpilot/issue-172

#172
dlang-community · Aug 24, 2015 · 23df06c · 23df06c
2 parents 773e8bc + 699ae10
commit 23df06c
Show file tree

Hide file tree

Showing 6 changed files with 22 additions and 5 deletions.
diff --git a/src/dfmt/formatter.d b/src/dfmt/formatter.d
@@ -1269,7 +1269,7 @@ const pure @safe @nogc:
                 break;
             if (depths[i] < d)
                 break;
-            if (!braces && tokens[i].type == tok!";")
+            if (!braces && (tokens[i].type == tok!";" || tokens[i].type == tok!"{"))
                 break;
             i++;
         }

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

diff --git a/tests/allman/issue0172.d.ref b/tests/allman/issue0172.d.ref
@@ -0,0 +1,7 @@
+final class FormatVisitor : ASTVisitor
+{
+    this(ASTInformation* astInformation)
+    {
+        this.astInformation = astInformation;
+    }
+}
diff --git a/tests/issue0172.d b/tests/issue0172.d
@@ -0,0 +1,7 @@
+final class FormatVisitor : ASTVisitor
+{
+	this(ASTInformation* astInformation)
+	{
+		this.astInformation = astInformation;
+	}
+}
diff --git a/tests/otbs/issue0153.d.ref b/tests/otbs/issue0153.d.ref
@@ -1,5 +1,4 @@
-class Foo(T) : FirstInterfaceWithVeryLongName,
-    SecondInterfaceWithVeryLongName if (is(T : Bar)) {
+class Foo(T) : FirstInterfaceWithVeryLongName, SecondInterfaceWithVeryLongName if (is(T : Bar)) {
     void foo() {
     }
 }
diff --git a/tests/otbs/issue0172.d.ref b/tests/otbs/issue0172.d.ref
@@ -0,0 +1,5 @@
+final class FormatVisitor : ASTVisitor {
+    this(ASTInformation* astInformation) {
+        this.astInformation = astInformation;
+    }
+}
-Original file line number
+Diff line change
@@ Expand Up / @@ -1269,7 +1269,7 @@ const pure @safe @nogc: @@
                     break;
                 if (depths[i] < d)
                     break;
-                if (!braces && tokens[i].type == tok!";")
+                if (!braces && (tokens[i].type == tok!";" || tokens[i].type == tok!"{"))
                     break;
                 i++;
             }
@@ Expand Down @@