refactoring: when RangeInfo is of kind PartOfExpression, we should use the dedicated field to get the parent expression. rdar://36755861 (#14088)

Author: nkcsgexi

lib/IDE/Refactoring.cpp

@@ -1684,16 +1684,25 @@ bool RefactoringActionCollapseNestedIfExpr::performChange() {
 }
 
 static std::unique_ptr<llvm::SetVector<Expr*>>
-  findConcatenatedExpressions(ResolvedRangeInfo Info, ASTContext &Ctx) {
-  if (Info.Kind != RangeKind::SingleExpression
-      && Info.Kind != RangeKind::PartOfExpression)
-    return nullptr;
+findConcatenatedExpressions(ResolvedRangeInfo Info, ASTContext &Ctx) {
+  Expr *E = nullptr;
 
-  // FIXME: We should always have a valid node.
-  if (Info.ContainedNodes.empty())
+  switch (Info.Kind) {
+  case RangeKind::SingleExpression:
+    // FIXME: the range info kind should imply non-empty list.
+    if (!Info.ContainedNodes.empty())
+      E = Info.ContainedNodes[0].get<Expr*>();
+    else
+      return nullptr;
+    break;
+  case RangeKind::PartOfExpression:
+    E = Info.CommonExprParent;
+    break;
+  default:
     return nullptr;
+  }
 
-  Expr *E = Info.ContainedNodes[0].get<Expr*>();
+  assert(E);
 
   struct StringInterpolationExprFinder: public SourceEntityWalker {
     std::unique_ptr<llvm::SetVector<Expr*>> Bucket = llvm::

test/refactoring/RefactoringKind/crashers.swift

@@ -0,0 +1,11 @@
+// rdar://36755861
+func doit(_: ()->()) {}
+struct S {}
+func foo() {
+  doit {
+    let s = S()
+  }
+}
+
+// RUN: %refactor -source-filename %s -pos=6:5 -end-pos=6:13 | %FileCheck %s -check-prefix=CHECK1
+// CHECK1: Action begins