[SourceKit] Remove Implementation abstraction layer in FindRenameRangesAnnotatingConsumer

Author: ahoppen

include/swift/Refactoring/Refactoring.h

@@ -100,13 +100,11 @@ class FindRenameRangesConsumer {
 };
 
 class FindRenameRangesAnnotatingConsumer : public FindRenameRangesConsumer {
-  struct Implementation;
-  Implementation &Impl;
+  std::unique_ptr<SourceEditConsumer> pRewriter;
 
 public:
   FindRenameRangesAnnotatingConsumer(SourceManager &SM, unsigned BufferId,
                                      llvm::raw_ostream &OS);
-  ~FindRenameRangesAnnotatingConsumer();
   void accept(SourceManager &SM, RegionType RegionType,
               ArrayRef<RenameRangeDetail> Ranges) override;
 };

lib/Refactoring/FindRenameRangesAnnotatingConsumer.cpp

@@ -14,62 +14,50 @@
 
 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");
+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";
   }
-  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=*/{}});
-  }
-};
+  llvm_unreachable("unhandled kind");
+}
 
 swift::ide::FindRenameRangesAnnotatingConsumer::
     FindRenameRangesAnnotatingConsumer(SourceManager &SM, unsigned BufferId,
                                        raw_ostream &OS)
-    : Impl(*new Implementation(SM, BufferId, OS)) {}
-
-swift::ide::FindRenameRangesAnnotatingConsumer::
-    ~FindRenameRangesAnnotatingConsumer() {
-  delete &Impl;
-}
+    : pRewriter(new SourceEditOutputConsumer(SM, BufferId, OS)) {}
 
 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);
+    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 << ">";
+    Replacement Repl{/*Path=*/{}, Range.Range, /*BufferName=*/{}, OS.str(),
+                     /*RegionsWorthNote=*/{}};
+    pRewriter->accept(SM, Repl);
   }
 }