diff options
| -rw-r--r-- | clang-tools-extra/clangd/ClangdLSPServer.cpp | 32 | ||||
| -rw-r--r-- | clang-tools-extra/clangd/SourceCode.cpp | 15 | ||||
| -rw-r--r-- | clang-tools-extra/clangd/SourceCode.h | 6 |
3 files changed, 26 insertions, 27 deletions
diff --git a/clang-tools-extra/clangd/ClangdLSPServer.cpp b/clang-tools-extra/clangd/ClangdLSPServer.cpp index f8895b544d1..d5a07c348d6 100644 --- a/clang-tools-extra/clangd/ClangdLSPServer.cpp +++ b/clang-tools-extra/clangd/ClangdLSPServer.cpp @@ -60,32 +60,6 @@ public: static URISchemeRegistry::Add<TestScheme> X("test", "Test scheme for clangd lit tests."); -TextEdit replacementToEdit(StringRef Code, const tooling::Replacement &R) { - Range ReplacementRange = { - offsetToPosition(Code, R.getOffset()), - offsetToPosition(Code, R.getOffset() + R.getLength())}; - return {ReplacementRange, R.getReplacementText()}; -} - -std::vector<TextEdit> -replacementsToEdits(StringRef Code, - const std::vector<tooling::Replacement> &Replacements) { - // Turn the replacements into the format specified by the Language Server - // Protocol. Fuse them into one big JSON array. - std::vector<TextEdit> Edits; - for (const auto &R : Replacements) - Edits.push_back(replacementToEdit(Code, R)); - return Edits; -} - -std::vector<TextEdit> replacementsToEdits(StringRef Code, - const tooling::Replacements &Repls) { - std::vector<TextEdit> Edits; - for (const auto &R : Repls) - Edits.push_back(replacementToEdit(Code, R)); - return Edits; -} - SymbolKindBitset defaultSymbolKinds() { SymbolKindBitset Defaults; for (size_t I = SymbolKindMin; I <= static_cast<size_t>(SymbolKind::Array); @@ -291,7 +265,11 @@ void ClangdLSPServer::onRename(RenameParams &Params) { return replyError(ErrorCode::InternalError, llvm::toString(Replacements.takeError())); - std::vector<TextEdit> Edits = replacementsToEdits(*Code, *Replacements); + // Turn the replacements into the format specified by the Language + // Server Protocol. Fuse them into one big JSON array. + std::vector<TextEdit> Edits; + for (const auto &R : *Replacements) + Edits.push_back(replacementToEdit(*Code, R)); WorkspaceEdit WE; WE.changes = {{Params.textDocument.uri.uri(), Edits}}; reply(WE); diff --git a/clang-tools-extra/clangd/SourceCode.cpp b/clang-tools-extra/clangd/SourceCode.cpp index ddfaec888e2..50a7f4e6bc5 100644 --- a/clang-tools-extra/clangd/SourceCode.cpp +++ b/clang-tools-extra/clangd/SourceCode.cpp @@ -166,5 +166,20 @@ splitQualifiedName(llvm::StringRef QName) { return {QName.substr(0, Pos + 2), QName.substr(Pos + 2)}; } +TextEdit replacementToEdit(StringRef Code, const tooling::Replacement &R) { + Range ReplacementRange = { + offsetToPosition(Code, R.getOffset()), + offsetToPosition(Code, R.getOffset() + R.getLength())}; + return {ReplacementRange, R.getReplacementText()}; +} + +std::vector<TextEdit> replacementsToEdits(StringRef Code, + const tooling::Replacements &Repls) { + std::vector<TextEdit> Edits; + for (const auto &R : Repls) + Edits.push_back(replacementToEdit(Code, R)); + return Edits; +} + } // namespace clangd } // namespace clang diff --git a/clang-tools-extra/clangd/SourceCode.h b/clang-tools-extra/clangd/SourceCode.h index 8867b90c3c7..a61d411fe13 100644 --- a/clang-tools-extra/clangd/SourceCode.h +++ b/clang-tools-extra/clangd/SourceCode.h @@ -15,6 +15,7 @@ #define LLVM_CLANG_TOOLS_EXTRA_CLANGD_SOURCECODE_H #include "Protocol.h" #include "clang/Basic/SourceLocation.h" +#include "clang/Tooling/Core/Replacement.h" namespace clang { class SourceManager; @@ -55,6 +56,11 @@ std::pair<size_t, size_t> offsetToClangLineColumn(llvm::StringRef Code, std::pair<llvm::StringRef, llvm::StringRef> splitQualifiedName(llvm::StringRef QName); +TextEdit replacementToEdit(StringRef Code, const tooling::Replacement &R); + +std::vector<TextEdit> replacementsToEdits(StringRef Code, + const tooling::Replacements &Repls); + } // namespace clangd } // namespace clang #endif |
