maxjhandsome
/
llvm-project
forked from OSchip/llvm-project
1
0
Fork 0
Code Issues Pull Requests Packages Releases Wiki Activity

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

For the same reasons as r363150, which got overwritten by changes in
r363680.

Sending without review to unbreak our integrate.

llvm-svn: 363691
This commit is contained in:
Ilya Biryukov 2019-06-18 15:15:41 +00:00
parent ed4a602515
commit df9ee08b64
3 changed files with 19 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
clang-tools-extra/clangd/ClangdLSPServer.cpp
View File

@ -491,14 +491,14 @@ void ClangdLSPServer::onCommand(const ExecuteCommandParams &Params,
auto Action = [this, ApplyEdit](decltype(Reply) Reply, URIForFile File, auto Action = [this, ApplyEdit](decltype(Reply) Reply, URIForFile File,
std::string Code, std::string Code,
llvm::Expected<Tweak::Effect> R) { llvm::Expected<ResolvedEffect> R) {
if (!R) if (!R)
return Reply(R.takeError()); return Reply(R.takeError());
if (R->ApplyEdit) { if (R->ApplyEdit) {
WorkspaceEdit WE; WorkspaceEdit WE;
WE.changes.emplace(); WE.changes.emplace();
(*WE.changes)[File.uri()] = replacementsToEdits(Code, *R->ApplyEdit); (*WE.changes)[File.uri()] = *R->ApplyEdit;
ApplyEdit(std::move(WE)); ApplyEdit(std::move(WE));
} }
if (R->ShowMessage) { if (R->ShowMessage) {

10
clang-tools-extra/clangd/ClangdServer.cpp
View File

@ -325,7 +325,7 @@ void ClangdServer::enumerateTweaks(PathRef File, Range Sel,
} }
void ClangdServer::applyTweak(PathRef File, Range Sel, StringRef TweakID, void ClangdServer::applyTweak(PathRef File, Range Sel, StringRef TweakID,
Callback<Tweak::Effect> CB) { Callback<ResolvedEffect> CB) {
auto Action = [Sel](decltype(CB) CB, std::string File, std::string TweakID, auto Action = [Sel](decltype(CB) CB, std::string File, std::string TweakID,
Expected<InputsAndAST> InpAST) { Expected<InputsAndAST> InpAST) {
if (!InpAST) if (!InpAST)
@ -348,7 +348,13 @@ void ClangdServer::applyTweak(PathRef File, Range Sel, StringRef TweakID,
*Effect->ApplyEdit, Style)) *Effect->ApplyEdit, Style))
Effect->ApplyEdit = std::move(*Formatted); Effect->ApplyEdit = std::move(*Formatted);
} }
return CB(std::move(*Effect));
ResolvedEffect R;
R.ShowMessage = std::move(Effect->ShowMessage);
if (Effect->ApplyEdit)
R.ApplyEdit =
replacementsToEdits(InpAST->Inputs.Contents, *Effect->ApplyEdit);
return CB(std::move(R));
}; };
WorkScheduler.runWithAST( WorkScheduler.runWithAST(
"ApplyTweak", File, "ApplyTweak", File,

10
clang-tools-extra/clangd/ClangdServer.h
View File

@ -57,6 +57,14 @@ public:
using ClangTidyOptionsBuilder = std::function<tidy::ClangTidyOptions( using ClangTidyOptionsBuilder = std::function<tidy::ClangTidyOptions(
llvm::vfs::FileSystem &, llvm::StringRef /*File*/)>; llvm::vfs::FileSystem &, llvm::StringRef /*File*/)>;
/// Like Tweak::Effect, but stores TextEdits instead of tooling::Replacements.
/// Slightly nicer to embedders of ClangdServer.
/// FIXME: figure out how to remove this duplication.
struct ResolvedEffect {
llvm::Optional<std::string> ShowMessage;
llvm::Optional<std::vector<TextEdit>> ApplyEdit;
};
/// Manages a collection of source files and derived data (ASTs, indexes), /// Manages a collection of source files and derived data (ASTs, indexes),
/// and provides language-aware features such as code completion. /// and provides language-aware features such as code completion.
/// ///
@ -239,7 +247,7 @@ public:
/// Apply the code tweak with a specified \p ID. /// Apply the code tweak with a specified \p ID.
void applyTweak(PathRef File, Range Sel, StringRef ID, void applyTweak(PathRef File, Range Sel, StringRef ID,
Callback<Tweak::Effect> CB); Callback<ResolvedEffect> CB);
/// Only for testing purposes. /// Only for testing purposes.
/// Waits until all requests to worker thread are finished and dumps AST for /// Waits until all requests to worker thread are finished and dumps AST for