CodeFormat: Avoid indenting the close bracket of a closure if the closure is on the RHS of an assignment expression. rdar://24507930

Author: nkcsgexi

lib/IDE/Formatting.cpp

@@ -373,8 +373,7 @@ class FormatContext {
         if (SubExpr && SubExpr == AtExprEnd &&
             SM.getLineAndColumn(Paren->getEndLoc()).first == Line)
           return false;
-      }
-      else if (auto *Tuple = dyn_cast_or_null<TupleExpr>(Cursor->getAsExpr())) {
+      } else if (auto *Tuple = dyn_cast_or_null<TupleExpr>(Cursor->getAsExpr())) {
         auto SubExprs = Tuple->getElements();
         if (!SubExprs.empty() && SubExprs.back() == AtExprEnd &&
             SM.getLineAndColumn(Tuple->getEndLoc()).first == Line) {
@@ -385,6 +384,13 @@ class FormatContext {
         if (Loc.isValid() && SM.getLineNumber(Loc) == Line) {
           return false;
         }
+      } else if(auto *Seq = dyn_cast_or_null<SequenceExpr>(Cursor->getAsExpr())) {
+        ArrayRef<Expr*> Elements = Seq->getElements();
+        if (Elements.size() == 3 &&
+            Elements[1]->getKind() == ExprKind::Assign &&
+            SM.getLineAndColumn(Elements[2]->getEndLoc()).first == Line) {
+              return false;
+        }
       }
     }
 

test/SourceKit/CodeFormat/indent-closure.swift

@@ -23,6 +23,15 @@ func foo3() {
   }
 }
 
+func foo4() {
+    test = {
+        return 0
+    }()
+    let test = {
+        return 0
+    }()
+}
+
 // 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
@@ -31,6 +40,12 @@ func foo3() {
 // RUN: %sourcekitd-test -req=format -line=8 -length=1 %s >>%t.response
 // RUN: %sourcekitd-test -req=format -line=14 -length=1 %s >>%t.response
 // RUN: %sourcekitd-test -req=format -line=22 -length=1 %s >>%t.response
+// RUN: %sourcekitd-test -req=format -line=27 -length=1 %s >>%t.response
+// RUN: %sourcekitd-test -req=format -line=28 -length=1 %s >>%t.response
+// RUN: %sourcekitd-test -req=format -line=29 -length=1 %s >>%t.response
+// RUN: %sourcekitd-test -req=format -line=30 -length=1 %s >>%t.response
+// RUN: %sourcekitd-test -req=format -line=31 -length=1 %s >>%t.response
+// RUN: %sourcekitd-test -req=format -line=32 -length=1 %s >>%t.response
 // RUN: FileCheck --strict-whitespace %s <%t.response
 
 // CHECK: key.sourcetext: "        var abc = 1"
@@ -44,3 +59,12 @@ func foo3() {
 // CHECK: key.sourcetext: "  }()"
 //                        "  foo1(1)"
 // CHECK: key.sourcetext: "  {"
+
+// CHECK: key.sourcetext: "    test = {"
+// CHECK: key.sourcetext: "        return 0"
+// CHECK: key.sourcetext: "    }()"
+
+
+// CHECK: key.sourcetext: "    let test = {"
+// CHECK: key.sourcetext: "        return 0"
+// CHECK: key.sourcetext: "    }()"