commit 08372eb73bf0a21d8d824084cb15efd0a9ee99bb
author Sam McCall <sam.mccall@gmail.com> Wed Jun 19 07:29:10 2019 +0000
committer Sam McCall <sam.mccall@gmail.com> Wed Jun 19 07:29:10 2019 +0000
tree 1d7e88927bcb7692669485a35035952e87020962
parent 38047dbca4e7c54bd01e6ad18df6971adda0679c

Revert "[clangd] Return vector<TextEdit> from applyTweak. NFC"

This reverts commit r363691.

llvm-svn: 363766

clang-tools-extra/clangd/ClangdLSPServer.cpp

diff --git a/clang-tools-extra/clangd/ClangdLSPServer.cpp b/clang-tools-extra/clangd/ClangdLSPServer.cpp
index 7eaacd2..353d387 100644
--- a/clang-tools-extra/clangd/ClangdLSPServer.cpp
+++ b/clang-tools-extra/clangd/ClangdLSPServer.cpp
@@ -491,14 +491,14 @@
 
     auto Action = [this, ApplyEdit](decltype(Reply) Reply, URIForFile File,
                                     std::string Code,
-                                    llvm::Expected<ResolvedEffect> R) {
+                                    llvm::Expected<Tweak::Effect> R) {
       if (!R)
         return Reply(R.takeError());
 
       if (R->ApplyEdit) {
         WorkspaceEdit WE;
         WE.changes.emplace();
-        (*WE.changes)[File.uri()] = *R->ApplyEdit;
+        (*WE.changes)[File.uri()] = replacementsToEdits(Code, *R->ApplyEdit);
         ApplyEdit(std::move(WE));
       }
       if (R->ShowMessage) {