[Refactoring] Move FindRenameRangesAnnotatingConsumer to its own file

Author: ahoppen

lib/Refactoring/CMakeLists.txt

@@ -27,6 +27,7 @@ add_swift_host_library(swiftRefactoring STATIC
   ExtractRepeatedExpr.cpp
   ExtractFunction.cpp
   FillProtocolStubs.cpp
+  FindRenameRangesAnnotatingConsumer.cpp
   LocalizeString.cpp
   LocalRename.cpp
   MemberwiseInitLocalRefactoring.cpp

lib/Refactoring/FindRenameRangesAnnotatingConsumer.cpp

@@ -0,0 +1,75 @@
+//===----------------------------------------------------------------------===//
+//
+// 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 "RefactoringActions.h"
+
+using namespace swift::refactoring;
+
+struct swift::ide::FindRenameRangesAnnotatingConsumer::Implementation {
+  std::unique_ptr<SourceEditConsumer> pRewriter;
+  Implementation(SourceManager &SM, unsigned BufferId, raw_ostream &OS)
+      : pRewriter(new SourceEditOutputConsumer(SM, BufferId, OS)) {}
+  static StringRef tag(RefactoringRangeKind Kind) {
+    switch (Kind) {
+    case RefactoringRangeKind::BaseName:
+      return "base";
+    case RefactoringRangeKind::KeywordBaseName:
+      return "keywordBase";
+    case RefactoringRangeKind::ParameterName:
+      return "param";
+    case RefactoringRangeKind::NoncollapsibleParameterName:
+      return "noncollapsibleparam";
+    case RefactoringRangeKind::DeclArgumentLabel:
+      return "arglabel";
+    case RefactoringRangeKind::CallArgumentLabel:
+      return "callarg";
+    case RefactoringRangeKind::CallArgumentColon:
+      return "callcolon";
+    case RefactoringRangeKind::CallArgumentCombined:
+      return "callcombo";
+    case RefactoringRangeKind::SelectorArgumentLabel:
+      return "sel";
+    }
+    llvm_unreachable("unhandled kind");
+  }
+  void accept(SourceManager &SM, const RenameRangeDetail &Range) {
+    std::string NewText;
+    llvm::raw_string_ostream OS(NewText);
+    StringRef Tag = tag(Range.RangeKind);
+    OS << "<" << Tag;
+    if (Range.Index.has_value())
+      OS << " index=" << *Range.Index;
+    OS << ">" << Range.Range.str() << "</" << Tag << ">";
+    pRewriter->accept(SM, {/*Path=*/{}, Range.Range, /*BufferName=*/{},
+                           OS.str(), /*RegionsWorthNote=*/{}});
+  }
+};
+
+swift::ide::FindRenameRangesAnnotatingConsumer::
+    FindRenameRangesAnnotatingConsumer(SourceManager &SM, unsigned BufferId,
+                                       raw_ostream &OS)
+    : Impl(*new Implementation(SM, BufferId, OS)) {}
+
+swift::ide::FindRenameRangesAnnotatingConsumer::
+    ~FindRenameRangesAnnotatingConsumer() {
+  delete &Impl;
+}
+
+void swift::ide::FindRenameRangesAnnotatingConsumer::accept(
+    SourceManager &SM, RegionType RegionType,
+    ArrayRef<RenameRangeDetail> Ranges) {
+  if (RegionType == RegionType::Mismatch || RegionType == RegionType::Unmatched)
+    return;
+  for (const auto &Range : Ranges) {
+    Impl.accept(SM, Range);
+  }
+}

lib/Refactoring/Refactoring.cpp

@@ -115,65 +115,6 @@ SourceLoc swift::ide::RangeConfig::getEnd(SourceManager &SM) {
   return getStart(SM).getAdvancedLoc(Length);
 }
 
-struct swift::ide::FindRenameRangesAnnotatingConsumer::Implementation {
-  std::unique_ptr<SourceEditConsumer> pRewriter;
-  Implementation(SourceManager &SM, unsigned BufferId, raw_ostream &OS)
-  : pRewriter(new SourceEditOutputConsumer(SM, BufferId, OS)) {}
-  static StringRef tag(RefactoringRangeKind Kind) {
-    switch (Kind) {
-      case RefactoringRangeKind::BaseName:
-        return "base";
-      case RefactoringRangeKind::KeywordBaseName:
-        return "keywordBase";
-      case RefactoringRangeKind::ParameterName:
-        return "param";
-      case RefactoringRangeKind::NoncollapsibleParameterName:
-        return "noncollapsibleparam";
-      case RefactoringRangeKind::DeclArgumentLabel:
-        return "arglabel";
-      case RefactoringRangeKind::CallArgumentLabel:
-        return "callarg";
-      case RefactoringRangeKind::CallArgumentColon:
-        return "callcolon";
-      case RefactoringRangeKind::CallArgumentCombined:
-        return "callcombo";
-      case RefactoringRangeKind::SelectorArgumentLabel:
-        return "sel";
-    }
-    llvm_unreachable("unhandled kind");
-  }
-  void accept(SourceManager &SM, const RenameRangeDetail &Range) {
-    std::string NewText;
-    llvm::raw_string_ostream OS(NewText);
-    StringRef Tag = tag(Range.RangeKind);
-    OS << "<" << Tag;
-    if (Range.Index.has_value())
-      OS << " index=" << *Range.Index;
-    OS << ">" << Range.Range.str() << "</" << Tag << ">";
-    pRewriter->accept(SM, {/*Path=*/{}, Range.Range, /*BufferName=*/{},
-                           OS.str(), /*RegionsWorthNote=*/{}});
-  }
-};
-
-swift::ide::FindRenameRangesAnnotatingConsumer::
-FindRenameRangesAnnotatingConsumer(SourceManager &SM, unsigned BufferId,
-                                   raw_ostream &OS) :
-    Impl(*new Implementation(SM, BufferId, OS)) {}
-
-swift::ide::FindRenameRangesAnnotatingConsumer::~FindRenameRangesAnnotatingConsumer() {
-  delete &Impl;
-}
-
-void swift::ide::FindRenameRangesAnnotatingConsumer::
-accept(SourceManager &SM, RegionType RegionType,
-       ArrayRef<RenameRangeDetail> Ranges) {
-  if (RegionType == RegionType::Mismatch || RegionType == RegionType::Unmatched)
-    return;
-  for (const auto &Range : Ranges) {
-    Impl.accept(SM, Range);
-  }
-}
-
 SmallVector<RefactorAvailabilityInfo, 0>
 swift::ide::collectRefactorings(ResolvedCursorInfoPtr CursorInfo,
                                 bool ExcludeRename) {