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

[clangd] Oops, switchSourceHeader still needs to return a URI. 

Reviewers: kadircet

Subscribers: ilya-biryukov, MaskRay, jkorous, arphaman, cfe-commits

Tags: #clang

Differential Revision: https://reviews.llvm.org/D61630

llvm-svn: 360121
This commit is contained in:
Sam McCall 2019-05-07 08:30:32 +00:00
parent bcaee49d00
commit b9ec3e9370
2 changed files with 3 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -825,9 +825,9 @@ void ClangdLSPServer::onGoToDeclaration(
void ClangdLSPServer::onSwitchSourceHeader(
const TextDocumentIdentifier &Params,
Callback<llvm::Optional<std::string>> Reply) {
Callback<llvm::Optional<URIForFile>> Reply) {
if (auto Result = Server->switchSourceHeader(Params.uri.file()))
Reply(URI::resolvePath(*Result, Params.uri.file()));
Reply(URIForFile::canonicalize(*Result, Params.uri.file()));
else
Reply(llvm::None);
}

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

@ -85,7 +85,7 @@ private:
Callback<std::vector<Location>>);
void onReference(const ReferenceParams &, Callback<std::vector<Location>>);
void onSwitchSourceHeader(const TextDocumentIdentifier &,
Callback<llvm::Optional<std::string>>);
Callback<llvm::Optional<URIForFile>>);
void onDocumentHighlight(const TextDocumentPositionParams &,
Callback<std::vector<DocumentHighlight>>);
void onFileEvent(const DidChangeWatchedFilesParams &);