Fix indentation of callchains with comments

Weird formatting and indentation of multiline callchains with comments in the middle.
dlang-community · Aug 6, 2022 · 8d42254 · 8d42254
1 parent 2a4af7a
commit 8d42254
Show file tree

Hide file tree

Showing 4 changed files with 6 additions and 3 deletions.
diff --git a/src/dfmt/formatter.d b/src/dfmt/formatter.d
@@ -499,6 +499,9 @@ private:
 
             if (peekIs(tok!"(") && (peekBackIs(tok!")") || peekBack2Is(tok!"!")))
                 pushWrapIndent(tok!"(");
+
+            if (peekIs(tok!".") && !indents.topIs(tok!"."))
+                indents.push(tok!".");
         }
         writeToken();
         immutable j = justAddedExtraNewline;

diff --git a/tests/allman/comments.d.ref b/tests/allman/comments.d.ref
@@ -2,6 +2,6 @@ int /*sneaky*/ foo( /*comments*/ ) /*everywhere*/
 {
     // comment on its own line
     foo() // comment on same line
-    .bar(); // also on same line
+        .bar(); // also on same line
     /* again */ // same line
 }
diff --git a/tests/knr/comments.d.ref b/tests/knr/comments.d.ref
@@ -2,6 +2,6 @@ int /*sneaky*/ foo( /*comments*/ ) /*everywhere*/
 {
     // comment on its own line
     foo() // comment on same line
-    .bar(); // also on same line
+        .bar(); // also on same line
     /* again */ // same line
 }
diff --git a/tests/otbs/comments.d.ref b/tests/otbs/comments.d.ref
@@ -1,6 +1,6 @@
 int /*sneaky*/ foo( /*comments*/ ) /*everywhere*/ {
     // comment on its own line
     foo() // comment on same line
-    .bar(); // also on same line
+        .bar(); // also on same line
     /* again */ // same line
 }