Merge pull request #6008 from nkcsgexi/edits-serialization

Author: swift-ci

include/swift/Basic/Edit.h

@@ -10,11 +10,23 @@
 //
 //===----------------------------------------------------------------------===//
 
+#ifndef SWIFT_BASIC_EDIT_H
+#define SWIFT_BASIC_EDIT_H
+
 #include "swift/Basic/LLVM.h"
+#include "swift/Basic/SourceLoc.h"
+
 namespace swift {
   class SourceManager;
   class CharSourceRange;
 
-  void writeEdit(SourceManager &SM, CharSourceRange Range, StringRef Text,
-                 llvm::raw_ostream &OS);
+  struct SingleEdit {
+    SourceManager &SM;
+    CharSourceRange Range;
+    std::string Text;
+  };
+
+  void writeEditsInJson(ArrayRef<SingleEdit> Edits, llvm::raw_ostream &OS);
 }
+
+#endif // SWIFT_BASIC_EDIT_H

lib/Basic/Edit.cpp

@@ -14,23 +14,30 @@
 #include "swift/Basic/Edit.h"
 #include "swift/Basic/SourceManager.h"
 
-void swift::writeEdit(SourceManager &SM, CharSourceRange Range, StringRef Text,
-                 llvm::raw_ostream &OS) {
-  SourceLoc Loc = Range.getStart();
-  unsigned BufID = SM.findBufferContainingLoc(Loc);
-  unsigned Offset = SM.getLocOffsetInBuffer(Loc, BufID);
-  unsigned Length = Range.getByteLength();
-  StringRef Path(SM.getIdentifierForBuffer(BufID));
+void swift::
+writeEditsInJson(ArrayRef<SingleEdit> AllEdits, llvm::raw_ostream &OS) {
+  OS << "[\n";
+  for (auto &Edit : AllEdits) {
+    SourceManager &SM = Edit.SM;
+    CharSourceRange Range = Edit.Range;
+    StringRef Text = Edit.Text;
+    SourceLoc Loc = Range.getStart();
+    unsigned BufID = SM.findBufferContainingLoc(Loc);
+    unsigned Offset = SM.getLocOffsetInBuffer(Loc, BufID);
+    unsigned Length = Range.getByteLength();
+    StringRef Path(SM.getIdentifierForBuffer(BufID));
 
-  OS << " {\n";
-  OS << "  \"file\": \"";
-  OS.write_escaped(Path) << "\",\n";
-  OS << "  \"offset\": " << Offset << ",\n";
-  if (Length != 0)
-    OS << "  \"remove\": " << Length << ",\n";
-  if (!Text.empty()) {
-    OS << "  \"text\": \"";
-    OS.write_escaped(Text) << "\",\n";
+    OS << " {\n";
+    OS << "  \"file\": \"";
+    OS.write_escaped(Path) << "\",\n";
+    OS << "  \"offset\": " << Offset << ",\n";
+    if (Length != 0)
+      OS << "  \"remove\": " << Length << ",\n";
+    if (!Text.empty()) {
+      OS << "  \"text\": \"";
+      OS.write_escaped(Text) << "\",\n";
+    }
+    OS << " },\n";
   }
-  OS << " },\n";
+  OS << "]\n";
 }

lib/FrontendTool/FrontendTool.cpp

@@ -564,26 +564,25 @@ namespace {
 class JSONFixitWriter : public DiagnosticConsumer {
   std::unique_ptr<llvm::raw_ostream> OSPtr;
   bool FixitAll;
+  std::vector<SingleEdit> AllEdits;
 
 public:
   JSONFixitWriter(std::unique_ptr<llvm::raw_ostream> OS,
                   const DiagnosticOptions &DiagOpts)
     : OSPtr(std::move(OS)),
-      FixitAll(DiagOpts.FixitCodeForAllDiagnostics) {
-    *OSPtr << "[\n";
-  }
+      FixitAll(DiagOpts.FixitCodeForAllDiagnostics) {}
+
   ~JSONFixitWriter() {
-    *OSPtr << "]\n";
+    swift::writeEditsInJson(llvm::makeArrayRef(AllEdits), *OSPtr);
   }
-
 private:
   void handleDiagnostic(SourceManager &SM, SourceLoc Loc,
                         DiagnosticKind Kind, StringRef Text,
                         const DiagnosticInfo &Info) override {
     if (!shouldFix(Kind, Info))
       return;
     for (const auto &Fix : Info.FixIts) {
-      swift::writeEdit(SM, Fix.getRange(), Fix.getText(), *OSPtr);
+      AllEdits.push_back({SM, Fix.getRange(), Fix.getText()});
     }
   }