Merge pull request #3096 from briancroom/sourcekitd-api-common

[SourceKit] Move some functions into sourcekitdAPI-Common.

Author: briancroom

tools/SourceKit/tools/sourcekitd/lib/API/sourcekitdAPI-Common.cpp

@@ -515,6 +515,47 @@ sourcekitd_response_description_copy(sourcekitd_response_t resp) {
   return strdup(Desc.c_str());
 }
 
+
+sourcekitd_uid_t
+sourcekitd_uid_get_from_cstr(const char *string) {
+  return SKDUIDFromUIdent(UIdent(string));
+}
+
+sourcekitd_uid_t
+sourcekitd_uid_get_from_buf(const char *buf, size_t length) {
+  return SKDUIDFromUIdent(UIdent(llvm::StringRef(buf, length)));
+}
+
+size_t
+sourcekitd_uid_get_length(sourcekitd_uid_t uid) {
+  UIdent UID = UIdentFromSKDUID(uid);
+  return UID.getName().size();
+}
+
+const char *
+sourcekitd_uid_get_string_ptr(sourcekitd_uid_t uid) {
+  UIdent UID = UIdentFromSKDUID(uid);
+  return UID.getName().begin();
+}
+
+void
+sourcekitd_request_description_dump(sourcekitd_object_t obj) {
+  // Avoid colors here, we don't properly detect that the debug window inside
+  // Xcode doesn't support colors.
+  llvm::SmallString<128> Desc;
+  llvm::raw_svector_ostream OS(Desc);
+  printRequestObject(obj, OS);
+  llvm::errs() << OS.str() << '\n';
+}
+
+char *
+sourcekitd_request_description_copy(sourcekitd_object_t obj) {
+  llvm::SmallString<128> Desc;
+  llvm::raw_svector_ostream OS(Desc);
+  printRequestObject(obj, OS);
+  return strdup(Desc.c_str());
+}
+
 //===----------------------------------------------------------------------===//
 // Variant API
 //===----------------------------------------------------------------------===//

tools/SourceKit/tools/sourcekitd/lib/API/sourcekitdAPI-XPC.cpp

@@ -416,32 +416,6 @@ sourcekitd::createErrorRequestCancelled() {
   return CustomXPCData::createErrorRequestCancelled("").getXObj();
 }
 
-//===----------------------------------------------------------------------===//
-// Public API
-//===----------------------------------------------------------------------===//
-
-sourcekitd_uid_t
-sourcekitd_uid_get_from_cstr(const char *string) {
-  return SKDUIDFromUIdent(UIdent(string));
-}
-
-sourcekitd_uid_t
-sourcekitd_uid_get_from_buf(const char *buf, size_t length) {
-  return SKDUIDFromUIdent(UIdent(llvm::StringRef(buf, length)));
-}
-
-size_t
-sourcekitd_uid_get_length(sourcekitd_uid_t uid) {
-  UIdent UID = UIdentFromSKDUID(uid);
-  return UID.getName().size();
-}
-
-const char *
-sourcekitd_uid_get_string_ptr(sourcekitd_uid_t uid) {
-  UIdent UID = UIdentFromSKDUID(uid);
-  return UID.getName().begin();
-}
-
 //===----------------------------------------------------------------------===//
 // Public Request API
 //===----------------------------------------------------------------------===//
@@ -558,24 +532,6 @@ sourcekitd_request_uid_create(sourcekitd_uid_t uid) {
   return xpc_uint64_create(uintptr_t(uid));
 }
 
-void
-sourcekitd_request_description_dump(sourcekitd_object_t obj) {
-  // Avoid colors here, we don't properly detect that the debug window inside
-  // Xcode doesn't support colors.
-  llvm::SmallString<128> Desc;
-  llvm::raw_svector_ostream OS(Desc);
-  printRequestObject(obj, OS);
-  llvm::errs() << OS.str() << '\n';
-}
-
-char *
-sourcekitd_request_description_copy(sourcekitd_object_t obj) {
-  llvm::SmallString<128> Desc;
-  llvm::raw_svector_ostream OS(Desc);
-  printRequestObject(obj, OS);
-  return strdup(Desc.c_str());
-}
-
 //===----------------------------------------------------------------------===//
 // Public Response API
 //===----------------------------------------------------------------------===//