Merge pull request #11660 from nkcsgexi/code-expand-trailing

test/SourceKit/CodeExpand/code-expand.swift

@@ -81,3 +81,10 @@ func f1() {
 // CHECK: bar(a : {}}, <#T##d: () -> ()##() -> ()#>)
 
 foo(withDuration: 1, animations: <#T##() -> Void#>)
+
+if true {
+  withtrail(<#T##() -> ()#>)
+// CHECK:   withtrail {
+// CHECK-NEXT: <#code#>
+}
+}

tools/SourceKit/lib/SwiftLang/SwiftEditor.cpp

@@ -1481,9 +1481,14 @@ private:
       bool walkToStmtPre(Stmt *S) override {
         auto SR = S->getSourceRange();
         if (SR.isValid() && SM.rangeContainsTokenLoc(SR, TargetLoc)) {
-          if (!EnclosingCall && !isa<BraceStmt>(S))
+          if (!EnclosingCall) {
+            if (isa<BraceStmt>(S))
+              // In case OuterStmt is already set, we should clear it to nullptr.
+              OuterStmt = nullptr;
+            else
               OuterStmt = S;
           }
+        }
         return true;
       }