[clangd] Return TextEdits from ClangdServer::applyTweak

[ilya-biryukov]

Summary

Instead of tooling::Replacements. So that embedders do not need to store
the contents of the file.

This also aligns better with ClangdServer::rename.

[ilya-biryukov]

@hokein just realized you might be a better reviewer, since this makes applyTweak aligned with rename. And you implemented rename in the first place

[hokein]

looks good.

clang-tools-extra/trunk/clangd/ClangdLSPServer.cpp

if (Params.command == ExecuteCommandParams::CLANGD_APPLY_FIX_COMMAND &&
     auto Code = DraftMgr.getDraft(Params.tweakArgs->file.file());
     if (!Code)
       return Reply(llvm::createStringError(
           llvm::inconvertibleErrorCode(),
           "trying to apply a code action for a non-added file"));
 
     auto Action = [ApplyEdit](decltype(Reply) Reply, URIForFile File,
                               std::string Code,
-                              llvm::Expected<tooling::Replacements> R) {
+                              llvm::Expected<std::vector<TextEdit>> R) {
       if (!R)
         return Reply(R.takeError());
 
       WorkspaceEdit WE;
       WE.changes.emplace();
-      (*WE.changes)[File.uri()] = replacementsToEdits(Code, *R);
+      (*WE.changes)[File.uri()] = std::move(*R);
 
       Reply("Fix applied.");
       ApplyEdit(std::move(WE));
     };
     Server->applyTweak(Params.tweakArgs->file.file(),
                        Params.tweakArgs->selection, Params.tweakArgs->tweakID,
                        Bind(Action, std::move(Reply), Params.tweakArgs->file,
                             std::move(*Code)));

clang-tools-extra/trunk/clangd/ClangdServer.h

struct TweakRef {
     std::string Title; /// A single-line message to show in the UI.
   };
   /// Enumerate the code tweaks available to the user at a specified point.
   void enumerateTweaks(PathRef File, Range Sel,
                        Callback<std::vector<TweakRef>> CB);
 
   /// Apply the code tweak with a specified \p ID.
   void applyTweak(PathRef File, Range Sel, StringRef ID,
-                  Callback<tooling::Replacements> CB);
+                  Callback<std::vector<TextEdit>> CB);
 
   /// Only for testing purposes.
   /// Waits until all requests to worker thread are finished and dumps AST for
   /// \p File. \p File must be in the list of added documents.
   void dumpAST(PathRef File, llvm::unique_function<void(std::string)> Callback);
   /// Called when an event occurs for a watched file in the workspace.
   void onFileEvent(const DidChangeWatchedFilesParams &Params);
 

clang-tools-extra/trunk/clangd/ClangdServer.cpp

auto Action = [Sel](decltype(CB) CB, std::string File,
     CB(std::move(Res));
   };
 
   WorkScheduler.runWithAST("EnumerateTweaks", File,
                            Bind(Action, std::move(CB), File.str()));
 }
 
 void ClangdServer::applyTweak(PathRef File, Range Sel, StringRef TweakID,
-                              Callback<tooling::Replacements> CB) {
+                              Callback<std::vector<TextEdit>> CB) {
   auto Action = [Sel](decltype(CB) CB, std::string File, std::string TweakID,
                       Expected<InputsAndAST> InpAST) {
     if (!InpAST)
       return CB(InpAST.takeError());
     auto Selection = tweakSelection(Sel, *InpAST);
     if (!Selection)
       return CB(Selection.takeError());
     auto A = prepareTweak(TweakID, *Selection);
     if (!A)
       return CB(A.takeError());
-    auto RawReplacements = (*A)->apply(*Selection);
-    if (!RawReplacements)
-      return CB(RawReplacements.takeError());
+    auto Raw = (*A)->apply(*Selection);
+    if (!Raw)
+      return CB(Raw.takeError());
     // FIXME: this function has I/O operations (find .clang-format file), figure
     // out a way to cache the format style.
     auto Style = getFormatStyleForFile(File, InpAST->Inputs.Contents,
                                        InpAST->Inputs.FS.get());
-    return CB(
-        cleanupAndFormat(InpAST->Inputs.Contents, *RawReplacements, Style));
+    auto Formatted =
+        cleanupAndFormat(InpAST->Inputs.Contents, *Raw, Style);
+    if (!Formatted)
+      return CB(Formatted.takeError());
+    return CB(replacementsToEdits(InpAST->Inputs.Contents, *Formatted));
   };
   WorkScheduler.runWithAST(
       "ApplyTweak", File,
       Bind(Action, std::move(CB), File.str(), TweakID.str()));
 }
 
 void ClangdServer::dumpAST(PathRef File,
                            llvm::unique_function<void(std::string)> Callback) {