Merge pull request #25355 from nkcsgexi/indent-subs-end

SourceKit/Indentation: avoid indenting the end of subscript expressions in call chain.

Author: nkcsgexi

lib/IDE/Formatting.cpp

@@ -489,7 +489,8 @@ class FormatContext {
     // }.map { <--- No indentation here.
     //  ...
     // }
-    if (AtExprEnd && AtCursorExpr && isa<CallExpr>(AtExprEnd)) {
+    if (AtExprEnd && AtCursorExpr &&
+        (isa<CallExpr>(AtExprEnd) || isa<SubscriptExpr>(AtExprEnd))) {
       if (auto *UDE = dyn_cast<UnresolvedDotExpr>(AtCursorExpr)) {
         if (auto *Base = UDE->getBase()) {
           if (exprEndAtLine(Base, Line))

test/SourceKit/CodeFormat/indent-closure.swift

@@ -62,6 +62,11 @@ func foo9(input: [Int]){
     }
 }
 
+func foo10() {
+    Something() [
+    ].whatever
+}
+
 // 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
@@ -89,6 +94,9 @@ func foo9(input: [Int]){
 // RUN: %sourcekitd-test -req=format -line=62 -length=1 %s >>%t.response
 // RUN: %sourcekitd-test -req=format -line=63 -length=1 %s >>%t.response
 
+// 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: %FileCheck --strict-whitespace %s <%t.response
 
 // CHECK: key.sourcetext: "        var abc = 1"
@@ -125,3 +133,6 @@ func foo9(input: [Int]){
 // CHECK: key.sourcetext: "        return ele + 1"
 // CHECK: key.sourcetext: "    }"
 // CHECK: key.sourcetext: "}"
+
+// CHECK: key.sourcetext: "    Something() ["
+// CHECK: key.sourcetext: "    ].whatever"