[Refactoring] Move TrailingClosure to its own file

lib/Refactoring/CMakeLists.txt

@@ -22,6 +22,7 @@ add_swift_host_library(swiftRefactoring STATIC
   Renamer.cpp
   ReplaceBodiesWithFatalError.cpp
   SimplifyNumberLiteral.cpp
+  TrailingClosure.cpp
   Utils.cpp
 )
 

lib/Refactoring/Refactoring.cpp

@@ -566,95 +566,6 @@ collectRefactoringsAtCursor(SourceFile *SF, unsigned Line, unsigned Column,
   return collectRefactorings(Tok, /*ExcludeRename=*/false);
 }
 
-static CallExpr *findTrailingClosureTarget(SourceManager &SM,
-                                           ResolvedCursorInfoPtr CursorInfo) {
-  if (CursorInfo->getKind() == CursorInfoKind::StmtStart)
-    // StmtStart postion can't be a part of CallExpr.
-    return nullptr;
-
-  // Find inner most CallExpr
-  ContextFinder Finder(
-      *CursorInfo->getSourceFile(), CursorInfo->getLoc(), [](ASTNode N) {
-        return N.isStmt(StmtKind::Brace) || N.isExpr(ExprKind::Call);
-      });
-  Finder.resolve();
-  auto contexts = Finder.getContexts();
-  if (contexts.empty())
-    return nullptr;
-
-  // If the innermost context is a statement (which will be a BraceStmt per
-  // the filtering condition above), drop it.
-  if (contexts.back().is<Stmt *>()) {
-    contexts = contexts.drop_back();
-  }
-
-  if (contexts.empty() || !contexts.back().is<Expr*>())
-    return nullptr;
-  CallExpr *CE = cast<CallExpr>(contexts.back().get<Expr*>());
-
-  // The last argument is a non-trailing closure?
-  auto *Args = CE->getArgs();
-  if (Args->empty() || Args->hasAnyTrailingClosures())
-    return nullptr;
-
-  auto *LastArg = Args->back().getExpr();
-  if (auto *ICE = dyn_cast<ImplicitConversionExpr>(LastArg))
-    LastArg = ICE->getSyntacticSubExpr();
-
-  if (isa<ClosureExpr>(LastArg) || isa<CaptureListExpr>(LastArg))
-    return CE;
-  return nullptr;
-}
-
-bool RefactoringActionTrailingClosure::isApplicable(
-    ResolvedCursorInfoPtr CursorInfo, DiagnosticEngine &Diag) {
-  SourceManager &SM = CursorInfo->getSourceFile()->getASTContext().SourceMgr;
-  return findTrailingClosureTarget(SM, CursorInfo);
-}
-
-bool RefactoringActionTrailingClosure::performChange() {
-  auto *CE = findTrailingClosureTarget(SM, CursorInfo);
-  if (!CE)
-    return true;
-
-  auto *ArgList = CE->getArgs()->getOriginalArgs();
-  auto LParenLoc = ArgList->getLParenLoc();
-  auto RParenLoc = ArgList->getRParenLoc();
-
-  if (LParenLoc.isInvalid() || RParenLoc.isInvalid())
-    return true;
-
-  auto NumArgs = ArgList->size();
-  if (NumArgs == 0)
-    return true;
-
-  auto *ClosureArg = ArgList->getExpr(NumArgs - 1);
-  if (auto *ICE = dyn_cast<ImplicitConversionExpr>(ClosureArg))
-    ClosureArg = ICE->getSyntacticSubExpr();
-
-  // Replace:
-  //   * Open paren with ' ' if the closure is sole argument.
-  //   * Comma with ') ' otherwise.
-  if (NumArgs > 1) {
-    auto *PrevArg = ArgList->getExpr(NumArgs - 2);
-    CharSourceRange PreRange(
-        SM,
-        Lexer::getLocForEndOfToken(SM, PrevArg->getEndLoc()),
-        ClosureArg->getStartLoc());
-    EditConsumer.accept(SM, PreRange, ") ");
-  } else {
-    CharSourceRange PreRange(SM, LParenLoc, ClosureArg->getStartLoc());
-    EditConsumer.accept(SM, PreRange, " ");
-  }
-  // Remove original closing paren.
-  CharSourceRange PostRange(
-      SM,
-      Lexer::getLocForEndOfToken(SM, ClosureArg->getEndLoc()),
-      Lexer::getLocForEndOfToken(SM, RParenLoc));
-  EditConsumer.remove(SM, PostRange);
-  return false;
-}
-
 static bool collectRangeStartRefactorings(const ResolvedRangeInfo &Info) {
   switch (Info.Kind) {
   case RangeKind::SingleExpression:

lib/Refactoring/TrailingClosure.cpp

@@ -0,0 +1,104 @@
+//===----------------------------------------------------------------------===//
+//
+// This source file is part of the Swift.org open source project
+//
+// Copyright (c) 2014 - 2023 Apple Inc. and the Swift project authors
+// Licensed under Apache License v2.0 with Runtime Library Exception
+//
+// See https://swift.org/LICENSE.txt for license information
+// See https://swift.org/CONTRIBUTORS.txt for the list of Swift project authors
+//
+//===----------------------------------------------------------------------===//
+
+#include "ContextFinder.h"
+#include "RefactoringActions.h"
+#include "swift/AST/Stmt.h"
+
+using namespace swift::refactoring;
+
+static CallExpr *findTrailingClosureTarget(SourceManager &SM,
+                                           ResolvedCursorInfoPtr CursorInfo) {
+  if (CursorInfo->getKind() == CursorInfoKind::StmtStart)
+    // StmtStart postion can't be a part of CallExpr.
+    return nullptr;
+
+  // Find inner most CallExpr
+  ContextFinder Finder(
+      *CursorInfo->getSourceFile(), CursorInfo->getLoc(), [](ASTNode N) {
+        return N.isStmt(StmtKind::Brace) || N.isExpr(ExprKind::Call);
+      });
+  Finder.resolve();
+  auto contexts = Finder.getContexts();
+  if (contexts.empty())
+    return nullptr;
+
+  // If the innermost context is a statement (which will be a BraceStmt per
+  // the filtering condition above), drop it.
+  if (contexts.back().is<Stmt *>()) {
+    contexts = contexts.drop_back();
+  }
+
+  if (contexts.empty() || !contexts.back().is<Expr *>())
+    return nullptr;
+  CallExpr *CE = cast<CallExpr>(contexts.back().get<Expr *>());
+
+  // The last argument is a non-trailing closure?
+  auto *Args = CE->getArgs();
+  if (Args->empty() || Args->hasAnyTrailingClosures())
+    return nullptr;
+
+  auto *LastArg = Args->back().getExpr();
+  if (auto *ICE = dyn_cast<ImplicitConversionExpr>(LastArg))
+    LastArg = ICE->getSyntacticSubExpr();
+
+  if (isa<ClosureExpr>(LastArg) || isa<CaptureListExpr>(LastArg))
+    return CE;
+  return nullptr;
+}
+
+bool RefactoringActionTrailingClosure::isApplicable(
+    ResolvedCursorInfoPtr CursorInfo, DiagnosticEngine &Diag) {
+  SourceManager &SM = CursorInfo->getSourceFile()->getASTContext().SourceMgr;
+  return findTrailingClosureTarget(SM, CursorInfo);
+}
+
+bool RefactoringActionTrailingClosure::performChange() {
+  auto *CE = findTrailingClosureTarget(SM, CursorInfo);
+  if (!CE)
+    return true;
+
+  auto *ArgList = CE->getArgs()->getOriginalArgs();
+  auto LParenLoc = ArgList->getLParenLoc();
+  auto RParenLoc = ArgList->getRParenLoc();
+
+  if (LParenLoc.isInvalid() || RParenLoc.isInvalid())
+    return true;
+
+  auto NumArgs = ArgList->size();
+  if (NumArgs == 0)
+    return true;
+
+  auto *ClosureArg = ArgList->getExpr(NumArgs - 1);
+  if (auto *ICE = dyn_cast<ImplicitConversionExpr>(ClosureArg))
+    ClosureArg = ICE->getSyntacticSubExpr();
+
+  // Replace:
+  //   * Open paren with ' ' if the closure is sole argument.
+  //   * Comma with ') ' otherwise.
+  if (NumArgs > 1) {
+    auto *PrevArg = ArgList->getExpr(NumArgs - 2);
+    CharSourceRange PreRange(
+        SM, Lexer::getLocForEndOfToken(SM, PrevArg->getEndLoc()),
+        ClosureArg->getStartLoc());
+    EditConsumer.accept(SM, PreRange, ") ");
+  } else {
+    CharSourceRange PreRange(SM, LParenLoc, ClosureArg->getStartLoc());
+    EditConsumer.accept(SM, PreRange, " ");
+  }
+  // Remove original closing paren.
+  CharSourceRange PostRange(
+      SM, Lexer::getLocForEndOfToken(SM, ClosureArg->getEndLoc()),
+      Lexer::getLocForEndOfToken(SM, RParenLoc));
+  EditConsumer.remove(SM, PostRange);
+  return false;
+}