This is an archive of the discontinued LLVM Phabricator instance.

Differential D47869

[clangd] Fix using the incorrect Index for go-to-definition.
ClosedPublic

Authored by hokein on Jun 7 2018, 1:14 AM.

Details

Reviewers
sammccall
Commits
rG6138b78672db: [clangd] Fix using the incorrect Index for go-to-definition.
rL334176: [clangd] Fix using the incorrect Index for go-to-definition.
rCTE334176: [clangd] Fix using the incorrect Index for go-to-definition.

Diff Detail

Event Timeline

hokein created this revision.Jun 7 2018, 1:14 AM
Herald added subscribers: jkorous, MaskRay, ioeric, ilya-biryukov. · View Herald TranscriptJun 7 2018, 1:14 AM
Harbormaster completed remote builds in B19035: Diff 150272.Jun 7 2018, 1:14 AM
sammccall accepted this revision.Jun 7 2018, 1:16 AM
sammccall added inline comments.
clangd/ClangdServer.cpp
305

nit: just Index?

This revision is now accepted and ready to land.Jun 7 2018, 1:16 AM
hokein updated this revision to Diff 150276.Jun 7 2018, 1:52 AM

this->Index => Index.

Closed by commit rCTE334176: [clangd] Fix using the incorrect Index for go-to-definition. (authored by hokein). · Explain WhyJun 7 2018, 1:54 AM
This revision was automatically updated to reflect the committed changes.
hokein marked an inline comment as done.

Revision Contents

PathSize
clangd/
2 lines

Diff 150279

clangd/ClangdServer.cpp

Show First 20 Lines • Show All 296 Lines • ▼ Show 20 Lines
} }
void ClangdServer::findDefinitions(PathRef File, Position Pos, void ClangdServer::findDefinitions(PathRef File, Position Pos,
Callback<std::vector<Location>> CB) { Callback<std::vector<Location>> CB) {
auto Action = [Pos, this](Callback<std::vector<Location>> CB, auto Action = [Pos, this](Callback<std::vector<Location>> CB,
llvm::Expected<InputsAndAST> InpAST) { llvm::Expected<InputsAndAST> InpAST) {
if (!InpAST) if (!InpAST)
return CB(InpAST.takeError()); return CB(InpAST.takeError());
CB(clangd::findDefinitions(InpAST->AST, Pos, this->FileIdx.get())); CB(clangd::findDefinitions(InpAST->AST, Pos, Index));
sammccallUnsubmitted
Done
ReplyInline Actions

nit: just Index?

sammccall: nit: just `Index`?
}; };
WorkScheduler.runWithAST("Definitions", File, Bind(Action, std::move(CB))); WorkScheduler.runWithAST("Definitions", File, Bind(Action, std::move(CB)));
} }
llvm::Optional<Path> ClangdServer::switchSourceHeader(PathRef Path) { llvm::Optional<Path> ClangdServer::switchSourceHeader(PathRef Path) {
StringRef SourceExtensions[] = {".cpp", ".c", ".cc", ".cxx", StringRef SourceExtensions[] = {".cpp", ".c", ".cc", ".cxx",
▲ Show 20 Lines • Show All 138 Lines • Show Last 20 Lines