Magic-Mirror/llvm-capstone
1
0
Fork 0
mirror of https://github.com/capstone-engine/llvm-capstone.git synced 2024-11-29 00:21:14 +00:00
Code Issues Actions 2 Packages Projects Releases Wiki Activity

[clangd] Pass raw client capabilities to modules. NFC

Browse Source
This commit is contained in:
Sam McCall 2021-02-15 20:56:57 +01:00
parent 22a52dfddc
commit 4d700fb060
5 changed files with 7 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -582,7 +582,7 @@ void ClangdLSPServer::onInitialize(const InitializeParams &Params,
bindMethods(Binder);
if (Opts.Modules)
for (auto &Mod : *Opts.Modules)
Mod.initializeLSP(Binder, Params.capabilities, ServerCaps);
Mod.initializeLSP(Binder, Params.rawCapabilities, ServerCaps);
}
// Per LSP, renameProvider can be either boolean or RenameOptions.

4
clang-tools-extra/clangd/Module.h
View File

@ -2,7 +2,6 @@
#define LLVM_CLANG_TOOLS_EXTRA_CLANGD_MODULE_H
#include "LSPBinder.h"
#include "Protocol.h"
#include "llvm/ADT/StringRef.h"
#include "llvm/Support/JSON.h"
#include <memory>
@ -37,9 +36,8 @@ public:
///
/// This is only called if the module is running in ClangdLSPServer!
/// Modules with a public interface should satisfy it without LSP bindings.
// FIXME: ClientCaps should be a raw json::Object here.
virtual void initializeLSP(LSPBinder &Bind,
const ClientCapabilities &ClientCaps,
const llvm::json::Object &ClientCaps,
llvm::json::Object &ServerCaps) {}
};

2
clang-tools-extra/clangd/Protocol.cpp
View File

@ -430,6 +430,8 @@ bool fromJSON(const llvm::json::Value &Params, InitializeParams &R,
O.map("rootUri", R.rootUri);
O.map("rootPath", R.rootPath);
O.map("capabilities", R.capabilities);
if (auto *RawCaps = Params.getAsObject()->getObject("capabilities"))
R.rawCapabilities = *RawCaps;
O.map("trace", R.trace);
O.map("initializationOptions", R.initializationOptions);
return true;

2
clang-tools-extra/clangd/Protocol.h
View File

@ -540,6 +540,8 @@ struct InitializeParams {
/// The capabilities provided by the client (editor or tool)
ClientCapabilities capabilities;
/// The same data as capabilities, but not parsed (to expose to modules).
llvm::json::Object rawCapabilities;
/// The initial trace setting. If omitted trace is disabled ('off').
llvm::Optional<TraceLevel> trace;

2
clang-tools-extra/clangd/unittests/ClangdLSPServerTests.cpp
View File

@ -223,7 +223,7 @@ CompileFlags:
TEST_F(LSPTest, ModulesTest) {
class MathModule : public Module {
void initializeLSP(LSPBinder &Bind, const ClientCapabilities &ClientCaps,
void initializeLSP(LSPBinder &Bind, const llvm::json::Object &ClientCaps,
llvm::json::Object &ServerCaps) override {
Bind.notification("add", this, &MathModule::add);
Bind.method("get", this, &MathModule::get);