================ @@ -893,22 +964,36 @@ llvm::Expected<Edit> buildRenameEdit(llvm::StringRef AbsFilePath, return LastOffset; }; - std::vector<std::pair</*start*/ size_t, /*end*/ size_t>> OccurrencesOffsets; - for (const auto &R : Occurrences) { - auto StartOffset = Offset(R.start); - if (!StartOffset) - return StartOffset.takeError(); - auto EndOffset = Offset(R.end); - if (!EndOffset) - return EndOffset.takeError(); - OccurrencesOffsets.push_back({*StartOffset, *EndOffset}); + struct OccurrenceOffset { + size_t Start; + size_t End; + llvm::StringRef NewName; + + OccurrenceOffset(size_t Start, size_t End, llvm::StringRef NewName) : + Start(Start), End(End), NewName(NewName) {} + }; + + std::vector<OccurrenceOffset> OccurrencesOffsets; + for (const auto &SR : Occurrences) { + for (auto It = SR.Ranges.begin(); It != SR.Ranges.end(); ++It) { ---------------- DavidGoldman wrote:
Done https://github.com/llvm/llvm-project/pull/76466 _______________________________________________ cfe-commits mailing list cfe-commits@lists.llvm.org https://lists.llvm.org/cgi-bin/mailman/listinfo/cfe-commits