Add support for UID arrays to sourcekitd API

Author: fwcd

tools/SourceKit/tools/sourcekitd/include/sourcekitd/Internal.h

@@ -83,6 +83,8 @@ class ResponseBuilder {
     void set(SourceKit::UIdent Key, int64_t val);
     void set(SourceKit::UIdent Key, llvm::ArrayRef<llvm::StringRef> Strs);
     void set(SourceKit::UIdent Key, llvm::ArrayRef<std::string> Strs);
+    void set(SourceKit::UIdent Key, llvm::ArrayRef<SourceKit::UIdent> UIDs);
+    void set(SourceKit::UIdent Key, llvm::ArrayRef<sourcekitd_uid_t> UIDs);
     void setBool(SourceKit::UIdent Key, bool val);
     Array setArray(SourceKit::UIdent Key);
     Dictionary setDictionary(SourceKit::UIdent Key);

tools/SourceKit/tools/sourcekitd/lib/API/Requests.cpp

@@ -2828,7 +2828,11 @@ static void fillDictionaryForDiagnosticInfoBase(
     Elem.set(KeyID, Info.ID);
 
   if (!Info.Categories.empty()) {
-    SmallVector<sourcekitd_uid_t, 1> CategoryUIDs;
+    SmallVector<SourceKit::UIdent, 1> CategoryUIDs;
+
+    static UIdent UIDKindDiagDeprecation(KindDiagDeprecation.str());
+    static UIdent UIDKindDiagNoUsage(KindDiagNoUsage.str());
+
     for (auto C : Info.Categories) {
       switch (C) {
       case DiagnosticCategory::Deprecation:

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

@@ -660,6 +660,24 @@ void ResponseBuilder::Dictionary::set(SourceKit::UIdent Key,
   static_cast<SKDObject *>(Impl)->set(SKDUIDFromUIdent(Key), ArrayObject);
 }
 
+void ResponseBuilder::Dictionary::set(SourceKit::UIdent Key,
+                                      ArrayRef<SourceKit::UIdent> UIDs) {
+  auto ArrayObject = new SKDArray();
+  for (auto UID : UIDs) {
+    ArrayObject->set(SOURCEKITD_ARRAY_APPEND, new SKDUID(SKDUIDFromUIdent(UID)));
+  }
+  static_cast<SKDObject *>(Impl)->set(SKDUIDFromUIdent(Key), ArrayObject);
+}
+
+void ResponseBuilder::Dictionary::set(SourceKit::UIdent Key,
+                                      ArrayRef<sourcekitd_uid_t> UIDs) {
+  auto ArrayObject = new SKDArray();
+  for (auto UID : UIDs) {
+    ArrayObject->set(SOURCEKITD_ARRAY_APPEND, new SKDUID(UID));
+  }
+  static_cast<SKDObject *>(Impl)->set(SKDUIDFromUIdent(Key), ArrayObject);
+}
+
 void ResponseBuilder::Dictionary::setBool(UIdent Key, bool Val) {
   static_cast<SKDObject *>(Impl)->set(SKDUIDFromUIdent(Key), new SKDBool(Val));
 }

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

@@ -237,6 +237,30 @@ void ResponseBuilder::Dictionary::set(SourceKit::UIdent Key,
   xpc_release(arr);
 }
 
+void ResponseBuilder::Dictionary::set(SourceKit::UIdent Key,
+                                      ArrayRef<SourceKit::UIdent> UIDs) {
+  llvm::SmallString<128> Buf;
+  xpc_object_t arr = xpc_array_create(nullptr, 0);
+  for (auto UID : UIDs) {
+    Buf = Str;
+    xpc_array_set_uint64(arr, XPC_ARRAY_APPEND, uintptr_t(SKDUIDFromUIdent(UID)));
+  }
+  xpc_dictionary_set_value(Impl, Key.c_str(), arr);
+  xpc_release(arr);
+}
+
+void ResponseBuilder::Dictionary::set(SourceKit::UIdent Key,
+                                      ArrayRef<sourcekitd_uid_t> UIDs) {
+  llvm::SmallString<128> Buf;
+  xpc_object_t arr = xpc_array_create(nullptr, 0);
+  for (auto UID : UIDs) {
+    Buf = Str;
+    xpc_array_set_uint64(arr, XPC_ARRAY_APPEND, uintptr_t(UID));
+  }
+  xpc_dictionary_set_value(Impl, Key.c_str(), arr);
+  xpc_release(arr);
+}
+
 void ResponseBuilder::Dictionary::setBool(UIdent Key, bool val) {
   xpc_dictionary_set_bool(Impl, Key.c_str(), val);
 }