malaperle created this revision. Herald added subscribers: cfe-commits, jkorous, MaskRay, ioeric, ilya-biryukov, klimek.
Signed-off-by: Marc-Andre Laperle <marc-andre.lape...@ericsson.com> Repository: rCTE Clang Tools Extra https://reviews.llvm.org/D47737 Files: clangd/ClangdServer.cpp Index: clangd/ClangdServer.cpp =================================================================== --- clangd/ClangdServer.cpp +++ clangd/ClangdServer.cpp @@ -298,9 +298,8 @@ void ClangdServer::findDefinitions(PathRef File, Position Pos, Callback<std::vector<Location>> CB) { - auto FS = FSProvider.getFileSystem(); - auto Action = [Pos, FS, this](Callback<std::vector<Location>> CB, - llvm::Expected<InputsAndAST> InpAST) { + auto Action = [Pos, this](Callback<std::vector<Location>> CB, + llvm::Expected<InputsAndAST> InpAST) { if (!InpAST) return CB(InpAST.takeError()); CB(clangd::findDefinitions(InpAST->AST, Pos, this->FileIdx.get())); @@ -391,10 +390,8 @@ void ClangdServer::findDocumentHighlights( PathRef File, Position Pos, Callback<std::vector<DocumentHighlight>> CB) { - - auto FS = FSProvider.getFileSystem(); - auto Action = [FS, Pos](Callback<std::vector<DocumentHighlight>> CB, - llvm::Expected<InputsAndAST> InpAST) { + auto Action = [Pos](Callback<std::vector<DocumentHighlight>> CB, + llvm::Expected<InputsAndAST> InpAST) { if (!InpAST) return CB(InpAST.takeError()); CB(clangd::findDocumentHighlights(InpAST->AST, Pos)); @@ -405,9 +402,8 @@ void ClangdServer::findHover(PathRef File, Position Pos, Callback<llvm::Optional<Hover>> CB) { - auto FS = FSProvider.getFileSystem(); - auto Action = [Pos, FS](Callback<llvm::Optional<Hover>> CB, - llvm::Expected<InputsAndAST> InpAST) { + auto Action = [Pos](Callback<llvm::Optional<Hover>> CB, + llvm::Expected<InputsAndAST> InpAST) { if (!InpAST) return CB(InpAST.takeError()); CB(clangd::getHover(InpAST->AST, Pos));
Index: clangd/ClangdServer.cpp =================================================================== --- clangd/ClangdServer.cpp +++ clangd/ClangdServer.cpp @@ -298,9 +298,8 @@ void ClangdServer::findDefinitions(PathRef File, Position Pos, Callback<std::vector<Location>> CB) { - auto FS = FSProvider.getFileSystem(); - auto Action = [Pos, FS, this](Callback<std::vector<Location>> CB, - llvm::Expected<InputsAndAST> InpAST) { + auto Action = [Pos, this](Callback<std::vector<Location>> CB, + llvm::Expected<InputsAndAST> InpAST) { if (!InpAST) return CB(InpAST.takeError()); CB(clangd::findDefinitions(InpAST->AST, Pos, this->FileIdx.get())); @@ -391,10 +390,8 @@ void ClangdServer::findDocumentHighlights( PathRef File, Position Pos, Callback<std::vector<DocumentHighlight>> CB) { - - auto FS = FSProvider.getFileSystem(); - auto Action = [FS, Pos](Callback<std::vector<DocumentHighlight>> CB, - llvm::Expected<InputsAndAST> InpAST) { + auto Action = [Pos](Callback<std::vector<DocumentHighlight>> CB, + llvm::Expected<InputsAndAST> InpAST) { if (!InpAST) return CB(InpAST.takeError()); CB(clangd::findDocumentHighlights(InpAST->AST, Pos)); @@ -405,9 +402,8 @@ void ClangdServer::findHover(PathRef File, Position Pos, Callback<llvm::Optional<Hover>> CB) { - auto FS = FSProvider.getFileSystem(); - auto Action = [Pos, FS](Callback<llvm::Optional<Hover>> CB, - llvm::Expected<InputsAndAST> InpAST) { + auto Action = [Pos](Callback<llvm::Optional<Hover>> CB, + llvm::Expected<InputsAndAST> InpAST) { if (!InpAST) return CB(InpAST.takeError()); CB(clangd::getHover(InpAST->AST, Pos));
_______________________________________________ cfe-commits mailing list cfe-commits@lists.llvm.org http://lists.llvm.org/cgi-bin/mailman/listinfo/cfe-commits