[SourceKit] Refactor RelatedIdentsInfo

Remove unnecessary `ArrayRef` wrapping and introduce a struct instead of a `std::pair`.

Author: ahoppen

tools/SourceKit/include/SourceKit/Core/LangSupport.h

@@ -781,9 +781,9 @@ struct SemanticRefactoringInfo {
   StringRef PreferredName;
 };
 
-struct RelatedIdentsInfo {
-  /// (Offset,Length) pairs.
-  ArrayRef<std::pair<unsigned, unsigned>> Ranges;
+struct RelatedIdentInfo {
+  unsigned Offset;
+  unsigned Length;
 };
 
 /// Represent one branch of an if config.
@@ -1170,7 +1170,7 @@ class LangSupport {
       StringRef PrimaryFilePath, StringRef InputBufferName, unsigned Offset,
       bool CancelOnSubsequentRequest, ArrayRef<const char *> Args,
       SourceKitCancellationToken CancellationToken,
-      std::function<void(const RequestResult<RelatedIdentsInfo> &)>
+      std::function<void(const RequestResult<ArrayRef<RelatedIdentInfo>> &)>
           Receiver) = 0;
 
   virtual void findActiveRegionsInFile(

tools/SourceKit/lib/SwiftLang/SwiftLangSupport.h

@@ -684,8 +684,8 @@ class SwiftLangSupport : public LangSupport {
       StringRef PrimaryFilePath, StringRef InputBufferName, unsigned Offset,
       bool CancelOnSubsequentRequest, ArrayRef<const char *> Args,
       SourceKitCancellationToken CancellationToken,
-      std::function<void(const RequestResult<RelatedIdentsInfo> &)> Receiver)
-      override;
+      std::function<void(const RequestResult<ArrayRef<RelatedIdentInfo>> &)>
+          Receiver) override;
 
   void findActiveRegionsInFile(
       StringRef PrimaryFilePath, StringRef InputBufferName,

tools/SourceKit/lib/SwiftLang/SwiftSourceDocInfo.cpp

@@ -2493,27 +2493,30 @@ void SwiftLangSupport::findRelatedIdentifiersInFile(
     StringRef PrimaryFilePath, StringRef InputBufferName, unsigned Offset,
     bool CancelOnSubsequentRequest, ArrayRef<const char *> Args,
     SourceKitCancellationToken CancellationToken,
-    std::function<void(const RequestResult<RelatedIdentsInfo> &)> Receiver) {
+    std::function<void(const RequestResult<ArrayRef<RelatedIdentInfo>> &)>
+        Receiver) {
 
   std::string Error;
   SwiftInvocationRef Invok =
       ASTMgr->getTypecheckInvocation(Args, PrimaryFilePath, Error);
   if (!Invok) {
     LOG_WARN_FUNC("failed to create an ASTInvocation: " << Error);
-    Receiver(RequestResult<RelatedIdentsInfo>::fromError(Error));
+    Receiver(RequestResult<ArrayRef<RelatedIdentInfo>>::fromError(Error));
     return;
   }
 
   class RelatedIdConsumer : public SwiftASTConsumer {
     std::string InputFile;
     unsigned Offset;
-    std::function<void(const RequestResult<RelatedIdentsInfo> &)> Receiver;
+    std::function<void(const RequestResult<ArrayRef<RelatedIdentInfo>> &)>
+        Receiver;
     SwiftInvocationRef Invok;
 
   public:
     RelatedIdConsumer(
         StringRef InputFile, unsigned Offset,
-        std::function<void(const RequestResult<RelatedIdentsInfo> &)> Receiver,
+        std::function<void(const RequestResult<ArrayRef<RelatedIdentInfo>> &)>
+            Receiver,
         SwiftInvocationRef Invok)
         : InputFile(InputFile.str()), Offset(Offset),
           Receiver(std::move(Receiver)), Invok(Invok) {}
@@ -2528,12 +2531,12 @@ void SwiftLangSupport::findRelatedIdentifiersInFile(
 
       auto *SrcFile = retrieveInputFile(InputFile, CompInst);
       if (!SrcFile) {
-        Receiver(RequestResult<RelatedIdentsInfo>::fromError(
+        Receiver(RequestResult<ArrayRef<RelatedIdentInfo>>::fromError(
             "Unable to find input file"));
         return;
       }
 
-      SmallVector<std::pair<unsigned, unsigned>, 8> Ranges;
+      SmallVector<RelatedIdentInfo, 8> Ranges;
 
       auto Action = [&]() {
         unsigned BufferID = SrcFile->getBufferID().value();
@@ -2583,29 +2586,30 @@ void SwiftLangSupport::findRelatedIdentifiersInFile(
         std::vector<ResolvedLoc> ResolvedLocs = resolveRenameLocations(
             Locs.getLocations(), /*NewName=*/StringRef(), *SrcFile, Diags);
 
-        for (auto ResolvedLoc : ResolvedLocs) {
+        assert(ResolvedLocs.size() == Locs.getLocations().size());
+        for (size_t index = 0; index < ResolvedLocs.size(); ++index) {
+          auto RenameLoc = Locs.getLocations()[index];
+          auto ResolvedLoc = ResolvedLocs[index];
           if (ResolvedLoc.range.isInvalid()) {
             continue;
           }
           unsigned Offset = SrcMgr.getLocOffsetInBuffer(
               ResolvedLoc.range.getStart(), BufferID);
-          Ranges.emplace_back(Offset, ResolvedLoc.range.getByteLength());
+          Ranges.push_back({Offset, ResolvedLoc.range.getByteLength()});
         }
       };
       Action();
-      RelatedIdentsInfo Info;
-      Info.Ranges = Ranges;
-      Receiver(RequestResult<RelatedIdentsInfo>::fromResult(Info));
+      Receiver(RequestResult<ArrayRef<RelatedIdentInfo>>::fromResult(Ranges));
 #endif
     }
 
     void cancelled() override {
-      Receiver(RequestResult<RelatedIdentsInfo>::cancelled());
+      Receiver(RequestResult<ArrayRef<RelatedIdentInfo>>::cancelled());
     }
 
     void failed(StringRef Error) override {
       LOG_WARN_FUNC("related idents failed: " << Error);
-      Receiver(RequestResult<RelatedIdentsInfo>::fromError(Error));
+      Receiver(RequestResult<ArrayRef<RelatedIdentInfo>>::fromError(Error));
     }
 
     static CaseStmt *getCaseStmtOfCanonicalVar(Decl *D) {

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

@@ -2867,20 +2867,21 @@ static void findRelatedIdents(StringRef PrimaryFilePath,
   LangSupport &Lang = getGlobalContext().getSwiftLangSupport();
   Lang.findRelatedIdentifiersInFile(
       PrimaryFilePath, InputBufferName, Offset, CancelOnSubsequentRequest, Args,
-      CancellationToken, [Rec](const RequestResult<RelatedIdentsInfo> &Result) {
+      CancellationToken,
+      [Rec](const RequestResult<ArrayRef<RelatedIdentInfo>> &Result) {
         if (Result.isCancelled())
           return Rec(createErrorRequestCancelled());
         if (Result.isError())
           return Rec(createErrorRequestFailed(Result.getError()));
 
-        const RelatedIdentsInfo &Info = Result.value();
+        const ArrayRef<RelatedIdentInfo> &Info = Result.value();
 
         ResponseBuilder RespBuilder;
         auto Arr = RespBuilder.getDictionary().setArray(KeyResults);
-        for (auto R : Info.Ranges) {
+        for (auto R : Info) {
           auto Elem = Arr.appendDictionary();
-          Elem.set(KeyOffset, R.first);
-          Elem.set(KeyLength, R.second);
+          Elem.set(KeyOffset, R.Offset);
+          Elem.set(KeyLength, R.Length);
         }
 
         Rec(RespBuilder.createResponse());