Merge pull request #5964 from nkcsgexi/edit-api

Author: swift-ci

include/swift/Basic/Edit.h

@@ -0,0 +1,20 @@
+//===--- Edit.h - Misc edit utilities ---------------------------*- C++ -*-===//
+//
+// This source file is part of the Swift.org open source project
+//
+// Copyright (c) 2014 - 2016 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 "swift/Basic/LLVM.h"
+namespace swift {
+  class SourceManager;
+  class CharSourceRange;
+
+  void writeEdit(SourceManager &SM, CharSourceRange Range, StringRef Text,
+                 llvm::raw_ostream &OS);
+}

lib/Basic/CMakeLists.txt

@@ -65,6 +65,7 @@ add_swift_library(swiftBasic STATIC
   DemangleWrappers.cpp
   DiagnosticConsumer.cpp
   DiverseStack.cpp
+  Edit.cpp
   EditorPlaceholder.cpp
   FileSystem.cpp
   JSONSerialization.cpp

lib/Basic/Edit.cpp

@@ -0,0 +1,36 @@
+//===--- Edit.cpp - Misc edit utilities -----------------------===//
+//
+// This source file is part of the Swift.org open source project
+//
+// Copyright (c) 2014 - 2016 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 "llvm/Support/raw_ostream.h"
+#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));
+
+  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";
+}

lib/FrontendTool/FrontendTool.cpp

@@ -32,6 +32,7 @@
 #include "swift/AST/ReferencedNameTracker.h"
 #include "swift/AST/TypeRefinementContext.h"
 #include "swift/Basic/Dwarf.h"
+#include "swift/Basic/Edit.h"
 #include "swift/Basic/Fallthrough.h"
 #include "swift/Basic/FileSystem.h"
 #include "swift/Basic/LLVMContext.h"
@@ -423,7 +424,7 @@ static bool emitReferenceDependencies(DiagnosticEngine &diags,
     auto rhsMangledName = mangleTypeAsContext(rhs->first.first);
     return lhsMangledName.compare(rhsMangledName);
   });
-  
+
   for (auto &entry : sortedMembers) {
     assert(entry.first.first != nullptr);
     if (entry.first.first->hasAccessibility() &&
@@ -582,7 +583,7 @@ class JSONFixitWriter : public DiagnosticConsumer {
     if (!shouldFix(Kind, Info))
       return;
     for (const auto &Fix : Info.FixIts) {
-      writeEdit(SM, Fix.getRange(), Fix.getText(), *OSPtr);
+      swift::writeEdit(SM, Fix.getRange(), Fix.getText(), *OSPtr);
     }
   }
 
@@ -662,28 +663,6 @@ class JSONFixitWriter : public DiagnosticConsumer {
 
     return false;
   }
-
-  void 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();
-    SmallString<200> Path =
-      StringRef(SM.getIdentifierForBuffer(BufID));
-
-    OS << " {\n";
-    OS << "  \"file\": \"";
-    OS.write_escaped(Path.str()) << "\",\n";
-    OS << "  \"offset\": " << Offset << ",\n";
-    if (Length != 0)
-      OS << "  \"remove\": " << Length << ",\n";
-    if (!Text.empty()) {
-      OS << "  \"text\": \"";
-      OS.write_escaped(Text) << "\",\n";
-    }
-    OS << " },\n";
-  }
 };
 
 } // anonymous namespace