Page MenuHomePhabricator
Differential D38425 Diff 124951 clangd/ClangdLSPServer.cpp

Changeset View

Standalone View

View Options

clangd/ClangdLSPServer.cpp

Show First 20 Lines • Show All 51 Lines • ▼ Show 20 Lines C.reply(json::obj{
{"resolveProvider", false}, {"resolveProvider", false},
{"triggerCharacters", {".", ">", ":"}}, {"triggerCharacters", {".", ">", ":"}},
}}, }},
{"signatureHelpProvider", {"signatureHelpProvider",
json::obj{ json::obj{
{"triggerCharacters", {"(", ","}}, {"triggerCharacters", {"(", ","}},
}}, }},
{"definitionProvider", true}, {"definitionProvider", true},
{"documentHighlightProvider", true},
{"renameProvider", true}, {"renameProvider", true},
{"executeCommandProvider", {"executeCommandProvider",
json::obj{ json::obj{
{"commands", {ExecuteCommandParams::CLANGD_APPLY_FIX_COMMAND}}, {"commands", {ExecuteCommandParams::CLANGD_APPLY_FIX_COMMAND}},
}}, }},
}}}}); }}}});
if (Params.rootUri && !Params.rootUri->file.empty()) if (Params.rootUri && !Params.rootUri->file.empty())
malaperleUnsubmitted
Done
ReplyInline Actions

extra line

malaperle: extra line
ilya-biryukovUnsubmitted
Not Done
ReplyInline Actions

Still there

ilya-biryukov: Still there
Server.setRootPath(Params.rootUri->file); Server.setRootPath(Params.rootUri->file);
else if (Params.rootPath && !Params.rootPath->empty()) else if (Params.rootPath && !Params.rootPath->empty())
Server.setRootPath(*Params.rootPath); Server.setRootPath(*Params.rootPath);
} }
void ClangdLSPServer::onShutdown(Ctx C, ShutdownParams &Params) { void ClangdLSPServer::onShutdown(Ctx C, ShutdownParams &Params) {
// Do essentially nothing, just say we're ready to exit. // Do essentially nothing, just say we're ready to exit.
ShutdownRequestReceived = true; ShutdownRequestReceived = true;
▲ Show 20 Lines • Show All 154 Lines • ▼ Show 20 Lines
void ClangdLSPServer::onSwitchSourceHeader(Ctx C, void ClangdLSPServer::onSwitchSourceHeader(Ctx C,
TextDocumentIdentifier &Params) { TextDocumentIdentifier &Params) {
llvm::Optional<Path> Result = Server.switchSourceHeader(Params.uri.file); llvm::Optional<Path> Result = Server.switchSourceHeader(Params.uri.file);
std::string ResultUri; std::string ResultUri;
C.reply(Result ? URI::fromFile(*Result).uri : ""); C.reply(Result ? URI::fromFile(*Result).uri : "");
} }
void ClangdLSPServer::onDocumentHighlight(Ctx C,
TextDocumentPositionParams &Params) {
auto Highlights = Server.findDocumentHighlights(
malaperleUnsubmitted
Done
ReplyInline Actions

Items -> Highlights?

malaperle: Items -> Highlights?
malaperleUnsubmitted
Not Done
ReplyInline Actions

Items -> Highlights?

malaperle: Items -> Highlights?
Params.textDocument.uri.file,
Position{Params.position.line, Params.position.character});
if (!Highlights) {
malaperleUnsubmitted
Not Done
ReplyInline Actions

I get a test failure here because there is an assertion that the Expected<> needs to be checked. I can't really think of any failure case right now where we wouldn't just return an empty array of highlights. But I think it's better for consistency and future-proofing to keep the Expected<>.
I think you can just do like in onRename for now

if (!Highlights) {
  C.replyError(ErrorCode::InternalError,
               llvm::toString(Highlights.takeError()));
  return;
}
malaperle: I get a test failure here because there is an assertion that the Expected<> needs to be checked.
malaperleUnsubmitted
Not Done
ReplyInline Actions

Just to be clear, the error I see in the output is:
Expected<T> must be checked before access or destruction.
Expected<T> value was in success state. (Note: Expected<T> values in success mode must still be checked prior to being destroyed).

It asserts when in ClangdLSPServer::onDocumentHighlight, referencing Highlights->Value

malaperle: Just to be clear, the error I see in the output is: Expected<T> must be checked before access…
C.replyError(ErrorCode::InternalError,
llvm::toString(Highlights.takeError()));
return;
}
C.reply(json::ary(Highlights->Value));
}
ClangdLSPServer::ClangdLSPServer(JSONOutput &Out, unsigned AsyncThreadsCount, ClangdLSPServer::ClangdLSPServer(JSONOutput &Out, unsigned AsyncThreadsCount,
bool StorePreamblesInMemory, bool StorePreamblesInMemory,
const clangd::CodeCompleteOptions &CCOpts, const clangd::CodeCompleteOptions &CCOpts,
llvm::Optional<StringRef> ResourceDir, llvm::Optional<StringRef> ResourceDir,
llvm::Optional<Path> CompileCommandsDir) llvm::Optional<Path> CompileCommandsDir)
: Out(Out), CDB(/*Logger=*/Out, std::move(CompileCommandsDir)), : Out(Out), CDB(/*Logger=*/Out, std::move(CompileCommandsDir)),
Server(CDB, /*DiagConsumer=*/*this, FSProvider, AsyncThreadsCount, Server(CDB, /*DiagConsumer=*/*this, FSProvider, AsyncThreadsCount,
StorePreamblesInMemory, CCOpts, StorePreamblesInMemory, CCOpts,
▲ Show 20 Lines • Show All 73 Lines • Show Last 20 Lines