simark created this revision. Herald added subscribers: cfe-commits, ioeric, jkorous-apple, ilya-biryukov, klimek.
Tested by rebuilding. Repository: rCTE Clang Tools Extra https://reviews.llvm.org/D44213 Files: clangd/ClangdLSPServer.cpp clangd/ProtocolHandlers.cpp clangd/ProtocolHandlers.h Index: clangd/ProtocolHandlers.h =================================================================== --- clangd/ProtocolHandlers.h +++ clangd/ProtocolHandlers.h @@ -55,8 +55,7 @@ virtual void onChangeConfiguration(DidChangeConfigurationParams &Params) = 0; }; -void registerCallbackHandlers(JSONRPCDispatcher &Dispatcher, JSONOutput &Out, - ProtocolCallbacks &Callbacks); +void registerCallbackHandlers(JSONRPCDispatcher &Dispatcher, ProtocolCallbacks &Callbacks); } // namespace clangd } // namespace clang Index: clangd/ProtocolHandlers.cpp =================================================================== --- clangd/ProtocolHandlers.cpp +++ clangd/ProtocolHandlers.cpp @@ -38,16 +38,14 @@ } JSONRPCDispatcher &Dispatcher; - JSONOutput *Out; ProtocolCallbacks *Callbacks; }; } // namespace void clangd::registerCallbackHandlers(JSONRPCDispatcher &Dispatcher, - JSONOutput &Out, ProtocolCallbacks &Callbacks) { - HandlerRegisterer Register{Dispatcher, &Out, &Callbacks}; + HandlerRegisterer Register{Dispatcher, &Callbacks}; Register("initialize", &ProtocolCallbacks::onInitialize); Register("shutdown", &ProtocolCallbacks::onShutdown); Index: clangd/ClangdLSPServer.cpp =================================================================== --- clangd/ClangdLSPServer.cpp +++ clangd/ClangdLSPServer.cpp @@ -409,7 +409,7 @@ JSONRPCDispatcher Dispatcher([](const json::Expr &Params) { replyError(ErrorCode::MethodNotFound, "method not found"); }); - registerCallbackHandlers(Dispatcher, Out, /*Callbacks=*/*this); + registerCallbackHandlers(Dispatcher, /*Callbacks=*/*this); // Run the Language Server loop. runLanguageServerLoop(In, Out, InputStyle, Dispatcher, IsDone);
Index: clangd/ProtocolHandlers.h =================================================================== --- clangd/ProtocolHandlers.h +++ clangd/ProtocolHandlers.h @@ -55,8 +55,7 @@ virtual void onChangeConfiguration(DidChangeConfigurationParams &Params) = 0; }; -void registerCallbackHandlers(JSONRPCDispatcher &Dispatcher, JSONOutput &Out, - ProtocolCallbacks &Callbacks); +void registerCallbackHandlers(JSONRPCDispatcher &Dispatcher, ProtocolCallbacks &Callbacks); } // namespace clangd } // namespace clang Index: clangd/ProtocolHandlers.cpp =================================================================== --- clangd/ProtocolHandlers.cpp +++ clangd/ProtocolHandlers.cpp @@ -38,16 +38,14 @@ } JSONRPCDispatcher &Dispatcher; - JSONOutput *Out; ProtocolCallbacks *Callbacks; }; } // namespace void clangd::registerCallbackHandlers(JSONRPCDispatcher &Dispatcher, - JSONOutput &Out, ProtocolCallbacks &Callbacks) { - HandlerRegisterer Register{Dispatcher, &Out, &Callbacks}; + HandlerRegisterer Register{Dispatcher, &Callbacks}; Register("initialize", &ProtocolCallbacks::onInitialize); Register("shutdown", &ProtocolCallbacks::onShutdown); Index: clangd/ClangdLSPServer.cpp =================================================================== --- clangd/ClangdLSPServer.cpp +++ clangd/ClangdLSPServer.cpp @@ -409,7 +409,7 @@ JSONRPCDispatcher Dispatcher([](const json::Expr &Params) { replyError(ErrorCode::MethodNotFound, "method not found"); }); - registerCallbackHandlers(Dispatcher, Out, /*Callbacks=*/*this); + registerCallbackHandlers(Dispatcher, /*Callbacks=*/*this); // Run the Language Server loop. runLanguageServerLoop(In, Out, InputStyle, Dispatcher, IsDone);
_______________________________________________ cfe-commits mailing list cfe-commits@lists.llvm.org http://lists.llvm.org/cgi-bin/mailman/listinfo/cfe-commits