Merge pull request #25362 from nkcsgexi/dot-expr-closure

Sourcekit/Indentation: avoid indenting dot member access appearing after trailing closure

Author: nkcsgexi

lib/IDE/Formatting.cpp

@@ -289,6 +289,15 @@ class FormatContext {
           isKeywordPossibleDeclStart(*TInfo.StartOfLineBeforeTarget) &&
           TInfo.StartOfLineBeforeTarget->isKeyword())
         return false;
+      // VStack {
+      //   ...
+      // }
+      // .onAppear { <---- No indentation here.
+      if (TInfo.StartOfLineTarget->getKind() == tok::period &&
+          TInfo.StartOfLineBeforeTarget->getKind() == tok::r_brace &&
+          TInfo.StartOfLineBeforeTarget + 1 == TInfo.StartOfLineTarget) {
+        return false;
+      }
     }
 
     // Handle switch / case, indent unless at a case label.

test/SourceKit/CodeFormat/indent-closure.swift

@@ -67,6 +67,13 @@ func foo10() {
     ].whatever
 }
 
+func foo11() {
+    VStack {
+    }
+        .onAppear {
+    }
+}
+
 // RUN: %sourcekitd-test -req=format -line=3 -length=1 %s >%t.response
 // RUN: %sourcekitd-test -req=format -line=4 -length=1 %s >>%t.response
 // RUN: %sourcekitd-test -req=format -line=5 -length=1 %s >>%t.response
@@ -96,6 +103,7 @@ func foo10() {
 
 // RUN: %sourcekitd-test -req=format -line=66 -length=1 %s >>%t.response
 // RUN: %sourcekitd-test -req=format -line=67 -length=1 %s >>%t.response
+// RUN: %sourcekitd-test -req=format -line=73 -length=1 %s >>%t.response
 
 // RUN: %FileCheck --strict-whitespace %s <%t.response
 
@@ -136,3 +144,4 @@ func foo10() {
 
 // CHECK: key.sourcetext: "    Something() ["
 // CHECK: key.sourcetext: "    ].whatever"
+// CHECK: key.sourcetext: "    .onAppear {"