From 1ed3f476e3947261632ea6f7465d76371a4452d6 Mon Sep 17 00:00:00 2001 From: Roberto Raggi Date: Sun, 27 Oct 2024 16:55:33 +0100 Subject: [PATCH] chore: Clean up the LSP requests --- packages/cxx-gen-lsp/src/gen_fwd_h.ts | 5 +- packages/cxx-gen-lsp/src/gen_requests_cc.ts | 41 +- packages/cxx-gen-lsp/src/gen_requests_h.ts | 8 +- src/frontend/cxx/lsp_server.cc | 11 +- src/lsp/cxx/lsp/fwd.h | 6 +- src/lsp/cxx/lsp/requests.cc | 2743 +++++-------------- src/lsp/cxx/lsp/requests.h | 782 +++--- 7 files changed, 979 insertions(+), 2617 deletions(-) diff --git a/packages/cxx-gen-lsp/src/gen_fwd_h.ts b/packages/cxx-gen-lsp/src/gen_fwd_h.ts index 5ed44616..ce952e52 100644 --- a/packages/cxx-gen-lsp/src/gen_fwd_h.ts +++ b/packages/cxx-gen-lsp/src/gen_fwd_h.ts @@ -46,9 +46,8 @@ class LSPRequest : public LSPObject { public: using LSPObject::LSPObject; - [[nodiscard]] auto method() const -> std::string { - return repr_->at("method").get(); - } + [[nodiscard]] auto id() const -> std::optional>; + [[nodiscard]] auto method() const -> std::string; }; class LSPResponse : public LSPObject { diff --git a/packages/cxx-gen-lsp/src/gen_requests_cc.ts b/packages/cxx-gen-lsp/src/gen_requests_cc.ts index 67e0c4a1..8cc25795 100644 --- a/packages/cxx-gen-lsp/src/gen_requests_cc.ts +++ b/packages/cxx-gen-lsp/src/gen_requests_cc.ts @@ -42,33 +42,34 @@ class RequestGenerator { genTypes() { this.begin(); + this.emit(); + this.emit(`auto LSPRequest::id() const -> std::optional> {`); + this.emit(` if (!repr_->contains("id")) return std::nullopt;`); + this.emit(` const auto& id = repr_->at("id");`); + this.emit(` if (id.is_string()) return id.get();`); + this.emit(` return id.get();`); + this.emit(`}`); + this.emit(); + this.emit(`auto LSPRequest::method() const -> std::string {`); + this.emit(` return repr_->at("method");`); + this.emit(`}`); + const requestsAndNotifications = [...this.model.requests, ...this.model.notifications]; requestsAndNotifications.forEach((request) => { const { typeName } = request; this.emit(); - this.emit(`auto ${typeName}::method() const -> std::string {`); - this.emit(` return repr_->at("method");`); - this.emit(`}`); - this.emit(); this.emit(`auto ${typeName}::method(std::string method) -> ${typeName}& {`); this.emit(` (*repr_)["method"] = std::move(method);`); this.emit(` return *this;`); this.emit(`}`); this.emit(); - this.emit(`auto ${typeName}::id() const -> std::variant {`); - this.emit(` const auto& id = repr_->at("id");`); - this.emit(` if (id.is_string()) return id.get();`); - this.emit(` return id.get();`); - this.emit(`}`); - this.emit(); - this.emit(`auto ${typeName}::id(long id) -> ${typeName}& {`); - this.emit(` (*repr_)["id"] = id;`); - this.emit(` return *this;`); - this.emit(`}`); - this.emit(); - this.emit(`auto ${typeName}::id(std::string id) -> ${typeName}& {`); - this.emit(` (*repr_)["id"] = std::move(id);`); + this.emit(`auto ${typeName}::id(std::variant id) -> ${typeName}& {`); + this.emit(` if (std::holds_alternative(id)) {`); + this.emit(` (*repr_)["id"] = std::get(id);`); + this.emit(` } else {`); + this.emit(` (*repr_)["id"] = std::get(id);`); + this.emit(` }`); this.emit(` return *this;`); this.emit(`}`); @@ -91,12 +92,6 @@ class RequestGenerator { const responseTypeName = typeName.replace(/Request$/, "Response"); const resultTypeName = toCppType(request.result); - this.emit(); - this.emit(`auto ${responseTypeName}::id() const -> std::variant {`); - this.emit(` const auto& id = repr_->at("id");`); - this.emit(` if (id.is_string()) return id.get();`); - this.emit(` return id.get();`); - this.emit(`}`); this.emit(); this.emit(`auto ${responseTypeName}::id(long id) -> ${responseTypeName}& {`); this.emit(` (*repr_)["id"] = id;`); diff --git a/packages/cxx-gen-lsp/src/gen_requests_h.ts b/packages/cxx-gen-lsp/src/gen_requests_h.ts index c24d1887..ede326d1 100644 --- a/packages/cxx-gen-lsp/src/gen_requests_h.ts +++ b/packages/cxx-gen-lsp/src/gen_requests_h.ts @@ -66,13 +66,11 @@ export function gen_requests_h({ model, outputDirectory }: { model: MetaModel; o emit(`class ${typeName} final : public LSPRequest {`); emit(`public:`); emit(` using LSPRequest::LSPRequest;`); + emit(` using LSPRequest::id;`); + emit(` using LSPRequest::method;`); emit(); - emit(` [[nodiscard]] auto method() const -> std::string;`); emit(` auto method(std::string method) -> ${typeName}&;`); - emit(); - emit(` [[nodiscard]] auto id() const -> std::variant;`); - emit(` auto id(long id) -> ${typeName}&;`); - emit(` auto id(std::string id) -> ${typeName}&;`); + emit(` auto id(std::variant id) -> ${typeName}&;`); if (request.params) { const paramsType = toCppType(request.params); diff --git a/src/frontend/cxx/lsp_server.cc b/src/frontend/cxx/lsp_server.cc index a095f27d..481e2237 100644 --- a/src/frontend/cxx/lsp_server.cc +++ b/src/frontend/cxx/lsp_server.cc @@ -391,13 +391,20 @@ class Server { // void operator()(const LSPRequest& request) { std::cerr << "Request: " << request.method() << "\n"; + + if (request.id().has_value()) { + // send an empty response. + json storage; + LSPObject result(storage); + sendToClient(result, request.id()); + } } }; int startServer(const CLI& cli) { Server server; - server.start(); - return 0; + auto exitCode = server.start(); + return exitCode; } } // namespace cxx::lsp diff --git a/src/lsp/cxx/lsp/fwd.h b/src/lsp/cxx/lsp/fwd.h index 1d7cc756..bc6ec298 100644 --- a/src/lsp/cxx/lsp/fwd.h +++ b/src/lsp/cxx/lsp/fwd.h @@ -645,9 +645,9 @@ class LSPRequest : public LSPObject { public: using LSPObject::LSPObject; - [[nodiscard]] auto method() const -> std::string { - return repr_->at("method").get(); - } + [[nodiscard]] auto id() const + -> std::optional>; + [[nodiscard]] auto method() const -> std::string; }; class LSPResponse : public LSPObject { diff --git a/src/lsp/cxx/lsp/requests.cc b/src/lsp/cxx/lsp/requests.cc index 62c390f8..50371447 100644 --- a/src/lsp/cxx/lsp/requests.cc +++ b/src/lsp/cxx/lsp/requests.cc @@ -24,29 +24,28 @@ namespace cxx::lsp { -auto ImplementationRequest::method() const -> std::string { - return repr_->at("method"); -} - -auto ImplementationRequest::method(std::string method) - -> ImplementationRequest& { - (*repr_)["method"] = std::move(method); - return *this; -} - -auto ImplementationRequest::id() const -> std::variant { +auto LSPRequest::id() const -> std::optional> { + if (!repr_->contains("id")) return std::nullopt; const auto& id = repr_->at("id"); if (id.is_string()) return id.get(); return id.get(); } -auto ImplementationRequest::id(long id) -> ImplementationRequest& { - (*repr_)["id"] = id; +auto LSPRequest::method() const -> std::string { return repr_->at("method"); } + +auto ImplementationRequest::method(std::string method) + -> ImplementationRequest& { + (*repr_)["method"] = std::move(method); return *this; } -auto ImplementationRequest::id(std::string id) -> ImplementationRequest& { - (*repr_)["id"] = std::move(id); +auto ImplementationRequest::id(std::variant id) + -> ImplementationRequest& { + if (std::holds_alternative(id)) { + (*repr_)["id"] = std::get(id); + } else { + (*repr_)["id"] = std::get(id); + } return *this; } @@ -61,12 +60,6 @@ auto ImplementationRequest::params(ImplementationParams params) return *this; } -auto ImplementationResponse::id() const -> std::variant { - const auto& id = repr_->at("id"); - if (id.is_string()) return id.get(); - return id.get(); -} - auto ImplementationResponse::id(long id) -> ImplementationResponse& { (*repr_)["id"] = id; return *this; @@ -89,29 +82,19 @@ auto ImplementationResponse::result( return *this; } -auto TypeDefinitionRequest::method() const -> std::string { - return repr_->at("method"); -} - auto TypeDefinitionRequest::method(std::string method) -> TypeDefinitionRequest& { (*repr_)["method"] = std::move(method); return *this; } -auto TypeDefinitionRequest::id() const -> std::variant { - const auto& id = repr_->at("id"); - if (id.is_string()) return id.get(); - return id.get(); -} - -auto TypeDefinitionRequest::id(long id) -> TypeDefinitionRequest& { - (*repr_)["id"] = id; - return *this; -} - -auto TypeDefinitionRequest::id(std::string id) -> TypeDefinitionRequest& { - (*repr_)["id"] = std::move(id); +auto TypeDefinitionRequest::id(std::variant id) + -> TypeDefinitionRequest& { + if (std::holds_alternative(id)) { + (*repr_)["id"] = std::get(id); + } else { + (*repr_)["id"] = std::get(id); + } return *this; } @@ -126,12 +109,6 @@ auto TypeDefinitionRequest::params(TypeDefinitionParams params) return *this; } -auto TypeDefinitionResponse::id() const -> std::variant { - const auto& id = repr_->at("id"); - if (id.is_string()) return id.get(); - return id.get(); -} - auto TypeDefinitionResponse::id(long id) -> TypeDefinitionResponse& { (*repr_)["id"] = id; return *this; @@ -154,38 +131,22 @@ auto TypeDefinitionResponse::result( return *this; } -auto WorkspaceFoldersRequest::method() const -> std::string { - return repr_->at("method"); -} - auto WorkspaceFoldersRequest::method(std::string method) -> WorkspaceFoldersRequest& { (*repr_)["method"] = std::move(method); return *this; } -auto WorkspaceFoldersRequest::id() const -> std::variant { - const auto& id = repr_->at("id"); - if (id.is_string()) return id.get(); - return id.get(); -} - -auto WorkspaceFoldersRequest::id(long id) -> WorkspaceFoldersRequest& { - (*repr_)["id"] = id; - return *this; -} - -auto WorkspaceFoldersRequest::id(std::string id) -> WorkspaceFoldersRequest& { - (*repr_)["id"] = std::move(id); +auto WorkspaceFoldersRequest::id(std::variant id) + -> WorkspaceFoldersRequest& { + if (std::holds_alternative(id)) { + (*repr_)["id"] = std::get(id); + } else { + (*repr_)["id"] = std::get(id); + } return *this; } -auto WorkspaceFoldersResponse::id() const -> std::variant { - const auto& id = repr_->at("id"); - if (id.is_string()) return id.get(); - return id.get(); -} - auto WorkspaceFoldersResponse::id(long id) -> WorkspaceFoldersResponse& { (*repr_)["id"] = id; return *this; @@ -208,28 +169,18 @@ auto WorkspaceFoldersResponse::result( return *this; } -auto ConfigurationRequest::method() const -> std::string { - return repr_->at("method"); -} - auto ConfigurationRequest::method(std::string method) -> ConfigurationRequest& { (*repr_)["method"] = std::move(method); return *this; } -auto ConfigurationRequest::id() const -> std::variant { - const auto& id = repr_->at("id"); - if (id.is_string()) return id.get(); - return id.get(); -} - -auto ConfigurationRequest::id(long id) -> ConfigurationRequest& { - (*repr_)["id"] = id; - return *this; -} - -auto ConfigurationRequest::id(std::string id) -> ConfigurationRequest& { - (*repr_)["id"] = std::move(id); +auto ConfigurationRequest::id(std::variant id) + -> ConfigurationRequest& { + if (std::holds_alternative(id)) { + (*repr_)["id"] = std::get(id); + } else { + (*repr_)["id"] = std::get(id); + } return *this; } @@ -244,12 +195,6 @@ auto ConfigurationRequest::params(ConfigurationParams params) return *this; } -auto ConfigurationResponse::id() const -> std::variant { - const auto& id = repr_->at("id"); - if (id.is_string()) return id.get(); - return id.get(); -} - auto ConfigurationResponse::id(long id) -> ConfigurationResponse& { (*repr_)["id"] = id; return *this; @@ -270,28 +215,18 @@ auto ConfigurationResponse::result(Vector result) return *this; } -auto DocumentColorRequest::method() const -> std::string { - return repr_->at("method"); -} - auto DocumentColorRequest::method(std::string method) -> DocumentColorRequest& { (*repr_)["method"] = std::move(method); return *this; } -auto DocumentColorRequest::id() const -> std::variant { - const auto& id = repr_->at("id"); - if (id.is_string()) return id.get(); - return id.get(); -} - -auto DocumentColorRequest::id(long id) -> DocumentColorRequest& { - (*repr_)["id"] = id; - return *this; -} - -auto DocumentColorRequest::id(std::string id) -> DocumentColorRequest& { - (*repr_)["id"] = std::move(id); +auto DocumentColorRequest::id(std::variant id) + -> DocumentColorRequest& { + if (std::holds_alternative(id)) { + (*repr_)["id"] = std::get(id); + } else { + (*repr_)["id"] = std::get(id); + } return *this; } @@ -306,12 +241,6 @@ auto DocumentColorRequest::params(DocumentColorParams params) return *this; } -auto DocumentColorResponse::id() const -> std::variant { - const auto& id = repr_->at("id"); - if (id.is_string()) return id.get(); - return id.get(); -} - auto DocumentColorResponse::id(long id) -> DocumentColorResponse& { (*repr_)["id"] = id; return *this; @@ -332,29 +261,19 @@ auto DocumentColorResponse::result(Vector result) return *this; } -auto ColorPresentationRequest::method() const -> std::string { - return repr_->at("method"); -} - auto ColorPresentationRequest::method(std::string method) -> ColorPresentationRequest& { (*repr_)["method"] = std::move(method); return *this; } -auto ColorPresentationRequest::id() const -> std::variant { - const auto& id = repr_->at("id"); - if (id.is_string()) return id.get(); - return id.get(); -} - -auto ColorPresentationRequest::id(long id) -> ColorPresentationRequest& { - (*repr_)["id"] = id; - return *this; -} - -auto ColorPresentationRequest::id(std::string id) -> ColorPresentationRequest& { - (*repr_)["id"] = std::move(id); +auto ColorPresentationRequest::id(std::variant id) + -> ColorPresentationRequest& { + if (std::holds_alternative(id)) { + (*repr_)["id"] = std::get(id); + } else { + (*repr_)["id"] = std::get(id); + } return *this; } @@ -369,12 +288,6 @@ auto ColorPresentationRequest::params(ColorPresentationParams params) return *this; } -auto ColorPresentationResponse::id() const -> std::variant { - const auto& id = repr_->at("id"); - if (id.is_string()) return id.get(); - return id.get(); -} - auto ColorPresentationResponse::id(long id) -> ColorPresentationResponse& { (*repr_)["id"] = id; return *this; @@ -398,28 +311,18 @@ auto ColorPresentationResponse::result(Vector result) return *this; } -auto FoldingRangeRequest::method() const -> std::string { - return repr_->at("method"); -} - auto FoldingRangeRequest::method(std::string method) -> FoldingRangeRequest& { (*repr_)["method"] = std::move(method); return *this; } -auto FoldingRangeRequest::id() const -> std::variant { - const auto& id = repr_->at("id"); - if (id.is_string()) return id.get(); - return id.get(); -} - -auto FoldingRangeRequest::id(long id) -> FoldingRangeRequest& { - (*repr_)["id"] = id; - return *this; -} - -auto FoldingRangeRequest::id(std::string id) -> FoldingRangeRequest& { - (*repr_)["id"] = std::move(id); +auto FoldingRangeRequest::id(std::variant id) + -> FoldingRangeRequest& { + if (std::holds_alternative(id)) { + (*repr_)["id"] = std::get(id); + } else { + (*repr_)["id"] = std::get(id); + } return *this; } @@ -434,12 +337,6 @@ auto FoldingRangeRequest::params(FoldingRangeParams params) return *this; } -auto FoldingRangeResponse::id() const -> std::variant { - const auto& id = repr_->at("id"); - if (id.is_string()) return id.get(); - return id.get(); -} - auto FoldingRangeResponse::id(long id) -> FoldingRangeResponse& { (*repr_)["id"] = id; return *this; @@ -462,40 +359,22 @@ auto FoldingRangeResponse::result( return *this; } -auto FoldingRangeRefreshRequest::method() const -> std::string { - return repr_->at("method"); -} - auto FoldingRangeRefreshRequest::method(std::string method) -> FoldingRangeRefreshRequest& { (*repr_)["method"] = std::move(method); return *this; } -auto FoldingRangeRefreshRequest::id() const -> std::variant { - const auto& id = repr_->at("id"); - if (id.is_string()) return id.get(); - return id.get(); -} - -auto FoldingRangeRefreshRequest::id(long id) -> FoldingRangeRefreshRequest& { - (*repr_)["id"] = id; - return *this; -} - -auto FoldingRangeRefreshRequest::id(std::string id) +auto FoldingRangeRefreshRequest::id(std::variant id) -> FoldingRangeRefreshRequest& { - (*repr_)["id"] = std::move(id); + if (std::holds_alternative(id)) { + (*repr_)["id"] = std::get(id); + } else { + (*repr_)["id"] = std::get(id); + } return *this; } -auto FoldingRangeRefreshResponse::id() const - -> std::variant { - const auto& id = repr_->at("id"); - if (id.is_string()) return id.get(); - return id.get(); -} - auto FoldingRangeRefreshResponse::id(long id) -> FoldingRangeRefreshResponse& { (*repr_)["id"] = id; return *this; @@ -517,28 +396,18 @@ auto FoldingRangeRefreshResponse::result(std::nullptr_t result) return *this; } -auto DeclarationRequest::method() const -> std::string { - return repr_->at("method"); -} - auto DeclarationRequest::method(std::string method) -> DeclarationRequest& { (*repr_)["method"] = std::move(method); return *this; } -auto DeclarationRequest::id() const -> std::variant { - const auto& id = repr_->at("id"); - if (id.is_string()) return id.get(); - return id.get(); -} - -auto DeclarationRequest::id(long id) -> DeclarationRequest& { - (*repr_)["id"] = id; - return *this; -} - -auto DeclarationRequest::id(std::string id) -> DeclarationRequest& { - (*repr_)["id"] = std::move(id); +auto DeclarationRequest::id(std::variant id) + -> DeclarationRequest& { + if (std::holds_alternative(id)) { + (*repr_)["id"] = std::get(id); + } else { + (*repr_)["id"] = std::get(id); + } return *this; } @@ -553,12 +422,6 @@ auto DeclarationRequest::params(DeclarationParams params) return *this; } -auto DeclarationResponse::id() const -> std::variant { - const auto& id = repr_->at("id"); - if (id.is_string()) return id.get(); - return id.get(); -} - auto DeclarationResponse::id(long id) -> DeclarationResponse& { (*repr_)["id"] = id; return *this; @@ -581,29 +444,19 @@ auto DeclarationResponse::result( return *this; } -auto SelectionRangeRequest::method() const -> std::string { - return repr_->at("method"); -} - auto SelectionRangeRequest::method(std::string method) -> SelectionRangeRequest& { (*repr_)["method"] = std::move(method); return *this; } -auto SelectionRangeRequest::id() const -> std::variant { - const auto& id = repr_->at("id"); - if (id.is_string()) return id.get(); - return id.get(); -} - -auto SelectionRangeRequest::id(long id) -> SelectionRangeRequest& { - (*repr_)["id"] = id; - return *this; -} - -auto SelectionRangeRequest::id(std::string id) -> SelectionRangeRequest& { - (*repr_)["id"] = std::move(id); +auto SelectionRangeRequest::id(std::variant id) + -> SelectionRangeRequest& { + if (std::holds_alternative(id)) { + (*repr_)["id"] = std::get(id); + } else { + (*repr_)["id"] = std::get(id); + } return *this; } @@ -618,12 +471,6 @@ auto SelectionRangeRequest::params(SelectionRangeParams params) return *this; } -auto SelectionRangeResponse::id() const -> std::variant { - const auto& id = repr_->at("id"); - if (id.is_string()) return id.get(); - return id.get(); -} - auto SelectionRangeResponse::id(long id) -> SelectionRangeResponse& { (*repr_)["id"] = id; return *this; @@ -646,32 +493,19 @@ auto SelectionRangeResponse::result( return *this; } -auto WorkDoneProgressCreateRequest::method() const -> std::string { - return repr_->at("method"); -} - auto WorkDoneProgressCreateRequest::method(std::string method) -> WorkDoneProgressCreateRequest& { (*repr_)["method"] = std::move(method); return *this; } -auto WorkDoneProgressCreateRequest::id() const - -> std::variant { - const auto& id = repr_->at("id"); - if (id.is_string()) return id.get(); - return id.get(); -} - -auto WorkDoneProgressCreateRequest::id(long id) - -> WorkDoneProgressCreateRequest& { - (*repr_)["id"] = id; - return *this; -} - -auto WorkDoneProgressCreateRequest::id(std::string id) +auto WorkDoneProgressCreateRequest::id(std::variant id) -> WorkDoneProgressCreateRequest& { - (*repr_)["id"] = std::move(id); + if (std::holds_alternative(id)) { + (*repr_)["id"] = std::get(id); + } else { + (*repr_)["id"] = std::get(id); + } return *this; } @@ -687,13 +521,6 @@ auto WorkDoneProgressCreateRequest::params(WorkDoneProgressCreateParams params) return *this; } -auto WorkDoneProgressCreateResponse::id() const - -> std::variant { - const auto& id = repr_->at("id"); - if (id.is_string()) return id.get(); - return id.get(); -} - auto WorkDoneProgressCreateResponse::id(long id) -> WorkDoneProgressCreateResponse& { (*repr_)["id"] = id; @@ -716,31 +543,19 @@ auto WorkDoneProgressCreateResponse::result(std::nullptr_t result) return *this; } -auto CallHierarchyPrepareRequest::method() const -> std::string { - return repr_->at("method"); -} - auto CallHierarchyPrepareRequest::method(std::string method) -> CallHierarchyPrepareRequest& { (*repr_)["method"] = std::move(method); return *this; } -auto CallHierarchyPrepareRequest::id() const - -> std::variant { - const auto& id = repr_->at("id"); - if (id.is_string()) return id.get(); - return id.get(); -} - -auto CallHierarchyPrepareRequest::id(long id) -> CallHierarchyPrepareRequest& { - (*repr_)["id"] = id; - return *this; -} - -auto CallHierarchyPrepareRequest::id(std::string id) +auto CallHierarchyPrepareRequest::id(std::variant id) -> CallHierarchyPrepareRequest& { - (*repr_)["id"] = std::move(id); + if (std::holds_alternative(id)) { + (*repr_)["id"] = std::get(id); + } else { + (*repr_)["id"] = std::get(id); + } return *this; } @@ -755,13 +570,6 @@ auto CallHierarchyPrepareRequest::params(CallHierarchyPrepareParams params) return *this; } -auto CallHierarchyPrepareResponse::id() const - -> std::variant { - const auto& id = repr_->at("id"); - if (id.is_string()) return id.get(); - return id.get(); -} - auto CallHierarchyPrepareResponse::id(long id) -> CallHierarchyPrepareResponse& { (*repr_)["id"] = id; @@ -788,32 +596,19 @@ auto CallHierarchyPrepareResponse::result( return *this; } -auto CallHierarchyIncomingCallsRequest::method() const -> std::string { - return repr_->at("method"); -} - auto CallHierarchyIncomingCallsRequest::method(std::string method) -> CallHierarchyIncomingCallsRequest& { (*repr_)["method"] = std::move(method); return *this; } -auto CallHierarchyIncomingCallsRequest::id() const - -> std::variant { - const auto& id = repr_->at("id"); - if (id.is_string()) return id.get(); - return id.get(); -} - -auto CallHierarchyIncomingCallsRequest::id(long id) - -> CallHierarchyIncomingCallsRequest& { - (*repr_)["id"] = id; - return *this; -} - -auto CallHierarchyIncomingCallsRequest::id(std::string id) +auto CallHierarchyIncomingCallsRequest::id(std::variant id) -> CallHierarchyIncomingCallsRequest& { - (*repr_)["id"] = std::move(id); + if (std::holds_alternative(id)) { + (*repr_)["id"] = std::get(id); + } else { + (*repr_)["id"] = std::get(id); + } return *this; } @@ -830,13 +625,6 @@ auto CallHierarchyIncomingCallsRequest::params( return *this; } -auto CallHierarchyIncomingCallsResponse::id() const - -> std::variant { - const auto& id = repr_->at("id"); - if (id.is_string()) return id.get(); - return id.get(); -} - auto CallHierarchyIncomingCallsResponse::id(long id) -> CallHierarchyIncomingCallsResponse& { (*repr_)["id"] = id; @@ -863,32 +651,19 @@ auto CallHierarchyIncomingCallsResponse::result( return *this; } -auto CallHierarchyOutgoingCallsRequest::method() const -> std::string { - return repr_->at("method"); -} - auto CallHierarchyOutgoingCallsRequest::method(std::string method) -> CallHierarchyOutgoingCallsRequest& { (*repr_)["method"] = std::move(method); return *this; } -auto CallHierarchyOutgoingCallsRequest::id() const - -> std::variant { - const auto& id = repr_->at("id"); - if (id.is_string()) return id.get(); - return id.get(); -} - -auto CallHierarchyOutgoingCallsRequest::id(long id) - -> CallHierarchyOutgoingCallsRequest& { - (*repr_)["id"] = id; - return *this; -} - -auto CallHierarchyOutgoingCallsRequest::id(std::string id) +auto CallHierarchyOutgoingCallsRequest::id(std::variant id) -> CallHierarchyOutgoingCallsRequest& { - (*repr_)["id"] = std::move(id); + if (std::holds_alternative(id)) { + (*repr_)["id"] = std::get(id); + } else { + (*repr_)["id"] = std::get(id); + } return *this; } @@ -905,13 +680,6 @@ auto CallHierarchyOutgoingCallsRequest::params( return *this; } -auto CallHierarchyOutgoingCallsResponse::id() const - -> std::variant { - const auto& id = repr_->at("id"); - if (id.is_string()) return id.get(); - return id.get(); -} - auto CallHierarchyOutgoingCallsResponse::id(long id) -> CallHierarchyOutgoingCallsResponse& { (*repr_)["id"] = id; @@ -938,29 +706,19 @@ auto CallHierarchyOutgoingCallsResponse::result( return *this; } -auto SemanticTokensRequest::method() const -> std::string { - return repr_->at("method"); -} - auto SemanticTokensRequest::method(std::string method) -> SemanticTokensRequest& { (*repr_)["method"] = std::move(method); return *this; } -auto SemanticTokensRequest::id() const -> std::variant { - const auto& id = repr_->at("id"); - if (id.is_string()) return id.get(); - return id.get(); -} - -auto SemanticTokensRequest::id(long id) -> SemanticTokensRequest& { - (*repr_)["id"] = id; - return *this; -} - -auto SemanticTokensRequest::id(std::string id) -> SemanticTokensRequest& { - (*repr_)["id"] = std::move(id); +auto SemanticTokensRequest::id(std::variant id) + -> SemanticTokensRequest& { + if (std::holds_alternative(id)) { + (*repr_)["id"] = std::get(id); + } else { + (*repr_)["id"] = std::get(id); + } return *this; } @@ -975,12 +733,6 @@ auto SemanticTokensRequest::params(SemanticTokensParams params) return *this; } -auto SemanticTokensResponse::id() const -> std::variant { - const auto& id = repr_->at("id"); - if (id.is_string()) return id.get(); - return id.get(); -} - auto SemanticTokensResponse::id(long id) -> SemanticTokensResponse& { (*repr_)["id"] = id; return *this; @@ -1003,30 +755,19 @@ auto SemanticTokensResponse::result( return *this; } -auto SemanticTokensDeltaRequest::method() const -> std::string { - return repr_->at("method"); -} - auto SemanticTokensDeltaRequest::method(std::string method) -> SemanticTokensDeltaRequest& { (*repr_)["method"] = std::move(method); return *this; } -auto SemanticTokensDeltaRequest::id() const -> std::variant { - const auto& id = repr_->at("id"); - if (id.is_string()) return id.get(); - return id.get(); -} - -auto SemanticTokensDeltaRequest::id(long id) -> SemanticTokensDeltaRequest& { - (*repr_)["id"] = id; - return *this; -} - -auto SemanticTokensDeltaRequest::id(std::string id) +auto SemanticTokensDeltaRequest::id(std::variant id) -> SemanticTokensDeltaRequest& { - (*repr_)["id"] = std::move(id); + if (std::holds_alternative(id)) { + (*repr_)["id"] = std::get(id); + } else { + (*repr_)["id"] = std::get(id); + } return *this; } @@ -1041,13 +782,6 @@ auto SemanticTokensDeltaRequest::params(SemanticTokensDeltaParams params) return *this; } -auto SemanticTokensDeltaResponse::id() const - -> std::variant { - const auto& id = repr_->at("id"); - if (id.is_string()) return id.get(); - return id.get(); -} - auto SemanticTokensDeltaResponse::id(long id) -> SemanticTokensDeltaResponse& { (*repr_)["id"] = id; return *this; @@ -1073,30 +807,19 @@ auto SemanticTokensDeltaResponse::result( return *this; } -auto SemanticTokensRangeRequest::method() const -> std::string { - return repr_->at("method"); -} - auto SemanticTokensRangeRequest::method(std::string method) -> SemanticTokensRangeRequest& { (*repr_)["method"] = std::move(method); return *this; } -auto SemanticTokensRangeRequest::id() const -> std::variant { - const auto& id = repr_->at("id"); - if (id.is_string()) return id.get(); - return id.get(); -} - -auto SemanticTokensRangeRequest::id(long id) -> SemanticTokensRangeRequest& { - (*repr_)["id"] = id; - return *this; -} - -auto SemanticTokensRangeRequest::id(std::string id) +auto SemanticTokensRangeRequest::id(std::variant id) -> SemanticTokensRangeRequest& { - (*repr_)["id"] = std::move(id); + if (std::holds_alternative(id)) { + (*repr_)["id"] = std::get(id); + } else { + (*repr_)["id"] = std::get(id); + } return *this; } @@ -1111,13 +834,6 @@ auto SemanticTokensRangeRequest::params(SemanticTokensRangeParams params) return *this; } -auto SemanticTokensRangeResponse::id() const - -> std::variant { - const auto& id = repr_->at("id"); - if (id.is_string()) return id.get(); - return id.get(); -} - auto SemanticTokensRangeResponse::id(long id) -> SemanticTokensRangeResponse& { (*repr_)["id"] = id; return *this; @@ -1143,42 +859,22 @@ auto SemanticTokensRangeResponse::result( return *this; } -auto SemanticTokensRefreshRequest::method() const -> std::string { - return repr_->at("method"); -} - auto SemanticTokensRefreshRequest::method(std::string method) -> SemanticTokensRefreshRequest& { (*repr_)["method"] = std::move(method); return *this; } -auto SemanticTokensRefreshRequest::id() const - -> std::variant { - const auto& id = repr_->at("id"); - if (id.is_string()) return id.get(); - return id.get(); -} - -auto SemanticTokensRefreshRequest::id(long id) - -> SemanticTokensRefreshRequest& { - (*repr_)["id"] = id; - return *this; -} - -auto SemanticTokensRefreshRequest::id(std::string id) +auto SemanticTokensRefreshRequest::id(std::variant id) -> SemanticTokensRefreshRequest& { - (*repr_)["id"] = std::move(id); + if (std::holds_alternative(id)) { + (*repr_)["id"] = std::get(id); + } else { + (*repr_)["id"] = std::get(id); + } return *this; } -auto SemanticTokensRefreshResponse::id() const - -> std::variant { - const auto& id = repr_->at("id"); - if (id.is_string()) return id.get(); - return id.get(); -} - auto SemanticTokensRefreshResponse::id(long id) -> SemanticTokensRefreshResponse& { (*repr_)["id"] = id; @@ -1201,28 +897,18 @@ auto SemanticTokensRefreshResponse::result(std::nullptr_t result) return *this; } -auto ShowDocumentRequest::method() const -> std::string { - return repr_->at("method"); -} - auto ShowDocumentRequest::method(std::string method) -> ShowDocumentRequest& { (*repr_)["method"] = std::move(method); return *this; } -auto ShowDocumentRequest::id() const -> std::variant { - const auto& id = repr_->at("id"); - if (id.is_string()) return id.get(); - return id.get(); -} - -auto ShowDocumentRequest::id(long id) -> ShowDocumentRequest& { - (*repr_)["id"] = id; - return *this; -} - -auto ShowDocumentRequest::id(std::string id) -> ShowDocumentRequest& { - (*repr_)["id"] = std::move(id); +auto ShowDocumentRequest::id(std::variant id) + -> ShowDocumentRequest& { + if (std::holds_alternative(id)) { + (*repr_)["id"] = std::get(id); + } else { + (*repr_)["id"] = std::get(id); + } return *this; } @@ -1237,12 +923,6 @@ auto ShowDocumentRequest::params(ShowDocumentParams params) return *this; } -auto ShowDocumentResponse::id() const -> std::variant { - const auto& id = repr_->at("id"); - if (id.is_string()) return id.get(); - return id.get(); -} - auto ShowDocumentResponse::id(long id) -> ShowDocumentResponse& { (*repr_)["id"] = id; return *this; @@ -1264,30 +944,19 @@ auto ShowDocumentResponse::result(ShowDocumentResult result) return *this; } -auto LinkedEditingRangeRequest::method() const -> std::string { - return repr_->at("method"); -} - auto LinkedEditingRangeRequest::method(std::string method) -> LinkedEditingRangeRequest& { (*repr_)["method"] = std::move(method); return *this; } -auto LinkedEditingRangeRequest::id() const -> std::variant { - const auto& id = repr_->at("id"); - if (id.is_string()) return id.get(); - return id.get(); -} - -auto LinkedEditingRangeRequest::id(long id) -> LinkedEditingRangeRequest& { - (*repr_)["id"] = id; - return *this; -} - -auto LinkedEditingRangeRequest::id(std::string id) +auto LinkedEditingRangeRequest::id(std::variant id) -> LinkedEditingRangeRequest& { - (*repr_)["id"] = std::move(id); + if (std::holds_alternative(id)) { + (*repr_)["id"] = std::get(id); + } else { + (*repr_)["id"] = std::get(id); + } return *this; } @@ -1302,12 +971,6 @@ auto LinkedEditingRangeRequest::params(LinkedEditingRangeParams params) return *this; } -auto LinkedEditingRangeResponse::id() const -> std::variant { - const auto& id = repr_->at("id"); - if (id.is_string()) return id.get(); - return id.get(); -} - auto LinkedEditingRangeResponse::id(long id) -> LinkedEditingRangeResponse& { (*repr_)["id"] = id; return *this; @@ -1333,29 +996,19 @@ auto LinkedEditingRangeResponse::result( return *this; } -auto WillCreateFilesRequest::method() const -> std::string { - return repr_->at("method"); -} - auto WillCreateFilesRequest::method(std::string method) -> WillCreateFilesRequest& { (*repr_)["method"] = std::move(method); return *this; } -auto WillCreateFilesRequest::id() const -> std::variant { - const auto& id = repr_->at("id"); - if (id.is_string()) return id.get(); - return id.get(); -} - -auto WillCreateFilesRequest::id(long id) -> WillCreateFilesRequest& { - (*repr_)["id"] = id; - return *this; -} - -auto WillCreateFilesRequest::id(std::string id) -> WillCreateFilesRequest& { - (*repr_)["id"] = std::move(id); +auto WillCreateFilesRequest::id(std::variant id) + -> WillCreateFilesRequest& { + if (std::holds_alternative(id)) { + (*repr_)["id"] = std::get(id); + } else { + (*repr_)["id"] = std::get(id); + } return *this; } @@ -1370,12 +1023,6 @@ auto WillCreateFilesRequest::params(CreateFilesParams params) return *this; } -auto WillCreateFilesResponse::id() const -> std::variant { - const auto& id = repr_->at("id"); - if (id.is_string()) return id.get(); - return id.get(); -} - auto WillCreateFilesResponse::id(long id) -> WillCreateFilesResponse& { (*repr_)["id"] = id; return *this; @@ -1398,29 +1045,19 @@ auto WillCreateFilesResponse::result( return *this; } -auto WillRenameFilesRequest::method() const -> std::string { - return repr_->at("method"); -} - auto WillRenameFilesRequest::method(std::string method) -> WillRenameFilesRequest& { (*repr_)["method"] = std::move(method); return *this; } -auto WillRenameFilesRequest::id() const -> std::variant { - const auto& id = repr_->at("id"); - if (id.is_string()) return id.get(); - return id.get(); -} - -auto WillRenameFilesRequest::id(long id) -> WillRenameFilesRequest& { - (*repr_)["id"] = id; - return *this; -} - -auto WillRenameFilesRequest::id(std::string id) -> WillRenameFilesRequest& { - (*repr_)["id"] = std::move(id); +auto WillRenameFilesRequest::id(std::variant id) + -> WillRenameFilesRequest& { + if (std::holds_alternative(id)) { + (*repr_)["id"] = std::get(id); + } else { + (*repr_)["id"] = std::get(id); + } return *this; } @@ -1435,12 +1072,6 @@ auto WillRenameFilesRequest::params(RenameFilesParams params) return *this; } -auto WillRenameFilesResponse::id() const -> std::variant { - const auto& id = repr_->at("id"); - if (id.is_string()) return id.get(); - return id.get(); -} - auto WillRenameFilesResponse::id(long id) -> WillRenameFilesResponse& { (*repr_)["id"] = id; return *this; @@ -1463,29 +1094,19 @@ auto WillRenameFilesResponse::result( return *this; } -auto WillDeleteFilesRequest::method() const -> std::string { - return repr_->at("method"); -} - auto WillDeleteFilesRequest::method(std::string method) -> WillDeleteFilesRequest& { (*repr_)["method"] = std::move(method); return *this; } -auto WillDeleteFilesRequest::id() const -> std::variant { - const auto& id = repr_->at("id"); - if (id.is_string()) return id.get(); - return id.get(); -} - -auto WillDeleteFilesRequest::id(long id) -> WillDeleteFilesRequest& { - (*repr_)["id"] = id; - return *this; -} - -auto WillDeleteFilesRequest::id(std::string id) -> WillDeleteFilesRequest& { - (*repr_)["id"] = std::move(id); +auto WillDeleteFilesRequest::id(std::variant id) + -> WillDeleteFilesRequest& { + if (std::holds_alternative(id)) { + (*repr_)["id"] = std::get(id); + } else { + (*repr_)["id"] = std::get(id); + } return *this; } @@ -1500,12 +1121,6 @@ auto WillDeleteFilesRequest::params(DeleteFilesParams params) return *this; } -auto WillDeleteFilesResponse::id() const -> std::variant { - const auto& id = repr_->at("id"); - if (id.is_string()) return id.get(); - return id.get(); -} - auto WillDeleteFilesResponse::id(long id) -> WillDeleteFilesResponse& { (*repr_)["id"] = id; return *this; @@ -1528,28 +1143,17 @@ auto WillDeleteFilesResponse::result( return *this; } -auto MonikerRequest::method() const -> std::string { - return repr_->at("method"); -} - auto MonikerRequest::method(std::string method) -> MonikerRequest& { (*repr_)["method"] = std::move(method); return *this; } -auto MonikerRequest::id() const -> std::variant { - const auto& id = repr_->at("id"); - if (id.is_string()) return id.get(); - return id.get(); -} - -auto MonikerRequest::id(long id) -> MonikerRequest& { - (*repr_)["id"] = id; - return *this; -} - -auto MonikerRequest::id(std::string id) -> MonikerRequest& { - (*repr_)["id"] = std::move(id); +auto MonikerRequest::id(std::variant id) -> MonikerRequest& { + if (std::holds_alternative(id)) { + (*repr_)["id"] = std::get(id); + } else { + (*repr_)["id"] = std::get(id); + } return *this; } @@ -1563,12 +1167,6 @@ auto MonikerRequest::params(MonikerParams params) -> MonikerRequest& { return *this; } -auto MonikerResponse::id() const -> std::variant { - const auto& id = repr_->at("id"); - if (id.is_string()) return id.get(); - return id.get(); -} - auto MonikerResponse::id(long id) -> MonikerResponse& { (*repr_)["id"] = id; return *this; @@ -1590,31 +1188,19 @@ auto MonikerResponse::result( return *this; } -auto TypeHierarchyPrepareRequest::method() const -> std::string { - return repr_->at("method"); -} - auto TypeHierarchyPrepareRequest::method(std::string method) -> TypeHierarchyPrepareRequest& { (*repr_)["method"] = std::move(method); return *this; } -auto TypeHierarchyPrepareRequest::id() const - -> std::variant { - const auto& id = repr_->at("id"); - if (id.is_string()) return id.get(); - return id.get(); -} - -auto TypeHierarchyPrepareRequest::id(long id) -> TypeHierarchyPrepareRequest& { - (*repr_)["id"] = id; - return *this; -} - -auto TypeHierarchyPrepareRequest::id(std::string id) +auto TypeHierarchyPrepareRequest::id(std::variant id) -> TypeHierarchyPrepareRequest& { - (*repr_)["id"] = std::move(id); + if (std::holds_alternative(id)) { + (*repr_)["id"] = std::get(id); + } else { + (*repr_)["id"] = std::get(id); + } return *this; } @@ -1629,13 +1215,6 @@ auto TypeHierarchyPrepareRequest::params(TypeHierarchyPrepareParams params) return *this; } -auto TypeHierarchyPrepareResponse::id() const - -> std::variant { - const auto& id = repr_->at("id"); - if (id.is_string()) return id.get(); - return id.get(); -} - auto TypeHierarchyPrepareResponse::id(long id) -> TypeHierarchyPrepareResponse& { (*repr_)["id"] = id; @@ -1662,32 +1241,19 @@ auto TypeHierarchyPrepareResponse::result( return *this; } -auto TypeHierarchySupertypesRequest::method() const -> std::string { - return repr_->at("method"); -} - auto TypeHierarchySupertypesRequest::method(std::string method) -> TypeHierarchySupertypesRequest& { (*repr_)["method"] = std::move(method); return *this; } -auto TypeHierarchySupertypesRequest::id() const - -> std::variant { - const auto& id = repr_->at("id"); - if (id.is_string()) return id.get(); - return id.get(); -} - -auto TypeHierarchySupertypesRequest::id(long id) - -> TypeHierarchySupertypesRequest& { - (*repr_)["id"] = id; - return *this; -} - -auto TypeHierarchySupertypesRequest::id(std::string id) +auto TypeHierarchySupertypesRequest::id(std::variant id) -> TypeHierarchySupertypesRequest& { - (*repr_)["id"] = std::move(id); + if (std::holds_alternative(id)) { + (*repr_)["id"] = std::get(id); + } else { + (*repr_)["id"] = std::get(id); + } return *this; } @@ -1703,13 +1269,6 @@ auto TypeHierarchySupertypesRequest::params( return *this; } -auto TypeHierarchySupertypesResponse::id() const - -> std::variant { - const auto& id = repr_->at("id"); - if (id.is_string()) return id.get(); - return id.get(); -} - auto TypeHierarchySupertypesResponse::id(long id) -> TypeHierarchySupertypesResponse& { (*repr_)["id"] = id; @@ -1736,32 +1295,19 @@ auto TypeHierarchySupertypesResponse::result( return *this; } -auto TypeHierarchySubtypesRequest::method() const -> std::string { - return repr_->at("method"); -} - auto TypeHierarchySubtypesRequest::method(std::string method) -> TypeHierarchySubtypesRequest& { (*repr_)["method"] = std::move(method); return *this; } -auto TypeHierarchySubtypesRequest::id() const - -> std::variant { - const auto& id = repr_->at("id"); - if (id.is_string()) return id.get(); - return id.get(); -} - -auto TypeHierarchySubtypesRequest::id(long id) - -> TypeHierarchySubtypesRequest& { - (*repr_)["id"] = id; - return *this; -} - -auto TypeHierarchySubtypesRequest::id(std::string id) +auto TypeHierarchySubtypesRequest::id(std::variant id) -> TypeHierarchySubtypesRequest& { - (*repr_)["id"] = std::move(id); + if (std::holds_alternative(id)) { + (*repr_)["id"] = std::get(id); + } else { + (*repr_)["id"] = std::get(id); + } return *this; } @@ -1777,13 +1323,6 @@ auto TypeHierarchySubtypesRequest::params(TypeHierarchySubtypesParams params) return *this; } -auto TypeHierarchySubtypesResponse::id() const - -> std::variant { - const auto& id = repr_->at("id"); - if (id.is_string()) return id.get(); - return id.get(); -} - auto TypeHierarchySubtypesResponse::id(long id) -> TypeHierarchySubtypesResponse& { (*repr_)["id"] = id; @@ -1810,28 +1349,18 @@ auto TypeHierarchySubtypesResponse::result( return *this; } -auto InlineValueRequest::method() const -> std::string { - return repr_->at("method"); -} - auto InlineValueRequest::method(std::string method) -> InlineValueRequest& { (*repr_)["method"] = std::move(method); return *this; } -auto InlineValueRequest::id() const -> std::variant { - const auto& id = repr_->at("id"); - if (id.is_string()) return id.get(); - return id.get(); -} - -auto InlineValueRequest::id(long id) -> InlineValueRequest& { - (*repr_)["id"] = id; - return *this; -} - -auto InlineValueRequest::id(std::string id) -> InlineValueRequest& { - (*repr_)["id"] = std::move(id); +auto InlineValueRequest::id(std::variant id) + -> InlineValueRequest& { + if (std::holds_alternative(id)) { + (*repr_)["id"] = std::get(id); + } else { + (*repr_)["id"] = std::get(id); + } return *this; } @@ -1846,12 +1375,6 @@ auto InlineValueRequest::params(InlineValueParams params) return *this; } -auto InlineValueResponse::id() const -> std::variant { - const auto& id = repr_->at("id"); - if (id.is_string()) return id.get(); - return id.get(); -} - auto InlineValueResponse::id(long id) -> InlineValueResponse& { (*repr_)["id"] = id; return *this; @@ -1874,46 +1397,29 @@ auto InlineValueResponse::result( return *this; } -auto InlineValueRefreshRequest::method() const -> std::string { - return repr_->at("method"); -} - auto InlineValueRefreshRequest::method(std::string method) -> InlineValueRefreshRequest& { (*repr_)["method"] = std::move(method); return *this; } -auto InlineValueRefreshRequest::id() const -> std::variant { - const auto& id = repr_->at("id"); - if (id.is_string()) return id.get(); - return id.get(); +auto InlineValueRefreshRequest::id(std::variant id) + -> InlineValueRefreshRequest& { + if (std::holds_alternative(id)) { + (*repr_)["id"] = std::get(id); + } else { + (*repr_)["id"] = std::get(id); + } + return *this; } -auto InlineValueRefreshRequest::id(long id) -> InlineValueRefreshRequest& { +auto InlineValueRefreshResponse::id(long id) -> InlineValueRefreshResponse& { (*repr_)["id"] = id; return *this; } -auto InlineValueRefreshRequest::id(std::string id) - -> InlineValueRefreshRequest& { - (*repr_)["id"] = std::move(id); - return *this; -} - -auto InlineValueRefreshResponse::id() const -> std::variant { - const auto& id = repr_->at("id"); - if (id.is_string()) return id.get(); - return id.get(); -} - -auto InlineValueRefreshResponse::id(long id) -> InlineValueRefreshResponse& { - (*repr_)["id"] = id; - return *this; -} - -auto InlineValueRefreshResponse::id(std::string id) - -> InlineValueRefreshResponse& { +auto InlineValueRefreshResponse::id(std::string id) + -> InlineValueRefreshResponse& { (*repr_)["id"] = std::move(id); return *this; } @@ -1928,28 +1434,18 @@ auto InlineValueRefreshResponse::result(std::nullptr_t result) return *this; } -auto InlayHintRequest::method() const -> std::string { - return repr_->at("method"); -} - auto InlayHintRequest::method(std::string method) -> InlayHintRequest& { (*repr_)["method"] = std::move(method); return *this; } -auto InlayHintRequest::id() const -> std::variant { - const auto& id = repr_->at("id"); - if (id.is_string()) return id.get(); - return id.get(); -} - -auto InlayHintRequest::id(long id) -> InlayHintRequest& { - (*repr_)["id"] = id; - return *this; -} - -auto InlayHintRequest::id(std::string id) -> InlayHintRequest& { - (*repr_)["id"] = std::move(id); +auto InlayHintRequest::id(std::variant id) + -> InlayHintRequest& { + if (std::holds_alternative(id)) { + (*repr_)["id"] = std::get(id); + } else { + (*repr_)["id"] = std::get(id); + } return *this; } @@ -1963,12 +1459,6 @@ auto InlayHintRequest::params(InlayHintParams params) -> InlayHintRequest& { return *this; } -auto InlayHintResponse::id() const -> std::variant { - const auto& id = repr_->at("id"); - if (id.is_string()) return id.get(); - return id.get(); -} - auto InlayHintResponse::id(long id) -> InlayHintResponse& { (*repr_)["id"] = id; return *this; @@ -1991,29 +1481,19 @@ auto InlayHintResponse::result( return *this; } -auto InlayHintResolveRequest::method() const -> std::string { - return repr_->at("method"); -} - auto InlayHintResolveRequest::method(std::string method) -> InlayHintResolveRequest& { (*repr_)["method"] = std::move(method); return *this; } -auto InlayHintResolveRequest::id() const -> std::variant { - const auto& id = repr_->at("id"); - if (id.is_string()) return id.get(); - return id.get(); -} - -auto InlayHintResolveRequest::id(long id) -> InlayHintResolveRequest& { - (*repr_)["id"] = id; - return *this; -} - -auto InlayHintResolveRequest::id(std::string id) -> InlayHintResolveRequest& { - (*repr_)["id"] = std::move(id); +auto InlayHintResolveRequest::id(std::variant id) + -> InlayHintResolveRequest& { + if (std::holds_alternative(id)) { + (*repr_)["id"] = std::get(id); + } else { + (*repr_)["id"] = std::get(id); + } return *this; } @@ -2028,12 +1508,6 @@ auto InlayHintResolveRequest::params(InlayHint params) return *this; } -auto InlayHintResolveResponse::id() const -> std::variant { - const auto& id = repr_->at("id"); - if (id.is_string()) return id.get(); - return id.get(); -} - auto InlayHintResolveResponse::id(long id) -> InlayHintResolveResponse& { (*repr_)["id"] = id; return *this; @@ -2055,38 +1529,22 @@ auto InlayHintResolveResponse::result(InlayHint result) return *this; } -auto InlayHintRefreshRequest::method() const -> std::string { - return repr_->at("method"); -} - auto InlayHintRefreshRequest::method(std::string method) -> InlayHintRefreshRequest& { (*repr_)["method"] = std::move(method); return *this; } -auto InlayHintRefreshRequest::id() const -> std::variant { - const auto& id = repr_->at("id"); - if (id.is_string()) return id.get(); - return id.get(); -} - -auto InlayHintRefreshRequest::id(long id) -> InlayHintRefreshRequest& { - (*repr_)["id"] = id; - return *this; -} - -auto InlayHintRefreshRequest::id(std::string id) -> InlayHintRefreshRequest& { - (*repr_)["id"] = std::move(id); +auto InlayHintRefreshRequest::id(std::variant id) + -> InlayHintRefreshRequest& { + if (std::holds_alternative(id)) { + (*repr_)["id"] = std::get(id); + } else { + (*repr_)["id"] = std::get(id); + } return *this; } -auto InlayHintRefreshResponse::id() const -> std::variant { - const auto& id = repr_->at("id"); - if (id.is_string()) return id.get(); - return id.get(); -} - auto InlayHintRefreshResponse::id(long id) -> InlayHintRefreshResponse& { (*repr_)["id"] = id; return *this; @@ -2107,30 +1565,19 @@ auto InlayHintRefreshResponse::result(std::nullptr_t result) return *this; } -auto DocumentDiagnosticRequest::method() const -> std::string { - return repr_->at("method"); -} - auto DocumentDiagnosticRequest::method(std::string method) -> DocumentDiagnosticRequest& { (*repr_)["method"] = std::move(method); return *this; } -auto DocumentDiagnosticRequest::id() const -> std::variant { - const auto& id = repr_->at("id"); - if (id.is_string()) return id.get(); - return id.get(); -} - -auto DocumentDiagnosticRequest::id(long id) -> DocumentDiagnosticRequest& { - (*repr_)["id"] = id; - return *this; -} - -auto DocumentDiagnosticRequest::id(std::string id) +auto DocumentDiagnosticRequest::id(std::variant id) -> DocumentDiagnosticRequest& { - (*repr_)["id"] = std::move(id); + if (std::holds_alternative(id)) { + (*repr_)["id"] = std::get(id); + } else { + (*repr_)["id"] = std::get(id); + } return *this; } @@ -2145,12 +1592,6 @@ auto DocumentDiagnosticRequest::params(DocumentDiagnosticParams params) return *this; } -auto DocumentDiagnosticResponse::id() const -> std::variant { - const auto& id = repr_->at("id"); - if (id.is_string()) return id.get(); - return id.get(); -} - auto DocumentDiagnosticResponse::id(long id) -> DocumentDiagnosticResponse& { (*repr_)["id"] = id; return *this; @@ -2174,30 +1615,19 @@ auto DocumentDiagnosticResponse::result(DocumentDiagnosticReport result) return *this; } -auto WorkspaceDiagnosticRequest::method() const -> std::string { - return repr_->at("method"); -} - auto WorkspaceDiagnosticRequest::method(std::string method) -> WorkspaceDiagnosticRequest& { (*repr_)["method"] = std::move(method); return *this; } -auto WorkspaceDiagnosticRequest::id() const -> std::variant { - const auto& id = repr_->at("id"); - if (id.is_string()) return id.get(); - return id.get(); -} - -auto WorkspaceDiagnosticRequest::id(long id) -> WorkspaceDiagnosticRequest& { - (*repr_)["id"] = id; - return *this; -} - -auto WorkspaceDiagnosticRequest::id(std::string id) +auto WorkspaceDiagnosticRequest::id(std::variant id) -> WorkspaceDiagnosticRequest& { - (*repr_)["id"] = std::move(id); + if (std::holds_alternative(id)) { + (*repr_)["id"] = std::get(id); + } else { + (*repr_)["id"] = std::get(id); + } return *this; } @@ -2212,13 +1642,6 @@ auto WorkspaceDiagnosticRequest::params(WorkspaceDiagnosticParams params) return *this; } -auto WorkspaceDiagnosticResponse::id() const - -> std::variant { - const auto& id = repr_->at("id"); - if (id.is_string()) return id.get(); - return id.get(); -} - auto WorkspaceDiagnosticResponse::id(long id) -> WorkspaceDiagnosticResponse& { (*repr_)["id"] = id; return *this; @@ -2242,38 +1665,22 @@ auto WorkspaceDiagnosticResponse::result(WorkspaceDiagnosticReport result) return *this; } -auto DiagnosticRefreshRequest::method() const -> std::string { - return repr_->at("method"); -} - auto DiagnosticRefreshRequest::method(std::string method) -> DiagnosticRefreshRequest& { (*repr_)["method"] = std::move(method); return *this; } -auto DiagnosticRefreshRequest::id() const -> std::variant { - const auto& id = repr_->at("id"); - if (id.is_string()) return id.get(); - return id.get(); -} - -auto DiagnosticRefreshRequest::id(long id) -> DiagnosticRefreshRequest& { - (*repr_)["id"] = id; - return *this; -} - -auto DiagnosticRefreshRequest::id(std::string id) -> DiagnosticRefreshRequest& { - (*repr_)["id"] = std::move(id); +auto DiagnosticRefreshRequest::id(std::variant id) + -> DiagnosticRefreshRequest& { + if (std::holds_alternative(id)) { + (*repr_)["id"] = std::get(id); + } else { + (*repr_)["id"] = std::get(id); + } return *this; } -auto DiagnosticRefreshResponse::id() const -> std::variant { - const auto& id = repr_->at("id"); - if (id.is_string()) return id.get(); - return id.get(); -} - auto DiagnosticRefreshResponse::id(long id) -> DiagnosticRefreshResponse& { (*repr_)["id"] = id; return *this; @@ -2295,29 +1702,19 @@ auto DiagnosticRefreshResponse::result(std::nullptr_t result) return *this; } -auto InlineCompletionRequest::method() const -> std::string { - return repr_->at("method"); -} - auto InlineCompletionRequest::method(std::string method) -> InlineCompletionRequest& { (*repr_)["method"] = std::move(method); return *this; } -auto InlineCompletionRequest::id() const -> std::variant { - const auto& id = repr_->at("id"); - if (id.is_string()) return id.get(); - return id.get(); -} - -auto InlineCompletionRequest::id(long id) -> InlineCompletionRequest& { - (*repr_)["id"] = id; - return *this; -} - -auto InlineCompletionRequest::id(std::string id) -> InlineCompletionRequest& { - (*repr_)["id"] = std::move(id); +auto InlineCompletionRequest::id(std::variant id) + -> InlineCompletionRequest& { + if (std::holds_alternative(id)) { + (*repr_)["id"] = std::get(id); + } else { + (*repr_)["id"] = std::get(id); + } return *this; } @@ -2332,12 +1729,6 @@ auto InlineCompletionRequest::params(InlineCompletionParams params) return *this; } -auto InlineCompletionResponse::id() const -> std::variant { - const auto& id = repr_->at("id"); - if (id.is_string()) return id.get(); - return id.get(); -} - auto InlineCompletionResponse::id(long id) -> InlineCompletionResponse& { (*repr_)["id"] = id; return *this; @@ -2362,30 +1753,19 @@ auto InlineCompletionResponse::result( return *this; } -auto TextDocumentContentRequest::method() const -> std::string { - return repr_->at("method"); -} - auto TextDocumentContentRequest::method(std::string method) -> TextDocumentContentRequest& { (*repr_)["method"] = std::move(method); return *this; } -auto TextDocumentContentRequest::id() const -> std::variant { - const auto& id = repr_->at("id"); - if (id.is_string()) return id.get(); - return id.get(); -} - -auto TextDocumentContentRequest::id(long id) -> TextDocumentContentRequest& { - (*repr_)["id"] = id; - return *this; -} - -auto TextDocumentContentRequest::id(std::string id) +auto TextDocumentContentRequest::id(std::variant id) -> TextDocumentContentRequest& { - (*repr_)["id"] = std::move(id); + if (std::holds_alternative(id)) { + (*repr_)["id"] = std::get(id); + } else { + (*repr_)["id"] = std::get(id); + } return *this; } @@ -2400,13 +1780,6 @@ auto TextDocumentContentRequest::params(TextDocumentContentParams params) return *this; } -auto TextDocumentContentResponse::id() const - -> std::variant { - const auto& id = repr_->at("id"); - if (id.is_string()) return id.get(); - return id.get(); -} - auto TextDocumentContentResponse::id(long id) -> TextDocumentContentResponse& { (*repr_)["id"] = id; return *this; @@ -2430,32 +1803,19 @@ auto TextDocumentContentResponse::result(TextDocumentContentResult result) return *this; } -auto TextDocumentContentRefreshRequest::method() const -> std::string { - return repr_->at("method"); -} - auto TextDocumentContentRefreshRequest::method(std::string method) -> TextDocumentContentRefreshRequest& { (*repr_)["method"] = std::move(method); return *this; } -auto TextDocumentContentRefreshRequest::id() const - -> std::variant { - const auto& id = repr_->at("id"); - if (id.is_string()) return id.get(); - return id.get(); -} - -auto TextDocumentContentRefreshRequest::id(long id) - -> TextDocumentContentRefreshRequest& { - (*repr_)["id"] = id; - return *this; -} - -auto TextDocumentContentRefreshRequest::id(std::string id) +auto TextDocumentContentRefreshRequest::id(std::variant id) -> TextDocumentContentRefreshRequest& { - (*repr_)["id"] = std::move(id); + if (std::holds_alternative(id)) { + (*repr_)["id"] = std::get(id); + } else { + (*repr_)["id"] = std::get(id); + } return *this; } @@ -2472,13 +1832,6 @@ auto TextDocumentContentRefreshRequest::params( return *this; } -auto TextDocumentContentRefreshResponse::id() const - -> std::variant { - const auto& id = repr_->at("id"); - if (id.is_string()) return id.get(); - return id.get(); -} - auto TextDocumentContentRefreshResponse::id(long id) -> TextDocumentContentRefreshResponse& { (*repr_)["id"] = id; @@ -2501,28 +1854,18 @@ auto TextDocumentContentRefreshResponse::result(std::nullptr_t result) return *this; } -auto RegistrationRequest::method() const -> std::string { - return repr_->at("method"); -} - auto RegistrationRequest::method(std::string method) -> RegistrationRequest& { (*repr_)["method"] = std::move(method); return *this; } -auto RegistrationRequest::id() const -> std::variant { - const auto& id = repr_->at("id"); - if (id.is_string()) return id.get(); - return id.get(); -} - -auto RegistrationRequest::id(long id) -> RegistrationRequest& { - (*repr_)["id"] = id; - return *this; -} - -auto RegistrationRequest::id(std::string id) -> RegistrationRequest& { - (*repr_)["id"] = std::move(id); +auto RegistrationRequest::id(std::variant id) + -> RegistrationRequest& { + if (std::holds_alternative(id)) { + (*repr_)["id"] = std::get(id); + } else { + (*repr_)["id"] = std::get(id); + } return *this; } @@ -2537,12 +1880,6 @@ auto RegistrationRequest::params(RegistrationParams params) return *this; } -auto RegistrationResponse::id() const -> std::variant { - const auto& id = repr_->at("id"); - if (id.is_string()) return id.get(); - return id.get(); -} - auto RegistrationResponse::id(long id) -> RegistrationResponse& { (*repr_)["id"] = id; return *this; @@ -2561,29 +1898,19 @@ auto RegistrationResponse::result(std::nullptr_t result) return *this; } -auto UnregistrationRequest::method() const -> std::string { - return repr_->at("method"); -} - auto UnregistrationRequest::method(std::string method) -> UnregistrationRequest& { (*repr_)["method"] = std::move(method); return *this; } -auto UnregistrationRequest::id() const -> std::variant { - const auto& id = repr_->at("id"); - if (id.is_string()) return id.get(); - return id.get(); -} - -auto UnregistrationRequest::id(long id) -> UnregistrationRequest& { - (*repr_)["id"] = id; - return *this; -} - -auto UnregistrationRequest::id(std::string id) -> UnregistrationRequest& { - (*repr_)["id"] = std::move(id); +auto UnregistrationRequest::id(std::variant id) + -> UnregistrationRequest& { + if (std::holds_alternative(id)) { + (*repr_)["id"] = std::get(id); + } else { + (*repr_)["id"] = std::get(id); + } return *this; } @@ -2598,12 +1925,6 @@ auto UnregistrationRequest::params(UnregistrationParams params) return *this; } -auto UnregistrationResponse::id() const -> std::variant { - const auto& id = repr_->at("id"); - if (id.is_string()) return id.get(); - return id.get(); -} - auto UnregistrationResponse::id(long id) -> UnregistrationResponse& { (*repr_)["id"] = id; return *this; @@ -2624,28 +1945,18 @@ auto UnregistrationResponse::result(std::nullptr_t result) return *this; } -auto InitializeRequest::method() const -> std::string { - return repr_->at("method"); -} - auto InitializeRequest::method(std::string method) -> InitializeRequest& { (*repr_)["method"] = std::move(method); return *this; } -auto InitializeRequest::id() const -> std::variant { - const auto& id = repr_->at("id"); - if (id.is_string()) return id.get(); - return id.get(); -} - -auto InitializeRequest::id(long id) -> InitializeRequest& { - (*repr_)["id"] = id; - return *this; -} - -auto InitializeRequest::id(std::string id) -> InitializeRequest& { - (*repr_)["id"] = std::move(id); +auto InitializeRequest::id(std::variant id) + -> InitializeRequest& { + if (std::holds_alternative(id)) { + (*repr_)["id"] = std::get(id); + } else { + (*repr_)["id"] = std::get(id); + } return *this; } @@ -2659,12 +1970,6 @@ auto InitializeRequest::params(InitializeParams params) -> InitializeRequest& { return *this; } -auto InitializeResponse::id() const -> std::variant { - const auto& id = repr_->at("id"); - if (id.is_string()) return id.get(); - return id.get(); -} - auto InitializeResponse::id(long id) -> InitializeResponse& { (*repr_)["id"] = id; return *this; @@ -2686,37 +1991,21 @@ auto InitializeResponse::result(InitializeResult result) return *this; } -auto ShutdownRequest::method() const -> std::string { - return repr_->at("method"); -} - auto ShutdownRequest::method(std::string method) -> ShutdownRequest& { (*repr_)["method"] = std::move(method); return *this; } -auto ShutdownRequest::id() const -> std::variant { - const auto& id = repr_->at("id"); - if (id.is_string()) return id.get(); - return id.get(); -} - -auto ShutdownRequest::id(long id) -> ShutdownRequest& { - (*repr_)["id"] = id; - return *this; -} - -auto ShutdownRequest::id(std::string id) -> ShutdownRequest& { - (*repr_)["id"] = std::move(id); +auto ShutdownRequest::id(std::variant id) + -> ShutdownRequest& { + if (std::holds_alternative(id)) { + (*repr_)["id"] = std::get(id); + } else { + (*repr_)["id"] = std::get(id); + } return *this; } -auto ShutdownResponse::id() const -> std::variant { - const auto& id = repr_->at("id"); - if (id.is_string()) return id.get(); - return id.get(); -} - auto ShutdownResponse::id(long id) -> ShutdownResponse& { (*repr_)["id"] = id; return *this; @@ -2734,28 +2023,18 @@ auto ShutdownResponse::result(std::nullptr_t result) -> ShutdownResponse& { return *this; } -auto ShowMessageRequest::method() const -> std::string { - return repr_->at("method"); -} - auto ShowMessageRequest::method(std::string method) -> ShowMessageRequest& { (*repr_)["method"] = std::move(method); return *this; } -auto ShowMessageRequest::id() const -> std::variant { - const auto& id = repr_->at("id"); - if (id.is_string()) return id.get(); - return id.get(); -} - -auto ShowMessageRequest::id(long id) -> ShowMessageRequest& { - (*repr_)["id"] = id; - return *this; -} - -auto ShowMessageRequest::id(std::string id) -> ShowMessageRequest& { - (*repr_)["id"] = std::move(id); +auto ShowMessageRequest::id(std::variant id) + -> ShowMessageRequest& { + if (std::holds_alternative(id)) { + (*repr_)["id"] = std::get(id); + } else { + (*repr_)["id"] = std::get(id); + } return *this; } @@ -2770,12 +2049,6 @@ auto ShowMessageRequest::params(ShowMessageRequestParams params) return *this; } -auto ShowMessageResponse::id() const -> std::variant { - const auto& id = repr_->at("id"); - if (id.is_string()) return id.get(); - return id.get(); -} - auto ShowMessageResponse::id(long id) -> ShowMessageResponse& { (*repr_)["id"] = id; return *this; @@ -2798,32 +2071,20 @@ auto ShowMessageResponse::result( return *this; } -auto WillSaveTextDocumentWaitUntilRequest::method() const -> std::string { - return repr_->at("method"); -} - auto WillSaveTextDocumentWaitUntilRequest::method(std::string method) -> WillSaveTextDocumentWaitUntilRequest& { (*repr_)["method"] = std::move(method); return *this; } -auto WillSaveTextDocumentWaitUntilRequest::id() const - -> std::variant { - const auto& id = repr_->at("id"); - if (id.is_string()) return id.get(); - return id.get(); -} - -auto WillSaveTextDocumentWaitUntilRequest::id(long id) - -> WillSaveTextDocumentWaitUntilRequest& { - (*repr_)["id"] = id; - return *this; -} - -auto WillSaveTextDocumentWaitUntilRequest::id(std::string id) +auto WillSaveTextDocumentWaitUntilRequest::id( + std::variant id) -> WillSaveTextDocumentWaitUntilRequest& { - (*repr_)["id"] = std::move(id); + if (std::holds_alternative(id)) { + (*repr_)["id"] = std::get(id); + } else { + (*repr_)["id"] = std::get(id); + } return *this; } @@ -2840,13 +2101,6 @@ auto WillSaveTextDocumentWaitUntilRequest::params( return *this; } -auto WillSaveTextDocumentWaitUntilResponse::id() const - -> std::variant { - const auto& id = repr_->at("id"); - if (id.is_string()) return id.get(); - return id.get(); -} - auto WillSaveTextDocumentWaitUntilResponse::id(long id) -> WillSaveTextDocumentWaitUntilResponse& { (*repr_)["id"] = id; @@ -2873,28 +2127,18 @@ auto WillSaveTextDocumentWaitUntilResponse::result( return *this; } -auto CompletionRequest::method() const -> std::string { - return repr_->at("method"); -} - auto CompletionRequest::method(std::string method) -> CompletionRequest& { (*repr_)["method"] = std::move(method); return *this; } -auto CompletionRequest::id() const -> std::variant { - const auto& id = repr_->at("id"); - if (id.is_string()) return id.get(); - return id.get(); -} - -auto CompletionRequest::id(long id) -> CompletionRequest& { - (*repr_)["id"] = id; - return *this; -} - -auto CompletionRequest::id(std::string id) -> CompletionRequest& { - (*repr_)["id"] = std::move(id); +auto CompletionRequest::id(std::variant id) + -> CompletionRequest& { + if (std::holds_alternative(id)) { + (*repr_)["id"] = std::get(id); + } else { + (*repr_)["id"] = std::get(id); + } return *this; } @@ -2908,12 +2152,6 @@ auto CompletionRequest::params(CompletionParams params) -> CompletionRequest& { return *this; } -auto CompletionResponse::id() const -> std::variant { - const auto& id = repr_->at("id"); - if (id.is_string()) return id.get(); - return id.get(); -} - auto CompletionResponse::id(long id) -> CompletionResponse& { (*repr_)["id"] = id; return *this; @@ -2936,29 +2174,19 @@ auto CompletionResponse::result( return *this; } -auto CompletionResolveRequest::method() const -> std::string { - return repr_->at("method"); -} - auto CompletionResolveRequest::method(std::string method) -> CompletionResolveRequest& { (*repr_)["method"] = std::move(method); return *this; } -auto CompletionResolveRequest::id() const -> std::variant { - const auto& id = repr_->at("id"); - if (id.is_string()) return id.get(); - return id.get(); -} - -auto CompletionResolveRequest::id(long id) -> CompletionResolveRequest& { - (*repr_)["id"] = id; - return *this; -} - -auto CompletionResolveRequest::id(std::string id) -> CompletionResolveRequest& { - (*repr_)["id"] = std::move(id); +auto CompletionResolveRequest::id(std::variant id) + -> CompletionResolveRequest& { + if (std::holds_alternative(id)) { + (*repr_)["id"] = std::get(id); + } else { + (*repr_)["id"] = std::get(id); + } return *this; } @@ -2973,12 +2201,6 @@ auto CompletionResolveRequest::params(CompletionItem params) return *this; } -auto CompletionResolveResponse::id() const -> std::variant { - const auto& id = repr_->at("id"); - if (id.is_string()) return id.get(); - return id.get(); -} - auto CompletionResolveResponse::id(long id) -> CompletionResolveResponse& { (*repr_)["id"] = id; return *this; @@ -3002,26 +2224,17 @@ auto CompletionResolveResponse::result(CompletionItem result) return *this; } -auto HoverRequest::method() const -> std::string { return repr_->at("method"); } - auto HoverRequest::method(std::string method) -> HoverRequest& { (*repr_)["method"] = std::move(method); return *this; } -auto HoverRequest::id() const -> std::variant { - const auto& id = repr_->at("id"); - if (id.is_string()) return id.get(); - return id.get(); -} - -auto HoverRequest::id(long id) -> HoverRequest& { - (*repr_)["id"] = id; - return *this; -} - -auto HoverRequest::id(std::string id) -> HoverRequest& { - (*repr_)["id"] = std::move(id); +auto HoverRequest::id(std::variant id) -> HoverRequest& { + if (std::holds_alternative(id)) { + (*repr_)["id"] = std::get(id); + } else { + (*repr_)["id"] = std::get(id); + } return *this; } @@ -3035,12 +2248,6 @@ auto HoverRequest::params(HoverParams params) -> HoverRequest& { return *this; } -auto HoverResponse::id() const -> std::variant { - const auto& id = repr_->at("id"); - if (id.is_string()) return id.get(); - return id.get(); -} - auto HoverResponse::id(long id) -> HoverResponse& { (*repr_)["id"] = id; return *this; @@ -3061,28 +2268,18 @@ auto HoverResponse::result(std::variant result) return *this; } -auto SignatureHelpRequest::method() const -> std::string { - return repr_->at("method"); -} - auto SignatureHelpRequest::method(std::string method) -> SignatureHelpRequest& { (*repr_)["method"] = std::move(method); return *this; } -auto SignatureHelpRequest::id() const -> std::variant { - const auto& id = repr_->at("id"); - if (id.is_string()) return id.get(); - return id.get(); -} - -auto SignatureHelpRequest::id(long id) -> SignatureHelpRequest& { - (*repr_)["id"] = id; - return *this; -} - -auto SignatureHelpRequest::id(std::string id) -> SignatureHelpRequest& { - (*repr_)["id"] = std::move(id); +auto SignatureHelpRequest::id(std::variant id) + -> SignatureHelpRequest& { + if (std::holds_alternative(id)) { + (*repr_)["id"] = std::get(id); + } else { + (*repr_)["id"] = std::get(id); + } return *this; } @@ -3097,12 +2294,6 @@ auto SignatureHelpRequest::params(SignatureHelpParams params) return *this; } -auto SignatureHelpResponse::id() const -> std::variant { - const auto& id = repr_->at("id"); - if (id.is_string()) return id.get(); - return id.get(); -} - auto SignatureHelpResponse::id(long id) -> SignatureHelpResponse& { (*repr_)["id"] = id; return *this; @@ -3125,28 +2316,18 @@ auto SignatureHelpResponse::result( return *this; } -auto DefinitionRequest::method() const -> std::string { - return repr_->at("method"); -} - auto DefinitionRequest::method(std::string method) -> DefinitionRequest& { (*repr_)["method"] = std::move(method); return *this; } -auto DefinitionRequest::id() const -> std::variant { - const auto& id = repr_->at("id"); - if (id.is_string()) return id.get(); - return id.get(); -} - -auto DefinitionRequest::id(long id) -> DefinitionRequest& { - (*repr_)["id"] = id; - return *this; -} - -auto DefinitionRequest::id(std::string id) -> DefinitionRequest& { - (*repr_)["id"] = std::move(id); +auto DefinitionRequest::id(std::variant id) + -> DefinitionRequest& { + if (std::holds_alternative(id)) { + (*repr_)["id"] = std::get(id); + } else { + (*repr_)["id"] = std::get(id); + } return *this; } @@ -3160,12 +2341,6 @@ auto DefinitionRequest::params(DefinitionParams params) -> DefinitionRequest& { return *this; } -auto DefinitionResponse::id() const -> std::variant { - const auto& id = repr_->at("id"); - if (id.is_string()) return id.get(); - return id.get(); -} - auto DefinitionResponse::id(long id) -> DefinitionResponse& { (*repr_)["id"] = id; return *this; @@ -3188,28 +2363,18 @@ auto DefinitionResponse::result( return *this; } -auto ReferencesRequest::method() const -> std::string { - return repr_->at("method"); -} - auto ReferencesRequest::method(std::string method) -> ReferencesRequest& { (*repr_)["method"] = std::move(method); return *this; } -auto ReferencesRequest::id() const -> std::variant { - const auto& id = repr_->at("id"); - if (id.is_string()) return id.get(); - return id.get(); -} - -auto ReferencesRequest::id(long id) -> ReferencesRequest& { - (*repr_)["id"] = id; - return *this; -} - -auto ReferencesRequest::id(std::string id) -> ReferencesRequest& { - (*repr_)["id"] = std::move(id); +auto ReferencesRequest::id(std::variant id) + -> ReferencesRequest& { + if (std::holds_alternative(id)) { + (*repr_)["id"] = std::get(id); + } else { + (*repr_)["id"] = std::get(id); + } return *this; } @@ -3223,12 +2388,6 @@ auto ReferencesRequest::params(ReferenceParams params) -> ReferencesRequest& { return *this; } -auto ReferencesResponse::id() const -> std::variant { - const auto& id = repr_->at("id"); - if (id.is_string()) return id.get(); - return id.get(); -} - auto ReferencesResponse::id(long id) -> ReferencesResponse& { (*repr_)["id"] = id; return *this; @@ -3251,29 +2410,19 @@ auto ReferencesResponse::result( return *this; } -auto DocumentHighlightRequest::method() const -> std::string { - return repr_->at("method"); -} - auto DocumentHighlightRequest::method(std::string method) -> DocumentHighlightRequest& { (*repr_)["method"] = std::move(method); return *this; } -auto DocumentHighlightRequest::id() const -> std::variant { - const auto& id = repr_->at("id"); - if (id.is_string()) return id.get(); - return id.get(); -} - -auto DocumentHighlightRequest::id(long id) -> DocumentHighlightRequest& { - (*repr_)["id"] = id; - return *this; -} - -auto DocumentHighlightRequest::id(std::string id) -> DocumentHighlightRequest& { - (*repr_)["id"] = std::move(id); +auto DocumentHighlightRequest::id(std::variant id) + -> DocumentHighlightRequest& { + if (std::holds_alternative(id)) { + (*repr_)["id"] = std::get(id); + } else { + (*repr_)["id"] = std::get(id); + } return *this; } @@ -3288,12 +2437,6 @@ auto DocumentHighlightRequest::params(DocumentHighlightParams params) return *this; } -auto DocumentHighlightResponse::id() const -> std::variant { - const auto& id = repr_->at("id"); - if (id.is_string()) return id.get(); - return id.get(); -} - auto DocumentHighlightResponse::id(long id) -> DocumentHighlightResponse& { (*repr_)["id"] = id; return *this; @@ -3319,29 +2462,19 @@ auto DocumentHighlightResponse::result( return *this; } -auto DocumentSymbolRequest::method() const -> std::string { - return repr_->at("method"); -} - auto DocumentSymbolRequest::method(std::string method) -> DocumentSymbolRequest& { (*repr_)["method"] = std::move(method); return *this; } -auto DocumentSymbolRequest::id() const -> std::variant { - const auto& id = repr_->at("id"); - if (id.is_string()) return id.get(); - return id.get(); -} - -auto DocumentSymbolRequest::id(long id) -> DocumentSymbolRequest& { - (*repr_)["id"] = id; - return *this; -} - -auto DocumentSymbolRequest::id(std::string id) -> DocumentSymbolRequest& { - (*repr_)["id"] = std::move(id); +auto DocumentSymbolRequest::id(std::variant id) + -> DocumentSymbolRequest& { + if (std::holds_alternative(id)) { + (*repr_)["id"] = std::get(id); + } else { + (*repr_)["id"] = std::get(id); + } return *this; } @@ -3356,12 +2489,6 @@ auto DocumentSymbolRequest::params(DocumentSymbolParams params) return *this; } -auto DocumentSymbolResponse::id() const -> std::variant { - const auto& id = repr_->at("id"); - if (id.is_string()) return id.get(); - return id.get(); -} - auto DocumentSymbolResponse::id(long id) -> DocumentSymbolResponse& { (*repr_)["id"] = id; return *this; @@ -3386,28 +2513,18 @@ auto DocumentSymbolResponse::result( return *this; } -auto CodeActionRequest::method() const -> std::string { - return repr_->at("method"); -} - auto CodeActionRequest::method(std::string method) -> CodeActionRequest& { (*repr_)["method"] = std::move(method); return *this; } -auto CodeActionRequest::id() const -> std::variant { - const auto& id = repr_->at("id"); - if (id.is_string()) return id.get(); - return id.get(); -} - -auto CodeActionRequest::id(long id) -> CodeActionRequest& { - (*repr_)["id"] = id; - return *this; -} - -auto CodeActionRequest::id(std::string id) -> CodeActionRequest& { - (*repr_)["id"] = std::move(id); +auto CodeActionRequest::id(std::variant id) + -> CodeActionRequest& { + if (std::holds_alternative(id)) { + (*repr_)["id"] = std::get(id); + } else { + (*repr_)["id"] = std::get(id); + } return *this; } @@ -3421,12 +2538,6 @@ auto CodeActionRequest::params(CodeActionParams params) -> CodeActionRequest& { return *this; } -auto CodeActionResponse::id() const -> std::variant { - const auto& id = repr_->at("id"); - if (id.is_string()) return id.get(); - return id.get(); -} - auto CodeActionResponse::id(long id) -> CodeActionResponse& { (*repr_)["id"] = id; return *this; @@ -3449,29 +2560,19 @@ auto CodeActionResponse::result( return *this; } -auto CodeActionResolveRequest::method() const -> std::string { - return repr_->at("method"); -} - auto CodeActionResolveRequest::method(std::string method) -> CodeActionResolveRequest& { (*repr_)["method"] = std::move(method); return *this; } -auto CodeActionResolveRequest::id() const -> std::variant { - const auto& id = repr_->at("id"); - if (id.is_string()) return id.get(); - return id.get(); -} - -auto CodeActionResolveRequest::id(long id) -> CodeActionResolveRequest& { - (*repr_)["id"] = id; - return *this; -} - -auto CodeActionResolveRequest::id(std::string id) -> CodeActionResolveRequest& { - (*repr_)["id"] = std::move(id); +auto CodeActionResolveRequest::id(std::variant id) + -> CodeActionResolveRequest& { + if (std::holds_alternative(id)) { + (*repr_)["id"] = std::get(id); + } else { + (*repr_)["id"] = std::get(id); + } return *this; } @@ -3486,12 +2587,6 @@ auto CodeActionResolveRequest::params(CodeAction params) return *this; } -auto CodeActionResolveResponse::id() const -> std::variant { - const auto& id = repr_->at("id"); - if (id.is_string()) return id.get(); - return id.get(); -} - auto CodeActionResolveResponse::id(long id) -> CodeActionResolveResponse& { (*repr_)["id"] = id; return *this; @@ -3515,29 +2610,19 @@ auto CodeActionResolveResponse::result(CodeAction result) return *this; } -auto WorkspaceSymbolRequest::method() const -> std::string { - return repr_->at("method"); -} - auto WorkspaceSymbolRequest::method(std::string method) -> WorkspaceSymbolRequest& { (*repr_)["method"] = std::move(method); return *this; } -auto WorkspaceSymbolRequest::id() const -> std::variant { - const auto& id = repr_->at("id"); - if (id.is_string()) return id.get(); - return id.get(); -} - -auto WorkspaceSymbolRequest::id(long id) -> WorkspaceSymbolRequest& { - (*repr_)["id"] = id; - return *this; -} - -auto WorkspaceSymbolRequest::id(std::string id) -> WorkspaceSymbolRequest& { - (*repr_)["id"] = std::move(id); +auto WorkspaceSymbolRequest::id(std::variant id) + -> WorkspaceSymbolRequest& { + if (std::holds_alternative(id)) { + (*repr_)["id"] = std::get(id); + } else { + (*repr_)["id"] = std::get(id); + } return *this; } @@ -3552,12 +2637,6 @@ auto WorkspaceSymbolRequest::params(WorkspaceSymbolParams params) return *this; } -auto WorkspaceSymbolResponse::id() const -> std::variant { - const auto& id = repr_->at("id"); - if (id.is_string()) return id.get(); - return id.get(); -} - auto WorkspaceSymbolResponse::id(long id) -> WorkspaceSymbolResponse& { (*repr_)["id"] = id; return *this; @@ -3582,32 +2661,19 @@ auto WorkspaceSymbolResponse::result( return *this; } -auto WorkspaceSymbolResolveRequest::method() const -> std::string { - return repr_->at("method"); -} - auto WorkspaceSymbolResolveRequest::method(std::string method) -> WorkspaceSymbolResolveRequest& { (*repr_)["method"] = std::move(method); return *this; } -auto WorkspaceSymbolResolveRequest::id() const - -> std::variant { - const auto& id = repr_->at("id"); - if (id.is_string()) return id.get(); - return id.get(); -} - -auto WorkspaceSymbolResolveRequest::id(long id) - -> WorkspaceSymbolResolveRequest& { - (*repr_)["id"] = id; - return *this; -} - -auto WorkspaceSymbolResolveRequest::id(std::string id) +auto WorkspaceSymbolResolveRequest::id(std::variant id) -> WorkspaceSymbolResolveRequest& { - (*repr_)["id"] = std::move(id); + if (std::holds_alternative(id)) { + (*repr_)["id"] = std::get(id); + } else { + (*repr_)["id"] = std::get(id); + } return *this; } @@ -3622,13 +2688,6 @@ auto WorkspaceSymbolResolveRequest::params(WorkspaceSymbol params) return *this; } -auto WorkspaceSymbolResolveResponse::id() const - -> std::variant { - const auto& id = repr_->at("id"); - if (id.is_string()) return id.get(); - return id.get(); -} - auto WorkspaceSymbolResolveResponse::id(long id) -> WorkspaceSymbolResolveResponse& { (*repr_)["id"] = id; @@ -3653,28 +2712,18 @@ auto WorkspaceSymbolResolveResponse::result(WorkspaceSymbol result) return *this; } -auto CodeLensRequest::method() const -> std::string { - return repr_->at("method"); -} - auto CodeLensRequest::method(std::string method) -> CodeLensRequest& { (*repr_)["method"] = std::move(method); return *this; } -auto CodeLensRequest::id() const -> std::variant { - const auto& id = repr_->at("id"); - if (id.is_string()) return id.get(); - return id.get(); -} - -auto CodeLensRequest::id(long id) -> CodeLensRequest& { - (*repr_)["id"] = id; - return *this; -} - -auto CodeLensRequest::id(std::string id) -> CodeLensRequest& { - (*repr_)["id"] = std::move(id); +auto CodeLensRequest::id(std::variant id) + -> CodeLensRequest& { + if (std::holds_alternative(id)) { + (*repr_)["id"] = std::get(id); + } else { + (*repr_)["id"] = std::get(id); + } return *this; } @@ -3688,12 +2737,6 @@ auto CodeLensRequest::params(CodeLensParams params) -> CodeLensRequest& { return *this; } -auto CodeLensResponse::id() const -> std::variant { - const auto& id = repr_->at("id"); - if (id.is_string()) return id.get(); - return id.get(); -} - auto CodeLensResponse::id(long id) -> CodeLensResponse& { (*repr_)["id"] = id; return *this; @@ -3716,30 +2759,20 @@ auto CodeLensResponse::result( return *this; } -auto CodeLensResolveRequest::method() const -> std::string { - return repr_->at("method"); -} - auto CodeLensResolveRequest::method(std::string method) -> CodeLensResolveRequest& { (*repr_)["method"] = std::move(method); return *this; } -auto CodeLensResolveRequest::id() const -> std::variant { - const auto& id = repr_->at("id"); - if (id.is_string()) return id.get(); - return id.get(); -} - -auto CodeLensResolveRequest::id(long id) -> CodeLensResolveRequest& { - (*repr_)["id"] = id; - return *this; -} - -auto CodeLensResolveRequest::id(std::string id) -> CodeLensResolveRequest& { - (*repr_)["id"] = std::move(id); - return *this; +auto CodeLensResolveRequest::id(std::variant id) + -> CodeLensResolveRequest& { + if (std::holds_alternative(id)) { + (*repr_)["id"] = std::get(id); + } else { + (*repr_)["id"] = std::get(id); + } + return *this; } auto CodeLensResolveRequest::params() const -> CodeLens { @@ -3753,12 +2786,6 @@ auto CodeLensResolveRequest::params(CodeLens params) return *this; } -auto CodeLensResolveResponse::id() const -> std::variant { - const auto& id = repr_->at("id"); - if (id.is_string()) return id.get(); - return id.get(); -} - auto CodeLensResolveResponse::id(long id) -> CodeLensResolveResponse& { (*repr_)["id"] = id; return *this; @@ -3780,38 +2807,22 @@ auto CodeLensResolveResponse::result(CodeLens result) return *this; } -auto CodeLensRefreshRequest::method() const -> std::string { - return repr_->at("method"); -} - auto CodeLensRefreshRequest::method(std::string method) -> CodeLensRefreshRequest& { (*repr_)["method"] = std::move(method); return *this; } -auto CodeLensRefreshRequest::id() const -> std::variant { - const auto& id = repr_->at("id"); - if (id.is_string()) return id.get(); - return id.get(); -} - -auto CodeLensRefreshRequest::id(long id) -> CodeLensRefreshRequest& { - (*repr_)["id"] = id; - return *this; -} - -auto CodeLensRefreshRequest::id(std::string id) -> CodeLensRefreshRequest& { - (*repr_)["id"] = std::move(id); +auto CodeLensRefreshRequest::id(std::variant id) + -> CodeLensRefreshRequest& { + if (std::holds_alternative(id)) { + (*repr_)["id"] = std::get(id); + } else { + (*repr_)["id"] = std::get(id); + } return *this; } -auto CodeLensRefreshResponse::id() const -> std::variant { - const auto& id = repr_->at("id"); - if (id.is_string()) return id.get(); - return id.get(); -} - auto CodeLensRefreshResponse::id(long id) -> CodeLensRefreshResponse& { (*repr_)["id"] = id; return *this; @@ -3832,28 +2843,18 @@ auto CodeLensRefreshResponse::result(std::nullptr_t result) return *this; } -auto DocumentLinkRequest::method() const -> std::string { - return repr_->at("method"); -} - auto DocumentLinkRequest::method(std::string method) -> DocumentLinkRequest& { (*repr_)["method"] = std::move(method); return *this; } -auto DocumentLinkRequest::id() const -> std::variant { - const auto& id = repr_->at("id"); - if (id.is_string()) return id.get(); - return id.get(); -} - -auto DocumentLinkRequest::id(long id) -> DocumentLinkRequest& { - (*repr_)["id"] = id; - return *this; -} - -auto DocumentLinkRequest::id(std::string id) -> DocumentLinkRequest& { - (*repr_)["id"] = std::move(id); +auto DocumentLinkRequest::id(std::variant id) + -> DocumentLinkRequest& { + if (std::holds_alternative(id)) { + (*repr_)["id"] = std::get(id); + } else { + (*repr_)["id"] = std::get(id); + } return *this; } @@ -3868,12 +2869,6 @@ auto DocumentLinkRequest::params(DocumentLinkParams params) return *this; } -auto DocumentLinkResponse::id() const -> std::variant { - const auto& id = repr_->at("id"); - if (id.is_string()) return id.get(); - return id.get(); -} - auto DocumentLinkResponse::id(long id) -> DocumentLinkResponse& { (*repr_)["id"] = id; return *this; @@ -3896,30 +2891,19 @@ auto DocumentLinkResponse::result( return *this; } -auto DocumentLinkResolveRequest::method() const -> std::string { - return repr_->at("method"); -} - auto DocumentLinkResolveRequest::method(std::string method) -> DocumentLinkResolveRequest& { (*repr_)["method"] = std::move(method); return *this; } -auto DocumentLinkResolveRequest::id() const -> std::variant { - const auto& id = repr_->at("id"); - if (id.is_string()) return id.get(); - return id.get(); -} - -auto DocumentLinkResolveRequest::id(long id) -> DocumentLinkResolveRequest& { - (*repr_)["id"] = id; - return *this; -} - -auto DocumentLinkResolveRequest::id(std::string id) +auto DocumentLinkResolveRequest::id(std::variant id) -> DocumentLinkResolveRequest& { - (*repr_)["id"] = std::move(id); + if (std::holds_alternative(id)) { + (*repr_)["id"] = std::get(id); + } else { + (*repr_)["id"] = std::get(id); + } return *this; } @@ -3934,13 +2918,6 @@ auto DocumentLinkResolveRequest::params(DocumentLink params) return *this; } -auto DocumentLinkResolveResponse::id() const - -> std::variant { - const auto& id = repr_->at("id"); - if (id.is_string()) return id.get(); - return id.get(); -} - auto DocumentLinkResolveResponse::id(long id) -> DocumentLinkResolveResponse& { (*repr_)["id"] = id; return *this; @@ -3964,30 +2941,19 @@ auto DocumentLinkResolveResponse::result(DocumentLink result) return *this; } -auto DocumentFormattingRequest::method() const -> std::string { - return repr_->at("method"); -} - auto DocumentFormattingRequest::method(std::string method) -> DocumentFormattingRequest& { (*repr_)["method"] = std::move(method); return *this; } -auto DocumentFormattingRequest::id() const -> std::variant { - const auto& id = repr_->at("id"); - if (id.is_string()) return id.get(); - return id.get(); -} - -auto DocumentFormattingRequest::id(long id) -> DocumentFormattingRequest& { - (*repr_)["id"] = id; - return *this; -} - -auto DocumentFormattingRequest::id(std::string id) +auto DocumentFormattingRequest::id(std::variant id) -> DocumentFormattingRequest& { - (*repr_)["id"] = std::move(id); + if (std::holds_alternative(id)) { + (*repr_)["id"] = std::get(id); + } else { + (*repr_)["id"] = std::get(id); + } return *this; } @@ -4002,12 +2968,6 @@ auto DocumentFormattingRequest::params(DocumentFormattingParams params) return *this; } -auto DocumentFormattingResponse::id() const -> std::variant { - const auto& id = repr_->at("id"); - if (id.is_string()) return id.get(); - return id.get(); -} - auto DocumentFormattingResponse::id(long id) -> DocumentFormattingResponse& { (*repr_)["id"] = id; return *this; @@ -4033,32 +2993,19 @@ auto DocumentFormattingResponse::result( return *this; } -auto DocumentRangeFormattingRequest::method() const -> std::string { - return repr_->at("method"); -} - auto DocumentRangeFormattingRequest::method(std::string method) -> DocumentRangeFormattingRequest& { (*repr_)["method"] = std::move(method); return *this; } -auto DocumentRangeFormattingRequest::id() const - -> std::variant { - const auto& id = repr_->at("id"); - if (id.is_string()) return id.get(); - return id.get(); -} - -auto DocumentRangeFormattingRequest::id(long id) - -> DocumentRangeFormattingRequest& { - (*repr_)["id"] = id; - return *this; -} - -auto DocumentRangeFormattingRequest::id(std::string id) +auto DocumentRangeFormattingRequest::id(std::variant id) -> DocumentRangeFormattingRequest& { - (*repr_)["id"] = std::move(id); + if (std::holds_alternative(id)) { + (*repr_)["id"] = std::get(id); + } else { + (*repr_)["id"] = std::get(id); + } return *this; } @@ -4074,13 +3021,6 @@ auto DocumentRangeFormattingRequest::params( return *this; } -auto DocumentRangeFormattingResponse::id() const - -> std::variant { - const auto& id = repr_->at("id"); - if (id.is_string()) return id.get(); - return id.get(); -} - auto DocumentRangeFormattingResponse::id(long id) -> DocumentRangeFormattingResponse& { (*repr_)["id"] = id; @@ -4107,32 +3047,19 @@ auto DocumentRangeFormattingResponse::result( return *this; } -auto DocumentRangesFormattingRequest::method() const -> std::string { - return repr_->at("method"); -} - auto DocumentRangesFormattingRequest::method(std::string method) -> DocumentRangesFormattingRequest& { (*repr_)["method"] = std::move(method); return *this; } -auto DocumentRangesFormattingRequest::id() const - -> std::variant { - const auto& id = repr_->at("id"); - if (id.is_string()) return id.get(); - return id.get(); -} - -auto DocumentRangesFormattingRequest::id(long id) - -> DocumentRangesFormattingRequest& { - (*repr_)["id"] = id; - return *this; -} - -auto DocumentRangesFormattingRequest::id(std::string id) +auto DocumentRangesFormattingRequest::id(std::variant id) -> DocumentRangesFormattingRequest& { - (*repr_)["id"] = std::move(id); + if (std::holds_alternative(id)) { + (*repr_)["id"] = std::get(id); + } else { + (*repr_)["id"] = std::get(id); + } return *this; } @@ -4148,13 +3075,6 @@ auto DocumentRangesFormattingRequest::params( return *this; } -auto DocumentRangesFormattingResponse::id() const - -> std::variant { - const auto& id = repr_->at("id"); - if (id.is_string()) return id.get(); - return id.get(); -} - auto DocumentRangesFormattingResponse::id(long id) -> DocumentRangesFormattingResponse& { (*repr_)["id"] = id; @@ -4181,32 +3101,19 @@ auto DocumentRangesFormattingResponse::result( return *this; } -auto DocumentOnTypeFormattingRequest::method() const -> std::string { - return repr_->at("method"); -} - auto DocumentOnTypeFormattingRequest::method(std::string method) -> DocumentOnTypeFormattingRequest& { (*repr_)["method"] = std::move(method); return *this; } -auto DocumentOnTypeFormattingRequest::id() const - -> std::variant { - const auto& id = repr_->at("id"); - if (id.is_string()) return id.get(); - return id.get(); -} - -auto DocumentOnTypeFormattingRequest::id(long id) - -> DocumentOnTypeFormattingRequest& { - (*repr_)["id"] = id; - return *this; -} - -auto DocumentOnTypeFormattingRequest::id(std::string id) +auto DocumentOnTypeFormattingRequest::id(std::variant id) -> DocumentOnTypeFormattingRequest& { - (*repr_)["id"] = std::move(id); + if (std::holds_alternative(id)) { + (*repr_)["id"] = std::get(id); + } else { + (*repr_)["id"] = std::get(id); + } return *this; } @@ -4222,13 +3129,6 @@ auto DocumentOnTypeFormattingRequest::params( return *this; } -auto DocumentOnTypeFormattingResponse::id() const - -> std::variant { - const auto& id = repr_->at("id"); - if (id.is_string()) return id.get(); - return id.get(); -} - auto DocumentOnTypeFormattingResponse::id(long id) -> DocumentOnTypeFormattingResponse& { (*repr_)["id"] = id; @@ -4255,28 +3155,17 @@ auto DocumentOnTypeFormattingResponse::result( return *this; } -auto RenameRequest::method() const -> std::string { - return repr_->at("method"); -} - auto RenameRequest::method(std::string method) -> RenameRequest& { (*repr_)["method"] = std::move(method); return *this; } -auto RenameRequest::id() const -> std::variant { - const auto& id = repr_->at("id"); - if (id.is_string()) return id.get(); - return id.get(); -} - -auto RenameRequest::id(long id) -> RenameRequest& { - (*repr_)["id"] = id; - return *this; -} - -auto RenameRequest::id(std::string id) -> RenameRequest& { - (*repr_)["id"] = std::move(id); +auto RenameRequest::id(std::variant id) -> RenameRequest& { + if (std::holds_alternative(id)) { + (*repr_)["id"] = std::get(id); + } else { + (*repr_)["id"] = std::get(id); + } return *this; } @@ -4290,12 +3179,6 @@ auto RenameRequest::params(RenameParams params) -> RenameRequest& { return *this; } -auto RenameResponse::id() const -> std::variant { - const auto& id = repr_->at("id"); - if (id.is_string()) return id.get(); - return id.get(); -} - auto RenameResponse::id(long id) -> RenameResponse& { (*repr_)["id"] = id; return *this; @@ -4317,28 +3200,18 @@ auto RenameResponse::result(std::variant result) return *this; } -auto PrepareRenameRequest::method() const -> std::string { - return repr_->at("method"); -} - auto PrepareRenameRequest::method(std::string method) -> PrepareRenameRequest& { (*repr_)["method"] = std::move(method); return *this; } -auto PrepareRenameRequest::id() const -> std::variant { - const auto& id = repr_->at("id"); - if (id.is_string()) return id.get(); - return id.get(); -} - -auto PrepareRenameRequest::id(long id) -> PrepareRenameRequest& { - (*repr_)["id"] = id; - return *this; -} - -auto PrepareRenameRequest::id(std::string id) -> PrepareRenameRequest& { - (*repr_)["id"] = std::move(id); +auto PrepareRenameRequest::id(std::variant id) + -> PrepareRenameRequest& { + if (std::holds_alternative(id)) { + (*repr_)["id"] = std::get(id); + } else { + (*repr_)["id"] = std::get(id); + } return *this; } @@ -4353,12 +3226,6 @@ auto PrepareRenameRequest::params(PrepareRenameParams params) return *this; } -auto PrepareRenameResponse::id() const -> std::variant { - const auto& id = repr_->at("id"); - if (id.is_string()) return id.get(); - return id.get(); -} - auto PrepareRenameResponse::id(long id) -> PrepareRenameResponse& { (*repr_)["id"] = id; return *this; @@ -4381,29 +3248,19 @@ auto PrepareRenameResponse::result( return *this; } -auto ExecuteCommandRequest::method() const -> std::string { - return repr_->at("method"); -} - auto ExecuteCommandRequest::method(std::string method) -> ExecuteCommandRequest& { (*repr_)["method"] = std::move(method); return *this; } -auto ExecuteCommandRequest::id() const -> std::variant { - const auto& id = repr_->at("id"); - if (id.is_string()) return id.get(); - return id.get(); -} - -auto ExecuteCommandRequest::id(long id) -> ExecuteCommandRequest& { - (*repr_)["id"] = id; - return *this; -} - -auto ExecuteCommandRequest::id(std::string id) -> ExecuteCommandRequest& { - (*repr_)["id"] = std::move(id); +auto ExecuteCommandRequest::id(std::variant id) + -> ExecuteCommandRequest& { + if (std::holds_alternative(id)) { + (*repr_)["id"] = std::get(id); + } else { + (*repr_)["id"] = std::get(id); + } return *this; } @@ -4418,12 +3275,6 @@ auto ExecuteCommandRequest::params(ExecuteCommandParams params) return *this; } -auto ExecuteCommandResponse::id() const -> std::variant { - const auto& id = repr_->at("id"); - if (id.is_string()) return id.get(); - return id.get(); -} - auto ExecuteCommandResponse::id(long id) -> ExecuteCommandResponse& { (*repr_)["id"] = id; return *this; @@ -4445,30 +3296,19 @@ auto ExecuteCommandResponse::result(std::variant result) return *this; } -auto ApplyWorkspaceEditRequest::method() const -> std::string { - return repr_->at("method"); -} - auto ApplyWorkspaceEditRequest::method(std::string method) -> ApplyWorkspaceEditRequest& { (*repr_)["method"] = std::move(method); return *this; } -auto ApplyWorkspaceEditRequest::id() const -> std::variant { - const auto& id = repr_->at("id"); - if (id.is_string()) return id.get(); - return id.get(); -} - -auto ApplyWorkspaceEditRequest::id(long id) -> ApplyWorkspaceEditRequest& { - (*repr_)["id"] = id; - return *this; -} - -auto ApplyWorkspaceEditRequest::id(std::string id) +auto ApplyWorkspaceEditRequest::id(std::variant id) -> ApplyWorkspaceEditRequest& { - (*repr_)["id"] = std::move(id); + if (std::holds_alternative(id)) { + (*repr_)["id"] = std::get(id); + } else { + (*repr_)["id"] = std::get(id); + } return *this; } @@ -4483,12 +3323,6 @@ auto ApplyWorkspaceEditRequest::params(ApplyWorkspaceEditParams params) return *this; } -auto ApplyWorkspaceEditResponse::id() const -> std::variant { - const auto& id = repr_->at("id"); - if (id.is_string()) return id.get(); - return id.get(); -} - auto ApplyWorkspaceEditResponse::id(long id) -> ApplyWorkspaceEditResponse& { (*repr_)["id"] = id; return *this; @@ -4512,32 +3346,20 @@ auto ApplyWorkspaceEditResponse::result(ApplyWorkspaceEditResult result) return *this; } -auto DidChangeWorkspaceFoldersNotification::method() const -> std::string { - return repr_->at("method"); -} - auto DidChangeWorkspaceFoldersNotification::method(std::string method) -> DidChangeWorkspaceFoldersNotification& { (*repr_)["method"] = std::move(method); return *this; } -auto DidChangeWorkspaceFoldersNotification::id() const - -> std::variant { - const auto& id = repr_->at("id"); - if (id.is_string()) return id.get(); - return id.get(); -} - -auto DidChangeWorkspaceFoldersNotification::id(long id) - -> DidChangeWorkspaceFoldersNotification& { - (*repr_)["id"] = id; - return *this; -} - -auto DidChangeWorkspaceFoldersNotification::id(std::string id) +auto DidChangeWorkspaceFoldersNotification::id( + std::variant id) -> DidChangeWorkspaceFoldersNotification& { - (*repr_)["id"] = std::move(id); + if (std::holds_alternative(id)) { + (*repr_)["id"] = std::get(id); + } else { + (*repr_)["id"] = std::get(id); + } return *this; } @@ -4554,32 +3376,19 @@ auto DidChangeWorkspaceFoldersNotification::params( return *this; } -auto WorkDoneProgressCancelNotification::method() const -> std::string { - return repr_->at("method"); -} - auto WorkDoneProgressCancelNotification::method(std::string method) -> WorkDoneProgressCancelNotification& { (*repr_)["method"] = std::move(method); return *this; } -auto WorkDoneProgressCancelNotification::id() const - -> std::variant { - const auto& id = repr_->at("id"); - if (id.is_string()) return id.get(); - return id.get(); -} - -auto WorkDoneProgressCancelNotification::id(long id) - -> WorkDoneProgressCancelNotification& { - (*repr_)["id"] = id; - return *this; -} - -auto WorkDoneProgressCancelNotification::id(std::string id) +auto WorkDoneProgressCancelNotification::id(std::variant id) -> WorkDoneProgressCancelNotification& { - (*repr_)["id"] = std::move(id); + if (std::holds_alternative(id)) { + (*repr_)["id"] = std::get(id); + } else { + (*repr_)["id"] = std::get(id); + } return *this; } @@ -4596,30 +3405,19 @@ auto WorkDoneProgressCancelNotification::params( return *this; } -auto DidCreateFilesNotification::method() const -> std::string { - return repr_->at("method"); -} - auto DidCreateFilesNotification::method(std::string method) -> DidCreateFilesNotification& { (*repr_)["method"] = std::move(method); return *this; } -auto DidCreateFilesNotification::id() const -> std::variant { - const auto& id = repr_->at("id"); - if (id.is_string()) return id.get(); - return id.get(); -} - -auto DidCreateFilesNotification::id(long id) -> DidCreateFilesNotification& { - (*repr_)["id"] = id; - return *this; -} - -auto DidCreateFilesNotification::id(std::string id) +auto DidCreateFilesNotification::id(std::variant id) -> DidCreateFilesNotification& { - (*repr_)["id"] = std::move(id); + if (std::holds_alternative(id)) { + (*repr_)["id"] = std::get(id); + } else { + (*repr_)["id"] = std::get(id); + } return *this; } @@ -4634,30 +3432,19 @@ auto DidCreateFilesNotification::params(CreateFilesParams params) return *this; } -auto DidRenameFilesNotification::method() const -> std::string { - return repr_->at("method"); -} - auto DidRenameFilesNotification::method(std::string method) -> DidRenameFilesNotification& { (*repr_)["method"] = std::move(method); return *this; } -auto DidRenameFilesNotification::id() const -> std::variant { - const auto& id = repr_->at("id"); - if (id.is_string()) return id.get(); - return id.get(); -} - -auto DidRenameFilesNotification::id(long id) -> DidRenameFilesNotification& { - (*repr_)["id"] = id; - return *this; -} - -auto DidRenameFilesNotification::id(std::string id) - -> DidRenameFilesNotification& { - (*repr_)["id"] = std::move(id); +auto DidRenameFilesNotification::id(std::variant id) + -> DidRenameFilesNotification& { + if (std::holds_alternative(id)) { + (*repr_)["id"] = std::get(id); + } else { + (*repr_)["id"] = std::get(id); + } return *this; } @@ -4672,30 +3459,19 @@ auto DidRenameFilesNotification::params(RenameFilesParams params) return *this; } -auto DidDeleteFilesNotification::method() const -> std::string { - return repr_->at("method"); -} - auto DidDeleteFilesNotification::method(std::string method) -> DidDeleteFilesNotification& { (*repr_)["method"] = std::move(method); return *this; } -auto DidDeleteFilesNotification::id() const -> std::variant { - const auto& id = repr_->at("id"); - if (id.is_string()) return id.get(); - return id.get(); -} - -auto DidDeleteFilesNotification::id(long id) -> DidDeleteFilesNotification& { - (*repr_)["id"] = id; - return *this; -} - -auto DidDeleteFilesNotification::id(std::string id) +auto DidDeleteFilesNotification::id(std::variant id) -> DidDeleteFilesNotification& { - (*repr_)["id"] = std::move(id); + if (std::holds_alternative(id)) { + (*repr_)["id"] = std::get(id); + } else { + (*repr_)["id"] = std::get(id); + } return *this; } @@ -4710,32 +3486,19 @@ auto DidDeleteFilesNotification::params(DeleteFilesParams params) return *this; } -auto DidOpenNotebookDocumentNotification::method() const -> std::string { - return repr_->at("method"); -} - auto DidOpenNotebookDocumentNotification::method(std::string method) -> DidOpenNotebookDocumentNotification& { (*repr_)["method"] = std::move(method); return *this; } -auto DidOpenNotebookDocumentNotification::id() const - -> std::variant { - const auto& id = repr_->at("id"); - if (id.is_string()) return id.get(); - return id.get(); -} - -auto DidOpenNotebookDocumentNotification::id(long id) - -> DidOpenNotebookDocumentNotification& { - (*repr_)["id"] = id; - return *this; -} - -auto DidOpenNotebookDocumentNotification::id(std::string id) +auto DidOpenNotebookDocumentNotification::id(std::variant id) -> DidOpenNotebookDocumentNotification& { - (*repr_)["id"] = std::move(id); + if (std::holds_alternative(id)) { + (*repr_)["id"] = std::get(id); + } else { + (*repr_)["id"] = std::get(id); + } return *this; } @@ -4752,32 +3515,20 @@ auto DidOpenNotebookDocumentNotification::params( return *this; } -auto DidChangeNotebookDocumentNotification::method() const -> std::string { - return repr_->at("method"); -} - auto DidChangeNotebookDocumentNotification::method(std::string method) -> DidChangeNotebookDocumentNotification& { (*repr_)["method"] = std::move(method); return *this; } -auto DidChangeNotebookDocumentNotification::id() const - -> std::variant { - const auto& id = repr_->at("id"); - if (id.is_string()) return id.get(); - return id.get(); -} - -auto DidChangeNotebookDocumentNotification::id(long id) - -> DidChangeNotebookDocumentNotification& { - (*repr_)["id"] = id; - return *this; -} - -auto DidChangeNotebookDocumentNotification::id(std::string id) +auto DidChangeNotebookDocumentNotification::id( + std::variant id) -> DidChangeNotebookDocumentNotification& { - (*repr_)["id"] = std::move(id); + if (std::holds_alternative(id)) { + (*repr_)["id"] = std::get(id); + } else { + (*repr_)["id"] = std::get(id); + } return *this; } @@ -4794,32 +3545,19 @@ auto DidChangeNotebookDocumentNotification::params( return *this; } -auto DidSaveNotebookDocumentNotification::method() const -> std::string { - return repr_->at("method"); -} - auto DidSaveNotebookDocumentNotification::method(std::string method) -> DidSaveNotebookDocumentNotification& { (*repr_)["method"] = std::move(method); return *this; } -auto DidSaveNotebookDocumentNotification::id() const - -> std::variant { - const auto& id = repr_->at("id"); - if (id.is_string()) return id.get(); - return id.get(); -} - -auto DidSaveNotebookDocumentNotification::id(long id) - -> DidSaveNotebookDocumentNotification& { - (*repr_)["id"] = id; - return *this; -} - -auto DidSaveNotebookDocumentNotification::id(std::string id) +auto DidSaveNotebookDocumentNotification::id(std::variant id) -> DidSaveNotebookDocumentNotification& { - (*repr_)["id"] = std::move(id); + if (std::holds_alternative(id)) { + (*repr_)["id"] = std::get(id); + } else { + (*repr_)["id"] = std::get(id); + } return *this; } @@ -4836,32 +3574,20 @@ auto DidSaveNotebookDocumentNotification::params( return *this; } -auto DidCloseNotebookDocumentNotification::method() const -> std::string { - return repr_->at("method"); -} - auto DidCloseNotebookDocumentNotification::method(std::string method) -> DidCloseNotebookDocumentNotification& { (*repr_)["method"] = std::move(method); return *this; } -auto DidCloseNotebookDocumentNotification::id() const - -> std::variant { - const auto& id = repr_->at("id"); - if (id.is_string()) return id.get(); - return id.get(); -} - -auto DidCloseNotebookDocumentNotification::id(long id) - -> DidCloseNotebookDocumentNotification& { - (*repr_)["id"] = id; - return *this; -} - -auto DidCloseNotebookDocumentNotification::id(std::string id) +auto DidCloseNotebookDocumentNotification::id( + std::variant id) -> DidCloseNotebookDocumentNotification& { - (*repr_)["id"] = std::move(id); + if (std::holds_alternative(id)) { + (*repr_)["id"] = std::get(id); + } else { + (*repr_)["id"] = std::get(id); + } return *this; } @@ -4878,29 +3604,19 @@ auto DidCloseNotebookDocumentNotification::params( return *this; } -auto InitializedNotification::method() const -> std::string { - return repr_->at("method"); -} - auto InitializedNotification::method(std::string method) -> InitializedNotification& { (*repr_)["method"] = std::move(method); return *this; } -auto InitializedNotification::id() const -> std::variant { - const auto& id = repr_->at("id"); - if (id.is_string()) return id.get(); - return id.get(); -} - -auto InitializedNotification::id(long id) -> InitializedNotification& { - (*repr_)["id"] = id; - return *this; -} - -auto InitializedNotification::id(std::string id) -> InitializedNotification& { - (*repr_)["id"] = std::move(id); +auto InitializedNotification::id(std::variant id) + -> InitializedNotification& { + if (std::holds_alternative(id)) { + (*repr_)["id"] = std::get(id); + } else { + (*repr_)["id"] = std::get(id); + } return *this; } @@ -4915,57 +3631,34 @@ auto InitializedNotification::params(InitializedParams params) return *this; } -auto ExitNotification::method() const -> std::string { - return repr_->at("method"); -} - auto ExitNotification::method(std::string method) -> ExitNotification& { (*repr_)["method"] = std::move(method); return *this; } -auto ExitNotification::id() const -> std::variant { - const auto& id = repr_->at("id"); - if (id.is_string()) return id.get(); - return id.get(); -} - -auto ExitNotification::id(long id) -> ExitNotification& { - (*repr_)["id"] = id; - return *this; -} - -auto ExitNotification::id(std::string id) -> ExitNotification& { - (*repr_)["id"] = std::move(id); +auto ExitNotification::id(std::variant id) + -> ExitNotification& { + if (std::holds_alternative(id)) { + (*repr_)["id"] = std::get(id); + } else { + (*repr_)["id"] = std::get(id); + } return *this; } -auto DidChangeConfigurationNotification::method() const -> std::string { - return repr_->at("method"); -} - auto DidChangeConfigurationNotification::method(std::string method) -> DidChangeConfigurationNotification& { (*repr_)["method"] = std::move(method); return *this; } -auto DidChangeConfigurationNotification::id() const - -> std::variant { - const auto& id = repr_->at("id"); - if (id.is_string()) return id.get(); - return id.get(); -} - -auto DidChangeConfigurationNotification::id(long id) - -> DidChangeConfigurationNotification& { - (*repr_)["id"] = id; - return *this; -} - -auto DidChangeConfigurationNotification::id(std::string id) +auto DidChangeConfigurationNotification::id(std::variant id) -> DidChangeConfigurationNotification& { - (*repr_)["id"] = std::move(id); + if (std::holds_alternative(id)) { + (*repr_)["id"] = std::get(id); + } else { + (*repr_)["id"] = std::get(id); + } return *this; } @@ -4982,29 +3675,19 @@ auto DidChangeConfigurationNotification::params( return *this; } -auto ShowMessageNotification::method() const -> std::string { - return repr_->at("method"); -} - auto ShowMessageNotification::method(std::string method) -> ShowMessageNotification& { (*repr_)["method"] = std::move(method); return *this; } -auto ShowMessageNotification::id() const -> std::variant { - const auto& id = repr_->at("id"); - if (id.is_string()) return id.get(); - return id.get(); -} - -auto ShowMessageNotification::id(long id) -> ShowMessageNotification& { - (*repr_)["id"] = id; - return *this; -} - -auto ShowMessageNotification::id(std::string id) -> ShowMessageNotification& { - (*repr_)["id"] = std::move(id); +auto ShowMessageNotification::id(std::variant id) + -> ShowMessageNotification& { + if (std::holds_alternative(id)) { + (*repr_)["id"] = std::get(id); + } else { + (*repr_)["id"] = std::get(id); + } return *this; } @@ -5019,29 +3702,19 @@ auto ShowMessageNotification::params(ShowMessageParams params) return *this; } -auto LogMessageNotification::method() const -> std::string { - return repr_->at("method"); -} - auto LogMessageNotification::method(std::string method) -> LogMessageNotification& { (*repr_)["method"] = std::move(method); return *this; } -auto LogMessageNotification::id() const -> std::variant { - const auto& id = repr_->at("id"); - if (id.is_string()) return id.get(); - return id.get(); -} - -auto LogMessageNotification::id(long id) -> LogMessageNotification& { - (*repr_)["id"] = id; - return *this; -} - -auto LogMessageNotification::id(std::string id) -> LogMessageNotification& { - (*repr_)["id"] = std::move(id); +auto LogMessageNotification::id(std::variant id) + -> LogMessageNotification& { + if (std::holds_alternative(id)) { + (*repr_)["id"] = std::get(id); + } else { + (*repr_)["id"] = std::get(id); + } return *this; } @@ -5056,30 +3729,19 @@ auto LogMessageNotification::params(LogMessageParams params) return *this; } -auto TelemetryEventNotification::method() const -> std::string { - return repr_->at("method"); -} - auto TelemetryEventNotification::method(std::string method) -> TelemetryEventNotification& { (*repr_)["method"] = std::move(method); return *this; } -auto TelemetryEventNotification::id() const -> std::variant { - const auto& id = repr_->at("id"); - if (id.is_string()) return id.get(); - return id.get(); -} - -auto TelemetryEventNotification::id(long id) -> TelemetryEventNotification& { - (*repr_)["id"] = id; - return *this; -} - -auto TelemetryEventNotification::id(std::string id) +auto TelemetryEventNotification::id(std::variant id) -> TelemetryEventNotification& { - (*repr_)["id"] = std::move(id); + if (std::holds_alternative(id)) { + (*repr_)["id"] = std::get(id); + } else { + (*repr_)["id"] = std::get(id); + } return *this; } @@ -5094,32 +3756,19 @@ auto TelemetryEventNotification::params(LSPAny params) return *this; } -auto DidOpenTextDocumentNotification::method() const -> std::string { - return repr_->at("method"); -} - auto DidOpenTextDocumentNotification::method(std::string method) -> DidOpenTextDocumentNotification& { (*repr_)["method"] = std::move(method); return *this; } -auto DidOpenTextDocumentNotification::id() const - -> std::variant { - const auto& id = repr_->at("id"); - if (id.is_string()) return id.get(); - return id.get(); -} - -auto DidOpenTextDocumentNotification::id(long id) - -> DidOpenTextDocumentNotification& { - (*repr_)["id"] = id; - return *this; -} - -auto DidOpenTextDocumentNotification::id(std::string id) +auto DidOpenTextDocumentNotification::id(std::variant id) -> DidOpenTextDocumentNotification& { - (*repr_)["id"] = std::move(id); + if (std::holds_alternative(id)) { + (*repr_)["id"] = std::get(id); + } else { + (*repr_)["id"] = std::get(id); + } return *this; } @@ -5135,32 +3784,19 @@ auto DidOpenTextDocumentNotification::params(DidOpenTextDocumentParams params) return *this; } -auto DidChangeTextDocumentNotification::method() const -> std::string { - return repr_->at("method"); -} - auto DidChangeTextDocumentNotification::method(std::string method) -> DidChangeTextDocumentNotification& { (*repr_)["method"] = std::move(method); return *this; } -auto DidChangeTextDocumentNotification::id() const - -> std::variant { - const auto& id = repr_->at("id"); - if (id.is_string()) return id.get(); - return id.get(); -} - -auto DidChangeTextDocumentNotification::id(long id) - -> DidChangeTextDocumentNotification& { - (*repr_)["id"] = id; - return *this; -} - -auto DidChangeTextDocumentNotification::id(std::string id) +auto DidChangeTextDocumentNotification::id(std::variant id) -> DidChangeTextDocumentNotification& { - (*repr_)["id"] = std::move(id); + if (std::holds_alternative(id)) { + (*repr_)["id"] = std::get(id); + } else { + (*repr_)["id"] = std::get(id); + } return *this; } @@ -5176,32 +3812,19 @@ auto DidChangeTextDocumentNotification::params( return *this; } -auto DidCloseTextDocumentNotification::method() const -> std::string { - return repr_->at("method"); -} - auto DidCloseTextDocumentNotification::method(std::string method) -> DidCloseTextDocumentNotification& { (*repr_)["method"] = std::move(method); return *this; } -auto DidCloseTextDocumentNotification::id() const - -> std::variant { - const auto& id = repr_->at("id"); - if (id.is_string()) return id.get(); - return id.get(); -} - -auto DidCloseTextDocumentNotification::id(long id) +auto DidCloseTextDocumentNotification::id(std::variant id) -> DidCloseTextDocumentNotification& { - (*repr_)["id"] = id; - return *this; -} - -auto DidCloseTextDocumentNotification::id(std::string id) - -> DidCloseTextDocumentNotification& { - (*repr_)["id"] = std::move(id); + if (std::holds_alternative(id)) { + (*repr_)["id"] = std::get(id); + } else { + (*repr_)["id"] = std::get(id); + } return *this; } @@ -5217,32 +3840,19 @@ auto DidCloseTextDocumentNotification::params(DidCloseTextDocumentParams params) return *this; } -auto DidSaveTextDocumentNotification::method() const -> std::string { - return repr_->at("method"); -} - auto DidSaveTextDocumentNotification::method(std::string method) -> DidSaveTextDocumentNotification& { (*repr_)["method"] = std::move(method); return *this; } -auto DidSaveTextDocumentNotification::id() const - -> std::variant { - const auto& id = repr_->at("id"); - if (id.is_string()) return id.get(); - return id.get(); -} - -auto DidSaveTextDocumentNotification::id(long id) - -> DidSaveTextDocumentNotification& { - (*repr_)["id"] = id; - return *this; -} - -auto DidSaveTextDocumentNotification::id(std::string id) +auto DidSaveTextDocumentNotification::id(std::variant id) -> DidSaveTextDocumentNotification& { - (*repr_)["id"] = std::move(id); + if (std::holds_alternative(id)) { + (*repr_)["id"] = std::get(id); + } else { + (*repr_)["id"] = std::get(id); + } return *this; } @@ -5258,32 +3868,19 @@ auto DidSaveTextDocumentNotification::params(DidSaveTextDocumentParams params) return *this; } -auto WillSaveTextDocumentNotification::method() const -> std::string { - return repr_->at("method"); -} - auto WillSaveTextDocumentNotification::method(std::string method) -> WillSaveTextDocumentNotification& { (*repr_)["method"] = std::move(method); return *this; } -auto WillSaveTextDocumentNotification::id() const - -> std::variant { - const auto& id = repr_->at("id"); - if (id.is_string()) return id.get(); - return id.get(); -} - -auto WillSaveTextDocumentNotification::id(long id) +auto WillSaveTextDocumentNotification::id(std::variant id) -> WillSaveTextDocumentNotification& { - (*repr_)["id"] = id; - return *this; -} - -auto WillSaveTextDocumentNotification::id(std::string id) - -> WillSaveTextDocumentNotification& { - (*repr_)["id"] = std::move(id); + if (std::holds_alternative(id)) { + (*repr_)["id"] = std::get(id); + } else { + (*repr_)["id"] = std::get(id); + } return *this; } @@ -5299,32 +3896,19 @@ auto WillSaveTextDocumentNotification::params(WillSaveTextDocumentParams params) return *this; } -auto DidChangeWatchedFilesNotification::method() const -> std::string { - return repr_->at("method"); -} - auto DidChangeWatchedFilesNotification::method(std::string method) -> DidChangeWatchedFilesNotification& { (*repr_)["method"] = std::move(method); return *this; } -auto DidChangeWatchedFilesNotification::id() const - -> std::variant { - const auto& id = repr_->at("id"); - if (id.is_string()) return id.get(); - return id.get(); -} - -auto DidChangeWatchedFilesNotification::id(long id) - -> DidChangeWatchedFilesNotification& { - (*repr_)["id"] = id; - return *this; -} - -auto DidChangeWatchedFilesNotification::id(std::string id) +auto DidChangeWatchedFilesNotification::id(std::variant id) -> DidChangeWatchedFilesNotification& { - (*repr_)["id"] = std::move(id); + if (std::holds_alternative(id)) { + (*repr_)["id"] = std::get(id); + } else { + (*repr_)["id"] = std::get(id); + } return *this; } @@ -5340,32 +3924,19 @@ auto DidChangeWatchedFilesNotification::params( return *this; } -auto PublishDiagnosticsNotification::method() const -> std::string { - return repr_->at("method"); -} - auto PublishDiagnosticsNotification::method(std::string method) -> PublishDiagnosticsNotification& { (*repr_)["method"] = std::move(method); return *this; } -auto PublishDiagnosticsNotification::id() const - -> std::variant { - const auto& id = repr_->at("id"); - if (id.is_string()) return id.get(); - return id.get(); -} - -auto PublishDiagnosticsNotification::id(long id) - -> PublishDiagnosticsNotification& { - (*repr_)["id"] = id; - return *this; -} - -auto PublishDiagnosticsNotification::id(std::string id) +auto PublishDiagnosticsNotification::id(std::variant id) -> PublishDiagnosticsNotification& { - (*repr_)["id"] = std::move(id); + if (std::holds_alternative(id)) { + (*repr_)["id"] = std::get(id); + } else { + (*repr_)["id"] = std::get(id); + } return *this; } @@ -5381,28 +3952,18 @@ auto PublishDiagnosticsNotification::params(PublishDiagnosticsParams params) return *this; } -auto SetTraceNotification::method() const -> std::string { - return repr_->at("method"); -} - auto SetTraceNotification::method(std::string method) -> SetTraceNotification& { (*repr_)["method"] = std::move(method); return *this; } -auto SetTraceNotification::id() const -> std::variant { - const auto& id = repr_->at("id"); - if (id.is_string()) return id.get(); - return id.get(); -} - -auto SetTraceNotification::id(long id) -> SetTraceNotification& { - (*repr_)["id"] = id; - return *this; -} - -auto SetTraceNotification::id(std::string id) -> SetTraceNotification& { - (*repr_)["id"] = std::move(id); +auto SetTraceNotification::id(std::variant id) + -> SetTraceNotification& { + if (std::holds_alternative(id)) { + (*repr_)["id"] = std::get(id); + } else { + (*repr_)["id"] = std::get(id); + } return *this; } @@ -5417,28 +3978,18 @@ auto SetTraceNotification::params(SetTraceParams params) return *this; } -auto LogTraceNotification::method() const -> std::string { - return repr_->at("method"); -} - auto LogTraceNotification::method(std::string method) -> LogTraceNotification& { (*repr_)["method"] = std::move(method); return *this; } -auto LogTraceNotification::id() const -> std::variant { - const auto& id = repr_->at("id"); - if (id.is_string()) return id.get(); - return id.get(); -} - -auto LogTraceNotification::id(long id) -> LogTraceNotification& { - (*repr_)["id"] = id; - return *this; -} - -auto LogTraceNotification::id(std::string id) -> LogTraceNotification& { - (*repr_)["id"] = std::move(id); +auto LogTraceNotification::id(std::variant id) + -> LogTraceNotification& { + if (std::holds_alternative(id)) { + (*repr_)["id"] = std::get(id); + } else { + (*repr_)["id"] = std::get(id); + } return *this; } @@ -5453,28 +4004,18 @@ auto LogTraceNotification::params(LogTraceParams params) return *this; } -auto CancelNotification::method() const -> std::string { - return repr_->at("method"); -} - auto CancelNotification::method(std::string method) -> CancelNotification& { (*repr_)["method"] = std::move(method); return *this; } -auto CancelNotification::id() const -> std::variant { - const auto& id = repr_->at("id"); - if (id.is_string()) return id.get(); - return id.get(); -} - -auto CancelNotification::id(long id) -> CancelNotification& { - (*repr_)["id"] = id; - return *this; -} - -auto CancelNotification::id(std::string id) -> CancelNotification& { - (*repr_)["id"] = std::move(id); +auto CancelNotification::id(std::variant id) + -> CancelNotification& { + if (std::holds_alternative(id)) { + (*repr_)["id"] = std::get(id); + } else { + (*repr_)["id"] = std::get(id); + } return *this; } @@ -5488,28 +4029,18 @@ auto CancelNotification::params(CancelParams params) -> CancelNotification& { return *this; } -auto ProgressNotification::method() const -> std::string { - return repr_->at("method"); -} - auto ProgressNotification::method(std::string method) -> ProgressNotification& { (*repr_)["method"] = std::move(method); return *this; } -auto ProgressNotification::id() const -> std::variant { - const auto& id = repr_->at("id"); - if (id.is_string()) return id.get(); - return id.get(); -} - -auto ProgressNotification::id(long id) -> ProgressNotification& { - (*repr_)["id"] = id; - return *this; -} - -auto ProgressNotification::id(std::string id) -> ProgressNotification& { - (*repr_)["id"] = std::move(id); +auto ProgressNotification::id(std::variant id) + -> ProgressNotification& { + if (std::holds_alternative(id)) { + (*repr_)["id"] = std::get(id); + } else { + (*repr_)["id"] = std::get(id); + } return *this; } diff --git a/src/lsp/cxx/lsp/requests.h b/src/lsp/cxx/lsp/requests.h index 04531073..6c511364 100644 --- a/src/lsp/cxx/lsp/requests.h +++ b/src/lsp/cxx/lsp/requests.h @@ -125,14 +125,12 @@ namespace cxx::lsp { class ImplementationRequest final : public LSPRequest { public: + using LSPRequest::id; using LSPRequest::LSPRequest; + using LSPRequest::method; - [[nodiscard]] auto method() const -> std::string; auto method(std::string method) -> ImplementationRequest&; - - [[nodiscard]] auto id() const -> std::variant; - auto id(long id) -> ImplementationRequest&; - auto id(std::string id) -> ImplementationRequest&; + auto id(std::variant id) -> ImplementationRequest&; [[nodiscard]] auto params() const -> ImplementationParams; auto params(ImplementationParams result) -> ImplementationRequest&; @@ -156,14 +154,12 @@ class ImplementationResponse final : public LSPResponse { class TypeDefinitionRequest final : public LSPRequest { public: + using LSPRequest::id; using LSPRequest::LSPRequest; + using LSPRequest::method; - [[nodiscard]] auto method() const -> std::string; auto method(std::string method) -> TypeDefinitionRequest&; - - [[nodiscard]] auto id() const -> std::variant; - auto id(long id) -> TypeDefinitionRequest&; - auto id(std::string id) -> TypeDefinitionRequest&; + auto id(std::variant id) -> TypeDefinitionRequest&; [[nodiscard]] auto params() const -> TypeDefinitionParams; auto params(TypeDefinitionParams result) -> TypeDefinitionRequest&; @@ -187,14 +183,12 @@ class TypeDefinitionResponse final : public LSPResponse { class WorkspaceFoldersRequest final : public LSPRequest { public: + using LSPRequest::id; using LSPRequest::LSPRequest; + using LSPRequest::method; - [[nodiscard]] auto method() const -> std::string; auto method(std::string method) -> WorkspaceFoldersRequest&; - - [[nodiscard]] auto id() const -> std::variant; - auto id(long id) -> WorkspaceFoldersRequest&; - auto id(std::string id) -> WorkspaceFoldersRequest&; + auto id(std::variant id) -> WorkspaceFoldersRequest&; }; class WorkspaceFoldersResponse final : public LSPResponse { @@ -214,14 +208,12 @@ class WorkspaceFoldersResponse final : public LSPResponse { class ConfigurationRequest final : public LSPRequest { public: + using LSPRequest::id; using LSPRequest::LSPRequest; + using LSPRequest::method; - [[nodiscard]] auto method() const -> std::string; auto method(std::string method) -> ConfigurationRequest&; - - [[nodiscard]] auto id() const -> std::variant; - auto id(long id) -> ConfigurationRequest&; - auto id(std::string id) -> ConfigurationRequest&; + auto id(std::variant id) -> ConfigurationRequest&; [[nodiscard]] auto params() const -> ConfigurationParams; auto params(ConfigurationParams result) -> ConfigurationRequest&; @@ -242,14 +234,12 @@ class ConfigurationResponse final : public LSPResponse { class DocumentColorRequest final : public LSPRequest { public: + using LSPRequest::id; using LSPRequest::LSPRequest; + using LSPRequest::method; - [[nodiscard]] auto method() const -> std::string; auto method(std::string method) -> DocumentColorRequest&; - - [[nodiscard]] auto id() const -> std::variant; - auto id(long id) -> DocumentColorRequest&; - auto id(std::string id) -> DocumentColorRequest&; + auto id(std::variant id) -> DocumentColorRequest&; [[nodiscard]] auto params() const -> DocumentColorParams; auto params(DocumentColorParams result) -> DocumentColorRequest&; @@ -270,14 +260,12 @@ class DocumentColorResponse final : public LSPResponse { class ColorPresentationRequest final : public LSPRequest { public: + using LSPRequest::id; using LSPRequest::LSPRequest; + using LSPRequest::method; - [[nodiscard]] auto method() const -> std::string; auto method(std::string method) -> ColorPresentationRequest&; - - [[nodiscard]] auto id() const -> std::variant; - auto id(long id) -> ColorPresentationRequest&; - auto id(std::string id) -> ColorPresentationRequest&; + auto id(std::variant id) -> ColorPresentationRequest&; [[nodiscard]] auto params() const -> ColorPresentationParams; auto params(ColorPresentationParams result) -> ColorPresentationRequest&; @@ -298,14 +286,12 @@ class ColorPresentationResponse final : public LSPResponse { class FoldingRangeRequest final : public LSPRequest { public: + using LSPRequest::id; using LSPRequest::LSPRequest; + using LSPRequest::method; - [[nodiscard]] auto method() const -> std::string; auto method(std::string method) -> FoldingRangeRequest&; - - [[nodiscard]] auto id() const -> std::variant; - auto id(long id) -> FoldingRangeRequest&; - auto id(std::string id) -> FoldingRangeRequest&; + auto id(std::variant id) -> FoldingRangeRequest&; [[nodiscard]] auto params() const -> FoldingRangeParams; auto params(FoldingRangeParams result) -> FoldingRangeRequest&; @@ -328,14 +314,12 @@ class FoldingRangeResponse final : public LSPResponse { class FoldingRangeRefreshRequest final : public LSPRequest { public: + using LSPRequest::id; using LSPRequest::LSPRequest; + using LSPRequest::method; - [[nodiscard]] auto method() const -> std::string; auto method(std::string method) -> FoldingRangeRefreshRequest&; - - [[nodiscard]] auto id() const -> std::variant; - auto id(long id) -> FoldingRangeRefreshRequest&; - auto id(std::string id) -> FoldingRangeRefreshRequest&; + auto id(std::variant id) -> FoldingRangeRefreshRequest&; }; class FoldingRangeRefreshResponse final : public LSPResponse { @@ -353,14 +337,12 @@ class FoldingRangeRefreshResponse final : public LSPResponse { class DeclarationRequest final : public LSPRequest { public: + using LSPRequest::id; using LSPRequest::LSPRequest; + using LSPRequest::method; - [[nodiscard]] auto method() const -> std::string; auto method(std::string method) -> DeclarationRequest&; - - [[nodiscard]] auto id() const -> std::variant; - auto id(long id) -> DeclarationRequest&; - auto id(std::string id) -> DeclarationRequest&; + auto id(std::variant id) -> DeclarationRequest&; [[nodiscard]] auto params() const -> DeclarationParams; auto params(DeclarationParams result) -> DeclarationRequest&; @@ -384,14 +366,12 @@ class DeclarationResponse final : public LSPResponse { class SelectionRangeRequest final : public LSPRequest { public: + using LSPRequest::id; using LSPRequest::LSPRequest; + using LSPRequest::method; - [[nodiscard]] auto method() const -> std::string; auto method(std::string method) -> SelectionRangeRequest&; - - [[nodiscard]] auto id() const -> std::variant; - auto id(long id) -> SelectionRangeRequest&; - auto id(std::string id) -> SelectionRangeRequest&; + auto id(std::variant id) -> SelectionRangeRequest&; [[nodiscard]] auto params() const -> SelectionRangeParams; auto params(SelectionRangeParams result) -> SelectionRangeRequest&; @@ -414,14 +394,12 @@ class SelectionRangeResponse final : public LSPResponse { class WorkDoneProgressCreateRequest final : public LSPRequest { public: + using LSPRequest::id; using LSPRequest::LSPRequest; + using LSPRequest::method; - [[nodiscard]] auto method() const -> std::string; auto method(std::string method) -> WorkDoneProgressCreateRequest&; - - [[nodiscard]] auto id() const -> std::variant; - auto id(long id) -> WorkDoneProgressCreateRequest&; - auto id(std::string id) -> WorkDoneProgressCreateRequest&; + auto id(std::variant id) -> WorkDoneProgressCreateRequest&; [[nodiscard]] auto params() const -> WorkDoneProgressCreateParams; auto params(WorkDoneProgressCreateParams result) @@ -443,14 +421,12 @@ class WorkDoneProgressCreateResponse final : public LSPResponse { class CallHierarchyPrepareRequest final : public LSPRequest { public: + using LSPRequest::id; using LSPRequest::LSPRequest; + using LSPRequest::method; - [[nodiscard]] auto method() const -> std::string; auto method(std::string method) -> CallHierarchyPrepareRequest&; - - [[nodiscard]] auto id() const -> std::variant; - auto id(long id) -> CallHierarchyPrepareRequest&; - auto id(std::string id) -> CallHierarchyPrepareRequest&; + auto id(std::variant id) -> CallHierarchyPrepareRequest&; [[nodiscard]] auto params() const -> CallHierarchyPrepareParams; auto params(CallHierarchyPrepareParams result) @@ -474,14 +450,13 @@ class CallHierarchyPrepareResponse final : public LSPResponse { class CallHierarchyIncomingCallsRequest final : public LSPRequest { public: + using LSPRequest::id; using LSPRequest::LSPRequest; + using LSPRequest::method; - [[nodiscard]] auto method() const -> std::string; auto method(std::string method) -> CallHierarchyIncomingCallsRequest&; - - [[nodiscard]] auto id() const -> std::variant; - auto id(long id) -> CallHierarchyIncomingCallsRequest&; - auto id(std::string id) -> CallHierarchyIncomingCallsRequest&; + auto id(std::variant id) + -> CallHierarchyIncomingCallsRequest&; [[nodiscard]] auto params() const -> CallHierarchyIncomingCallsParams; auto params(CallHierarchyIncomingCallsParams result) @@ -506,14 +481,13 @@ class CallHierarchyIncomingCallsResponse final : public LSPResponse { class CallHierarchyOutgoingCallsRequest final : public LSPRequest { public: + using LSPRequest::id; using LSPRequest::LSPRequest; + using LSPRequest::method; - [[nodiscard]] auto method() const -> std::string; auto method(std::string method) -> CallHierarchyOutgoingCallsRequest&; - - [[nodiscard]] auto id() const -> std::variant; - auto id(long id) -> CallHierarchyOutgoingCallsRequest&; - auto id(std::string id) -> CallHierarchyOutgoingCallsRequest&; + auto id(std::variant id) + -> CallHierarchyOutgoingCallsRequest&; [[nodiscard]] auto params() const -> CallHierarchyOutgoingCallsParams; auto params(CallHierarchyOutgoingCallsParams result) @@ -538,14 +512,12 @@ class CallHierarchyOutgoingCallsResponse final : public LSPResponse { class SemanticTokensRequest final : public LSPRequest { public: + using LSPRequest::id; using LSPRequest::LSPRequest; + using LSPRequest::method; - [[nodiscard]] auto method() const -> std::string; auto method(std::string method) -> SemanticTokensRequest&; - - [[nodiscard]] auto id() const -> std::variant; - auto id(long id) -> SemanticTokensRequest&; - auto id(std::string id) -> SemanticTokensRequest&; + auto id(std::variant id) -> SemanticTokensRequest&; [[nodiscard]] auto params() const -> SemanticTokensParams; auto params(SemanticTokensParams result) -> SemanticTokensRequest&; @@ -568,14 +540,12 @@ class SemanticTokensResponse final : public LSPResponse { class SemanticTokensDeltaRequest final : public LSPRequest { public: + using LSPRequest::id; using LSPRequest::LSPRequest; + using LSPRequest::method; - [[nodiscard]] auto method() const -> std::string; auto method(std::string method) -> SemanticTokensDeltaRequest&; - - [[nodiscard]] auto id() const -> std::variant; - auto id(long id) -> SemanticTokensDeltaRequest&; - auto id(std::string id) -> SemanticTokensDeltaRequest&; + auto id(std::variant id) -> SemanticTokensDeltaRequest&; [[nodiscard]] auto params() const -> SemanticTokensDeltaParams; auto params(SemanticTokensDeltaParams result) -> SemanticTokensDeltaRequest&; @@ -599,14 +569,12 @@ class SemanticTokensDeltaResponse final : public LSPResponse { class SemanticTokensRangeRequest final : public LSPRequest { public: + using LSPRequest::id; using LSPRequest::LSPRequest; + using LSPRequest::method; - [[nodiscard]] auto method() const -> std::string; auto method(std::string method) -> SemanticTokensRangeRequest&; - - [[nodiscard]] auto id() const -> std::variant; - auto id(long id) -> SemanticTokensRangeRequest&; - auto id(std::string id) -> SemanticTokensRangeRequest&; + auto id(std::variant id) -> SemanticTokensRangeRequest&; [[nodiscard]] auto params() const -> SemanticTokensRangeParams; auto params(SemanticTokensRangeParams result) -> SemanticTokensRangeRequest&; @@ -629,14 +597,12 @@ class SemanticTokensRangeResponse final : public LSPResponse { class SemanticTokensRefreshRequest final : public LSPRequest { public: + using LSPRequest::id; using LSPRequest::LSPRequest; + using LSPRequest::method; - [[nodiscard]] auto method() const -> std::string; auto method(std::string method) -> SemanticTokensRefreshRequest&; - - [[nodiscard]] auto id() const -> std::variant; - auto id(long id) -> SemanticTokensRefreshRequest&; - auto id(std::string id) -> SemanticTokensRefreshRequest&; + auto id(std::variant id) -> SemanticTokensRefreshRequest&; }; class SemanticTokensRefreshResponse final : public LSPResponse { @@ -654,14 +620,12 @@ class SemanticTokensRefreshResponse final : public LSPResponse { class ShowDocumentRequest final : public LSPRequest { public: + using LSPRequest::id; using LSPRequest::LSPRequest; + using LSPRequest::method; - [[nodiscard]] auto method() const -> std::string; auto method(std::string method) -> ShowDocumentRequest&; - - [[nodiscard]] auto id() const -> std::variant; - auto id(long id) -> ShowDocumentRequest&; - auto id(std::string id) -> ShowDocumentRequest&; + auto id(std::variant id) -> ShowDocumentRequest&; [[nodiscard]] auto params() const -> ShowDocumentParams; auto params(ShowDocumentParams result) -> ShowDocumentRequest&; @@ -682,14 +646,12 @@ class ShowDocumentResponse final : public LSPResponse { class LinkedEditingRangeRequest final : public LSPRequest { public: + using LSPRequest::id; using LSPRequest::LSPRequest; + using LSPRequest::method; - [[nodiscard]] auto method() const -> std::string; auto method(std::string method) -> LinkedEditingRangeRequest&; - - [[nodiscard]] auto id() const -> std::variant; - auto id(long id) -> LinkedEditingRangeRequest&; - auto id(std::string id) -> LinkedEditingRangeRequest&; + auto id(std::variant id) -> LinkedEditingRangeRequest&; [[nodiscard]] auto params() const -> LinkedEditingRangeParams; auto params(LinkedEditingRangeParams result) -> LinkedEditingRangeRequest&; @@ -712,14 +674,12 @@ class LinkedEditingRangeResponse final : public LSPResponse { class WillCreateFilesRequest final : public LSPRequest { public: + using LSPRequest::id; using LSPRequest::LSPRequest; + using LSPRequest::method; - [[nodiscard]] auto method() const -> std::string; auto method(std::string method) -> WillCreateFilesRequest&; - - [[nodiscard]] auto id() const -> std::variant; - auto id(long id) -> WillCreateFilesRequest&; - auto id(std::string id) -> WillCreateFilesRequest&; + auto id(std::variant id) -> WillCreateFilesRequest&; [[nodiscard]] auto params() const -> CreateFilesParams; auto params(CreateFilesParams result) -> WillCreateFilesRequest&; @@ -742,14 +702,12 @@ class WillCreateFilesResponse final : public LSPResponse { class WillRenameFilesRequest final : public LSPRequest { public: + using LSPRequest::id; using LSPRequest::LSPRequest; + using LSPRequest::method; - [[nodiscard]] auto method() const -> std::string; auto method(std::string method) -> WillRenameFilesRequest&; - - [[nodiscard]] auto id() const -> std::variant; - auto id(long id) -> WillRenameFilesRequest&; - auto id(std::string id) -> WillRenameFilesRequest&; + auto id(std::variant id) -> WillRenameFilesRequest&; [[nodiscard]] auto params() const -> RenameFilesParams; auto params(RenameFilesParams result) -> WillRenameFilesRequest&; @@ -772,14 +730,12 @@ class WillRenameFilesResponse final : public LSPResponse { class WillDeleteFilesRequest final : public LSPRequest { public: + using LSPRequest::id; using LSPRequest::LSPRequest; + using LSPRequest::method; - [[nodiscard]] auto method() const -> std::string; auto method(std::string method) -> WillDeleteFilesRequest&; - - [[nodiscard]] auto id() const -> std::variant; - auto id(long id) -> WillDeleteFilesRequest&; - auto id(std::string id) -> WillDeleteFilesRequest&; + auto id(std::variant id) -> WillDeleteFilesRequest&; [[nodiscard]] auto params() const -> DeleteFilesParams; auto params(DeleteFilesParams result) -> WillDeleteFilesRequest&; @@ -802,14 +758,12 @@ class WillDeleteFilesResponse final : public LSPResponse { class MonikerRequest final : public LSPRequest { public: + using LSPRequest::id; using LSPRequest::LSPRequest; + using LSPRequest::method; - [[nodiscard]] auto method() const -> std::string; auto method(std::string method) -> MonikerRequest&; - - [[nodiscard]] auto id() const -> std::variant; - auto id(long id) -> MonikerRequest&; - auto id(std::string id) -> MonikerRequest&; + auto id(std::variant id) -> MonikerRequest&; [[nodiscard]] auto params() const -> MonikerParams; auto params(MonikerParams result) -> MonikerRequest&; @@ -832,14 +786,12 @@ class MonikerResponse final : public LSPResponse { class TypeHierarchyPrepareRequest final : public LSPRequest { public: + using LSPRequest::id; using LSPRequest::LSPRequest; + using LSPRequest::method; - [[nodiscard]] auto method() const -> std::string; auto method(std::string method) -> TypeHierarchyPrepareRequest&; - - [[nodiscard]] auto id() const -> std::variant; - auto id(long id) -> TypeHierarchyPrepareRequest&; - auto id(std::string id) -> TypeHierarchyPrepareRequest&; + auto id(std::variant id) -> TypeHierarchyPrepareRequest&; [[nodiscard]] auto params() const -> TypeHierarchyPrepareParams; auto params(TypeHierarchyPrepareParams result) @@ -863,14 +815,13 @@ class TypeHierarchyPrepareResponse final : public LSPResponse { class TypeHierarchySupertypesRequest final : public LSPRequest { public: + using LSPRequest::id; using LSPRequest::LSPRequest; + using LSPRequest::method; - [[nodiscard]] auto method() const -> std::string; auto method(std::string method) -> TypeHierarchySupertypesRequest&; - - [[nodiscard]] auto id() const -> std::variant; - auto id(long id) -> TypeHierarchySupertypesRequest&; - auto id(std::string id) -> TypeHierarchySupertypesRequest&; + auto id(std::variant id) + -> TypeHierarchySupertypesRequest&; [[nodiscard]] auto params() const -> TypeHierarchySupertypesParams; auto params(TypeHierarchySupertypesParams result) @@ -894,14 +845,12 @@ class TypeHierarchySupertypesResponse final : public LSPResponse { class TypeHierarchySubtypesRequest final : public LSPRequest { public: + using LSPRequest::id; using LSPRequest::LSPRequest; + using LSPRequest::method; - [[nodiscard]] auto method() const -> std::string; auto method(std::string method) -> TypeHierarchySubtypesRequest&; - - [[nodiscard]] auto id() const -> std::variant; - auto id(long id) -> TypeHierarchySubtypesRequest&; - auto id(std::string id) -> TypeHierarchySubtypesRequest&; + auto id(std::variant id) -> TypeHierarchySubtypesRequest&; [[nodiscard]] auto params() const -> TypeHierarchySubtypesParams; auto params(TypeHierarchySubtypesParams result) @@ -925,14 +874,12 @@ class TypeHierarchySubtypesResponse final : public LSPResponse { class InlineValueRequest final : public LSPRequest { public: + using LSPRequest::id; using LSPRequest::LSPRequest; + using LSPRequest::method; - [[nodiscard]] auto method() const -> std::string; auto method(std::string method) -> InlineValueRequest&; - - [[nodiscard]] auto id() const -> std::variant; - auto id(long id) -> InlineValueRequest&; - auto id(std::string id) -> InlineValueRequest&; + auto id(std::variant id) -> InlineValueRequest&; [[nodiscard]] auto params() const -> InlineValueParams; auto params(InlineValueParams result) -> InlineValueRequest&; @@ -955,14 +902,12 @@ class InlineValueResponse final : public LSPResponse { class InlineValueRefreshRequest final : public LSPRequest { public: + using LSPRequest::id; using LSPRequest::LSPRequest; + using LSPRequest::method; - [[nodiscard]] auto method() const -> std::string; auto method(std::string method) -> InlineValueRefreshRequest&; - - [[nodiscard]] auto id() const -> std::variant; - auto id(long id) -> InlineValueRefreshRequest&; - auto id(std::string id) -> InlineValueRefreshRequest&; + auto id(std::variant id) -> InlineValueRefreshRequest&; }; class InlineValueRefreshResponse final : public LSPResponse { @@ -980,14 +925,12 @@ class InlineValueRefreshResponse final : public LSPResponse { class InlayHintRequest final : public LSPRequest { public: + using LSPRequest::id; using LSPRequest::LSPRequest; + using LSPRequest::method; - [[nodiscard]] auto method() const -> std::string; auto method(std::string method) -> InlayHintRequest&; - - [[nodiscard]] auto id() const -> std::variant; - auto id(long id) -> InlayHintRequest&; - auto id(std::string id) -> InlayHintRequest&; + auto id(std::variant id) -> InlayHintRequest&; [[nodiscard]] auto params() const -> InlayHintParams; auto params(InlayHintParams result) -> InlayHintRequest&; @@ -1010,14 +953,12 @@ class InlayHintResponse final : public LSPResponse { class InlayHintResolveRequest final : public LSPRequest { public: + using LSPRequest::id; using LSPRequest::LSPRequest; + using LSPRequest::method; - [[nodiscard]] auto method() const -> std::string; auto method(std::string method) -> InlayHintResolveRequest&; - - [[nodiscard]] auto id() const -> std::variant; - auto id(long id) -> InlayHintResolveRequest&; - auto id(std::string id) -> InlayHintResolveRequest&; + auto id(std::variant id) -> InlayHintResolveRequest&; [[nodiscard]] auto params() const -> InlayHint; auto params(InlayHint result) -> InlayHintResolveRequest&; @@ -1038,14 +979,12 @@ class InlayHintResolveResponse final : public LSPResponse { class InlayHintRefreshRequest final : public LSPRequest { public: + using LSPRequest::id; using LSPRequest::LSPRequest; + using LSPRequest::method; - [[nodiscard]] auto method() const -> std::string; auto method(std::string method) -> InlayHintRefreshRequest&; - - [[nodiscard]] auto id() const -> std::variant; - auto id(long id) -> InlayHintRefreshRequest&; - auto id(std::string id) -> InlayHintRefreshRequest&; + auto id(std::variant id) -> InlayHintRefreshRequest&; }; class InlayHintRefreshResponse final : public LSPResponse { @@ -1063,14 +1002,12 @@ class InlayHintRefreshResponse final : public LSPResponse { class DocumentDiagnosticRequest final : public LSPRequest { public: + using LSPRequest::id; using LSPRequest::LSPRequest; + using LSPRequest::method; - [[nodiscard]] auto method() const -> std::string; auto method(std::string method) -> DocumentDiagnosticRequest&; - - [[nodiscard]] auto id() const -> std::variant; - auto id(long id) -> DocumentDiagnosticRequest&; - auto id(std::string id) -> DocumentDiagnosticRequest&; + auto id(std::variant id) -> DocumentDiagnosticRequest&; [[nodiscard]] auto params() const -> DocumentDiagnosticParams; auto params(DocumentDiagnosticParams result) -> DocumentDiagnosticRequest&; @@ -1091,14 +1028,12 @@ class DocumentDiagnosticResponse final : public LSPResponse { class WorkspaceDiagnosticRequest final : public LSPRequest { public: + using LSPRequest::id; using LSPRequest::LSPRequest; + using LSPRequest::method; - [[nodiscard]] auto method() const -> std::string; auto method(std::string method) -> WorkspaceDiagnosticRequest&; - - [[nodiscard]] auto id() const -> std::variant; - auto id(long id) -> WorkspaceDiagnosticRequest&; - auto id(std::string id) -> WorkspaceDiagnosticRequest&; + auto id(std::variant id) -> WorkspaceDiagnosticRequest&; [[nodiscard]] auto params() const -> WorkspaceDiagnosticParams; auto params(WorkspaceDiagnosticParams result) -> WorkspaceDiagnosticRequest&; @@ -1119,14 +1054,12 @@ class WorkspaceDiagnosticResponse final : public LSPResponse { class DiagnosticRefreshRequest final : public LSPRequest { public: + using LSPRequest::id; using LSPRequest::LSPRequest; + using LSPRequest::method; - [[nodiscard]] auto method() const -> std::string; auto method(std::string method) -> DiagnosticRefreshRequest&; - - [[nodiscard]] auto id() const -> std::variant; - auto id(long id) -> DiagnosticRefreshRequest&; - auto id(std::string id) -> DiagnosticRefreshRequest&; + auto id(std::variant id) -> DiagnosticRefreshRequest&; }; class DiagnosticRefreshResponse final : public LSPResponse { @@ -1144,14 +1077,12 @@ class DiagnosticRefreshResponse final : public LSPResponse { class InlineCompletionRequest final : public LSPRequest { public: + using LSPRequest::id; using LSPRequest::LSPRequest; + using LSPRequest::method; - [[nodiscard]] auto method() const -> std::string; auto method(std::string method) -> InlineCompletionRequest&; - - [[nodiscard]] auto id() const -> std::variant; - auto id(long id) -> InlineCompletionRequest&; - auto id(std::string id) -> InlineCompletionRequest&; + auto id(std::variant id) -> InlineCompletionRequest&; [[nodiscard]] auto params() const -> InlineCompletionParams; auto params(InlineCompletionParams result) -> InlineCompletionRequest&; @@ -1176,14 +1107,12 @@ class InlineCompletionResponse final : public LSPResponse { class TextDocumentContentRequest final : public LSPRequest { public: + using LSPRequest::id; using LSPRequest::LSPRequest; + using LSPRequest::method; - [[nodiscard]] auto method() const -> std::string; auto method(std::string method) -> TextDocumentContentRequest&; - - [[nodiscard]] auto id() const -> std::variant; - auto id(long id) -> TextDocumentContentRequest&; - auto id(std::string id) -> TextDocumentContentRequest&; + auto id(std::variant id) -> TextDocumentContentRequest&; [[nodiscard]] auto params() const -> TextDocumentContentParams; auto params(TextDocumentContentParams result) -> TextDocumentContentRequest&; @@ -1204,14 +1133,13 @@ class TextDocumentContentResponse final : public LSPResponse { class TextDocumentContentRefreshRequest final : public LSPRequest { public: + using LSPRequest::id; using LSPRequest::LSPRequest; + using LSPRequest::method; - [[nodiscard]] auto method() const -> std::string; auto method(std::string method) -> TextDocumentContentRefreshRequest&; - - [[nodiscard]] auto id() const -> std::variant; - auto id(long id) -> TextDocumentContentRefreshRequest&; - auto id(std::string id) -> TextDocumentContentRefreshRequest&; + auto id(std::variant id) + -> TextDocumentContentRefreshRequest&; [[nodiscard]] auto params() const -> TextDocumentContentRefreshParams; auto params(TextDocumentContentRefreshParams result) @@ -1233,14 +1161,12 @@ class TextDocumentContentRefreshResponse final : public LSPResponse { class RegistrationRequest final : public LSPRequest { public: + using LSPRequest::id; using LSPRequest::LSPRequest; + using LSPRequest::method; - [[nodiscard]] auto method() const -> std::string; auto method(std::string method) -> RegistrationRequest&; - - [[nodiscard]] auto id() const -> std::variant; - auto id(long id) -> RegistrationRequest&; - auto id(std::string id) -> RegistrationRequest&; + auto id(std::variant id) -> RegistrationRequest&; [[nodiscard]] auto params() const -> RegistrationParams; auto params(RegistrationParams result) -> RegistrationRequest&; @@ -1261,14 +1187,12 @@ class RegistrationResponse final : public LSPResponse { class UnregistrationRequest final : public LSPRequest { public: + using LSPRequest::id; using LSPRequest::LSPRequest; + using LSPRequest::method; - [[nodiscard]] auto method() const -> std::string; auto method(std::string method) -> UnregistrationRequest&; - - [[nodiscard]] auto id() const -> std::variant; - auto id(long id) -> UnregistrationRequest&; - auto id(std::string id) -> UnregistrationRequest&; + auto id(std::variant id) -> UnregistrationRequest&; [[nodiscard]] auto params() const -> UnregistrationParams; auto params(UnregistrationParams result) -> UnregistrationRequest&; @@ -1289,14 +1213,12 @@ class UnregistrationResponse final : public LSPResponse { class InitializeRequest final : public LSPRequest { public: + using LSPRequest::id; using LSPRequest::LSPRequest; + using LSPRequest::method; - [[nodiscard]] auto method() const -> std::string; auto method(std::string method) -> InitializeRequest&; - - [[nodiscard]] auto id() const -> std::variant; - auto id(long id) -> InitializeRequest&; - auto id(std::string id) -> InitializeRequest&; + auto id(std::variant id) -> InitializeRequest&; [[nodiscard]] auto params() const -> InitializeParams; auto params(InitializeParams result) -> InitializeRequest&; @@ -1317,14 +1239,12 @@ class InitializeResponse final : public LSPResponse { class ShutdownRequest final : public LSPRequest { public: + using LSPRequest::id; using LSPRequest::LSPRequest; + using LSPRequest::method; - [[nodiscard]] auto method() const -> std::string; auto method(std::string method) -> ShutdownRequest&; - - [[nodiscard]] auto id() const -> std::variant; - auto id(long id) -> ShutdownRequest&; - auto id(std::string id) -> ShutdownRequest&; + auto id(std::variant id) -> ShutdownRequest&; }; class ShutdownResponse final : public LSPResponse { @@ -1342,14 +1262,12 @@ class ShutdownResponse final : public LSPResponse { class ShowMessageRequest final : public LSPRequest { public: + using LSPRequest::id; using LSPRequest::LSPRequest; + using LSPRequest::method; - [[nodiscard]] auto method() const -> std::string; auto method(std::string method) -> ShowMessageRequest&; - - [[nodiscard]] auto id() const -> std::variant; - auto id(long id) -> ShowMessageRequest&; - auto id(std::string id) -> ShowMessageRequest&; + auto id(std::variant id) -> ShowMessageRequest&; [[nodiscard]] auto params() const -> ShowMessageRequestParams; auto params(ShowMessageRequestParams result) -> ShowMessageRequest&; @@ -1372,14 +1290,13 @@ class ShowMessageResponse final : public LSPResponse { class WillSaveTextDocumentWaitUntilRequest final : public LSPRequest { public: + using LSPRequest::id; using LSPRequest::LSPRequest; + using LSPRequest::method; - [[nodiscard]] auto method() const -> std::string; auto method(std::string method) -> WillSaveTextDocumentWaitUntilRequest&; - - [[nodiscard]] auto id() const -> std::variant; - auto id(long id) -> WillSaveTextDocumentWaitUntilRequest&; - auto id(std::string id) -> WillSaveTextDocumentWaitUntilRequest&; + auto id(std::variant id) + -> WillSaveTextDocumentWaitUntilRequest&; [[nodiscard]] auto params() const -> WillSaveTextDocumentParams; auto params(WillSaveTextDocumentParams result) @@ -1403,14 +1320,12 @@ class WillSaveTextDocumentWaitUntilResponse final : public LSPResponse { class CompletionRequest final : public LSPRequest { public: + using LSPRequest::id; using LSPRequest::LSPRequest; + using LSPRequest::method; - [[nodiscard]] auto method() const -> std::string; auto method(std::string method) -> CompletionRequest&; - - [[nodiscard]] auto id() const -> std::variant; - auto id(long id) -> CompletionRequest&; - auto id(std::string id) -> CompletionRequest&; + auto id(std::variant id) -> CompletionRequest&; [[nodiscard]] auto params() const -> CompletionParams; auto params(CompletionParams result) -> CompletionRequest&; @@ -1434,14 +1349,12 @@ class CompletionResponse final : public LSPResponse { class CompletionResolveRequest final : public LSPRequest { public: + using LSPRequest::id; using LSPRequest::LSPRequest; + using LSPRequest::method; - [[nodiscard]] auto method() const -> std::string; auto method(std::string method) -> CompletionResolveRequest&; - - [[nodiscard]] auto id() const -> std::variant; - auto id(long id) -> CompletionResolveRequest&; - auto id(std::string id) -> CompletionResolveRequest&; + auto id(std::variant id) -> CompletionResolveRequest&; [[nodiscard]] auto params() const -> CompletionItem; auto params(CompletionItem result) -> CompletionResolveRequest&; @@ -1462,14 +1375,12 @@ class CompletionResolveResponse final : public LSPResponse { class HoverRequest final : public LSPRequest { public: + using LSPRequest::id; using LSPRequest::LSPRequest; + using LSPRequest::method; - [[nodiscard]] auto method() const -> std::string; auto method(std::string method) -> HoverRequest&; - - [[nodiscard]] auto id() const -> std::variant; - auto id(long id) -> HoverRequest&; - auto id(std::string id) -> HoverRequest&; + auto id(std::variant id) -> HoverRequest&; [[nodiscard]] auto params() const -> HoverParams; auto params(HoverParams result) -> HoverRequest&; @@ -1490,14 +1401,12 @@ class HoverResponse final : public LSPResponse { class SignatureHelpRequest final : public LSPRequest { public: + using LSPRequest::id; using LSPRequest::LSPRequest; + using LSPRequest::method; - [[nodiscard]] auto method() const -> std::string; auto method(std::string method) -> SignatureHelpRequest&; - - [[nodiscard]] auto id() const -> std::variant; - auto id(long id) -> SignatureHelpRequest&; - auto id(std::string id) -> SignatureHelpRequest&; + auto id(std::variant id) -> SignatureHelpRequest&; [[nodiscard]] auto params() const -> SignatureHelpParams; auto params(SignatureHelpParams result) -> SignatureHelpRequest&; @@ -1520,14 +1429,12 @@ class SignatureHelpResponse final : public LSPResponse { class DefinitionRequest final : public LSPRequest { public: + using LSPRequest::id; using LSPRequest::LSPRequest; + using LSPRequest::method; - [[nodiscard]] auto method() const -> std::string; auto method(std::string method) -> DefinitionRequest&; - - [[nodiscard]] auto id() const -> std::variant; - auto id(long id) -> DefinitionRequest&; - auto id(std::string id) -> DefinitionRequest&; + auto id(std::variant id) -> DefinitionRequest&; [[nodiscard]] auto params() const -> DefinitionParams; auto params(DefinitionParams result) -> DefinitionRequest&; @@ -1551,14 +1458,12 @@ class DefinitionResponse final : public LSPResponse { class ReferencesRequest final : public LSPRequest { public: + using LSPRequest::id; using LSPRequest::LSPRequest; + using LSPRequest::method; - [[nodiscard]] auto method() const -> std::string; auto method(std::string method) -> ReferencesRequest&; - - [[nodiscard]] auto id() const -> std::variant; - auto id(long id) -> ReferencesRequest&; - auto id(std::string id) -> ReferencesRequest&; + auto id(std::variant id) -> ReferencesRequest&; [[nodiscard]] auto params() const -> ReferenceParams; auto params(ReferenceParams result) -> ReferencesRequest&; @@ -1581,14 +1486,12 @@ class ReferencesResponse final : public LSPResponse { class DocumentHighlightRequest final : public LSPRequest { public: + using LSPRequest::id; using LSPRequest::LSPRequest; + using LSPRequest::method; - [[nodiscard]] auto method() const -> std::string; auto method(std::string method) -> DocumentHighlightRequest&; - - [[nodiscard]] auto id() const -> std::variant; - auto id(long id) -> DocumentHighlightRequest&; - auto id(std::string id) -> DocumentHighlightRequest&; + auto id(std::variant id) -> DocumentHighlightRequest&; [[nodiscard]] auto params() const -> DocumentHighlightParams; auto params(DocumentHighlightParams result) -> DocumentHighlightRequest&; @@ -1611,14 +1514,12 @@ class DocumentHighlightResponse final : public LSPResponse { class DocumentSymbolRequest final : public LSPRequest { public: + using LSPRequest::id; using LSPRequest::LSPRequest; + using LSPRequest::method; - [[nodiscard]] auto method() const -> std::string; auto method(std::string method) -> DocumentSymbolRequest&; - - [[nodiscard]] auto id() const -> std::variant; - auto id(long id) -> DocumentSymbolRequest&; - auto id(std::string id) -> DocumentSymbolRequest&; + auto id(std::variant id) -> DocumentSymbolRequest&; [[nodiscard]] auto params() const -> DocumentSymbolParams; auto params(DocumentSymbolParams result) -> DocumentSymbolRequest&; @@ -1643,14 +1544,12 @@ class DocumentSymbolResponse final : public LSPResponse { class CodeActionRequest final : public LSPRequest { public: + using LSPRequest::id; using LSPRequest::LSPRequest; + using LSPRequest::method; - [[nodiscard]] auto method() const -> std::string; auto method(std::string method) -> CodeActionRequest&; - - [[nodiscard]] auto id() const -> std::variant; - auto id(long id) -> CodeActionRequest&; - auto id(std::string id) -> CodeActionRequest&; + auto id(std::variant id) -> CodeActionRequest&; [[nodiscard]] auto params() const -> CodeActionParams; auto params(CodeActionParams result) -> CodeActionRequest&; @@ -1675,14 +1574,12 @@ class CodeActionResponse final : public LSPResponse { class CodeActionResolveRequest final : public LSPRequest { public: + using LSPRequest::id; using LSPRequest::LSPRequest; + using LSPRequest::method; - [[nodiscard]] auto method() const -> std::string; auto method(std::string method) -> CodeActionResolveRequest&; - - [[nodiscard]] auto id() const -> std::variant; - auto id(long id) -> CodeActionResolveRequest&; - auto id(std::string id) -> CodeActionResolveRequest&; + auto id(std::variant id) -> CodeActionResolveRequest&; [[nodiscard]] auto params() const -> CodeAction; auto params(CodeAction result) -> CodeActionResolveRequest&; @@ -1703,14 +1600,12 @@ class CodeActionResolveResponse final : public LSPResponse { class WorkspaceSymbolRequest final : public LSPRequest { public: + using LSPRequest::id; using LSPRequest::LSPRequest; + using LSPRequest::method; - [[nodiscard]] auto method() const -> std::string; auto method(std::string method) -> WorkspaceSymbolRequest&; - - [[nodiscard]] auto id() const -> std::variant; - auto id(long id) -> WorkspaceSymbolRequest&; - auto id(std::string id) -> WorkspaceSymbolRequest&; + auto id(std::variant id) -> WorkspaceSymbolRequest&; [[nodiscard]] auto params() const -> WorkspaceSymbolParams; auto params(WorkspaceSymbolParams result) -> WorkspaceSymbolRequest&; @@ -1735,14 +1630,12 @@ class WorkspaceSymbolResponse final : public LSPResponse { class WorkspaceSymbolResolveRequest final : public LSPRequest { public: + using LSPRequest::id; using LSPRequest::LSPRequest; + using LSPRequest::method; - [[nodiscard]] auto method() const -> std::string; auto method(std::string method) -> WorkspaceSymbolResolveRequest&; - - [[nodiscard]] auto id() const -> std::variant; - auto id(long id) -> WorkspaceSymbolResolveRequest&; - auto id(std::string id) -> WorkspaceSymbolResolveRequest&; + auto id(std::variant id) -> WorkspaceSymbolResolveRequest&; [[nodiscard]] auto params() const -> WorkspaceSymbol; auto params(WorkspaceSymbol result) -> WorkspaceSymbolResolveRequest&; @@ -1763,14 +1656,12 @@ class WorkspaceSymbolResolveResponse final : public LSPResponse { class CodeLensRequest final : public LSPRequest { public: + using LSPRequest::id; using LSPRequest::LSPRequest; + using LSPRequest::method; - [[nodiscard]] auto method() const -> std::string; auto method(std::string method) -> CodeLensRequest&; - - [[nodiscard]] auto id() const -> std::variant; - auto id(long id) -> CodeLensRequest&; - auto id(std::string id) -> CodeLensRequest&; + auto id(std::variant id) -> CodeLensRequest&; [[nodiscard]] auto params() const -> CodeLensParams; auto params(CodeLensParams result) -> CodeLensRequest&; @@ -1793,14 +1684,12 @@ class CodeLensResponse final : public LSPResponse { class CodeLensResolveRequest final : public LSPRequest { public: + using LSPRequest::id; using LSPRequest::LSPRequest; + using LSPRequest::method; - [[nodiscard]] auto method() const -> std::string; auto method(std::string method) -> CodeLensResolveRequest&; - - [[nodiscard]] auto id() const -> std::variant; - auto id(long id) -> CodeLensResolveRequest&; - auto id(std::string id) -> CodeLensResolveRequest&; + auto id(std::variant id) -> CodeLensResolveRequest&; [[nodiscard]] auto params() const -> CodeLens; auto params(CodeLens result) -> CodeLensResolveRequest&; @@ -1821,14 +1710,12 @@ class CodeLensResolveResponse final : public LSPResponse { class CodeLensRefreshRequest final : public LSPRequest { public: + using LSPRequest::id; using LSPRequest::LSPRequest; + using LSPRequest::method; - [[nodiscard]] auto method() const -> std::string; auto method(std::string method) -> CodeLensRefreshRequest&; - - [[nodiscard]] auto id() const -> std::variant; - auto id(long id) -> CodeLensRefreshRequest&; - auto id(std::string id) -> CodeLensRefreshRequest&; + auto id(std::variant id) -> CodeLensRefreshRequest&; }; class CodeLensRefreshResponse final : public LSPResponse { @@ -1846,14 +1733,12 @@ class CodeLensRefreshResponse final : public LSPResponse { class DocumentLinkRequest final : public LSPRequest { public: + using LSPRequest::id; using LSPRequest::LSPRequest; + using LSPRequest::method; - [[nodiscard]] auto method() const -> std::string; auto method(std::string method) -> DocumentLinkRequest&; - - [[nodiscard]] auto id() const -> std::variant; - auto id(long id) -> DocumentLinkRequest&; - auto id(std::string id) -> DocumentLinkRequest&; + auto id(std::variant id) -> DocumentLinkRequest&; [[nodiscard]] auto params() const -> DocumentLinkParams; auto params(DocumentLinkParams result) -> DocumentLinkRequest&; @@ -1876,14 +1761,12 @@ class DocumentLinkResponse final : public LSPResponse { class DocumentLinkResolveRequest final : public LSPRequest { public: + using LSPRequest::id; using LSPRequest::LSPRequest; + using LSPRequest::method; - [[nodiscard]] auto method() const -> std::string; auto method(std::string method) -> DocumentLinkResolveRequest&; - - [[nodiscard]] auto id() const -> std::variant; - auto id(long id) -> DocumentLinkResolveRequest&; - auto id(std::string id) -> DocumentLinkResolveRequest&; + auto id(std::variant id) -> DocumentLinkResolveRequest&; [[nodiscard]] auto params() const -> DocumentLink; auto params(DocumentLink result) -> DocumentLinkResolveRequest&; @@ -1904,14 +1787,12 @@ class DocumentLinkResolveResponse final : public LSPResponse { class DocumentFormattingRequest final : public LSPRequest { public: + using LSPRequest::id; using LSPRequest::LSPRequest; + using LSPRequest::method; - [[nodiscard]] auto method() const -> std::string; auto method(std::string method) -> DocumentFormattingRequest&; - - [[nodiscard]] auto id() const -> std::variant; - auto id(long id) -> DocumentFormattingRequest&; - auto id(std::string id) -> DocumentFormattingRequest&; + auto id(std::variant id) -> DocumentFormattingRequest&; [[nodiscard]] auto params() const -> DocumentFormattingParams; auto params(DocumentFormattingParams result) -> DocumentFormattingRequest&; @@ -1934,14 +1815,13 @@ class DocumentFormattingResponse final : public LSPResponse { class DocumentRangeFormattingRequest final : public LSPRequest { public: + using LSPRequest::id; using LSPRequest::LSPRequest; + using LSPRequest::method; - [[nodiscard]] auto method() const -> std::string; auto method(std::string method) -> DocumentRangeFormattingRequest&; - - [[nodiscard]] auto id() const -> std::variant; - auto id(long id) -> DocumentRangeFormattingRequest&; - auto id(std::string id) -> DocumentRangeFormattingRequest&; + auto id(std::variant id) + -> DocumentRangeFormattingRequest&; [[nodiscard]] auto params() const -> DocumentRangeFormattingParams; auto params(DocumentRangeFormattingParams result) @@ -1965,14 +1845,13 @@ class DocumentRangeFormattingResponse final : public LSPResponse { class DocumentRangesFormattingRequest final : public LSPRequest { public: + using LSPRequest::id; using LSPRequest::LSPRequest; + using LSPRequest::method; - [[nodiscard]] auto method() const -> std::string; auto method(std::string method) -> DocumentRangesFormattingRequest&; - - [[nodiscard]] auto id() const -> std::variant; - auto id(long id) -> DocumentRangesFormattingRequest&; - auto id(std::string id) -> DocumentRangesFormattingRequest&; + auto id(std::variant id) + -> DocumentRangesFormattingRequest&; [[nodiscard]] auto params() const -> DocumentRangesFormattingParams; auto params(DocumentRangesFormattingParams result) @@ -1996,14 +1875,13 @@ class DocumentRangesFormattingResponse final : public LSPResponse { class DocumentOnTypeFormattingRequest final : public LSPRequest { public: + using LSPRequest::id; using LSPRequest::LSPRequest; + using LSPRequest::method; - [[nodiscard]] auto method() const -> std::string; auto method(std::string method) -> DocumentOnTypeFormattingRequest&; - - [[nodiscard]] auto id() const -> std::variant; - auto id(long id) -> DocumentOnTypeFormattingRequest&; - auto id(std::string id) -> DocumentOnTypeFormattingRequest&; + auto id(std::variant id) + -> DocumentOnTypeFormattingRequest&; [[nodiscard]] auto params() const -> DocumentOnTypeFormattingParams; auto params(DocumentOnTypeFormattingParams result) @@ -2027,14 +1905,12 @@ class DocumentOnTypeFormattingResponse final : public LSPResponse { class RenameRequest final : public LSPRequest { public: + using LSPRequest::id; using LSPRequest::LSPRequest; + using LSPRequest::method; - [[nodiscard]] auto method() const -> std::string; auto method(std::string method) -> RenameRequest&; - - [[nodiscard]] auto id() const -> std::variant; - auto id(long id) -> RenameRequest&; - auto id(std::string id) -> RenameRequest&; + auto id(std::variant id) -> RenameRequest&; [[nodiscard]] auto params() const -> RenameParams; auto params(RenameParams result) -> RenameRequest&; @@ -2057,14 +1933,12 @@ class RenameResponse final : public LSPResponse { class PrepareRenameRequest final : public LSPRequest { public: + using LSPRequest::id; using LSPRequest::LSPRequest; + using LSPRequest::method; - [[nodiscard]] auto method() const -> std::string; auto method(std::string method) -> PrepareRenameRequest&; - - [[nodiscard]] auto id() const -> std::variant; - auto id(long id) -> PrepareRenameRequest&; - auto id(std::string id) -> PrepareRenameRequest&; + auto id(std::variant id) -> PrepareRenameRequest&; [[nodiscard]] auto params() const -> PrepareRenameParams; auto params(PrepareRenameParams result) -> PrepareRenameRequest&; @@ -2087,14 +1961,12 @@ class PrepareRenameResponse final : public LSPResponse { class ExecuteCommandRequest final : public LSPRequest { public: + using LSPRequest::id; using LSPRequest::LSPRequest; + using LSPRequest::method; - [[nodiscard]] auto method() const -> std::string; auto method(std::string method) -> ExecuteCommandRequest&; - - [[nodiscard]] auto id() const -> std::variant; - auto id(long id) -> ExecuteCommandRequest&; - auto id(std::string id) -> ExecuteCommandRequest&; + auto id(std::variant id) -> ExecuteCommandRequest&; [[nodiscard]] auto params() const -> ExecuteCommandParams; auto params(ExecuteCommandParams result) -> ExecuteCommandRequest&; @@ -2116,14 +1988,12 @@ class ExecuteCommandResponse final : public LSPResponse { class ApplyWorkspaceEditRequest final : public LSPRequest { public: + using LSPRequest::id; using LSPRequest::LSPRequest; + using LSPRequest::method; - [[nodiscard]] auto method() const -> std::string; auto method(std::string method) -> ApplyWorkspaceEditRequest&; - - [[nodiscard]] auto id() const -> std::variant; - auto id(long id) -> ApplyWorkspaceEditRequest&; - auto id(std::string id) -> ApplyWorkspaceEditRequest&; + auto id(std::variant id) -> ApplyWorkspaceEditRequest&; [[nodiscard]] auto params() const -> ApplyWorkspaceEditParams; auto params(ApplyWorkspaceEditParams result) -> ApplyWorkspaceEditRequest&; @@ -2144,14 +2014,13 @@ class ApplyWorkspaceEditResponse final : public LSPResponse { class DidChangeWorkspaceFoldersNotification final : public LSPRequest { public: + using LSPRequest::id; using LSPRequest::LSPRequest; + using LSPRequest::method; - [[nodiscard]] auto method() const -> std::string; auto method(std::string method) -> DidChangeWorkspaceFoldersNotification&; - - [[nodiscard]] auto id() const -> std::variant; - auto id(long id) -> DidChangeWorkspaceFoldersNotification&; - auto id(std::string id) -> DidChangeWorkspaceFoldersNotification&; + auto id(std::variant id) + -> DidChangeWorkspaceFoldersNotification&; [[nodiscard]] auto params() const -> DidChangeWorkspaceFoldersParams; auto params(DidChangeWorkspaceFoldersParams result) @@ -2160,14 +2029,13 @@ class DidChangeWorkspaceFoldersNotification final : public LSPRequest { class WorkDoneProgressCancelNotification final : public LSPRequest { public: + using LSPRequest::id; using LSPRequest::LSPRequest; + using LSPRequest::method; - [[nodiscard]] auto method() const -> std::string; auto method(std::string method) -> WorkDoneProgressCancelNotification&; - - [[nodiscard]] auto id() const -> std::variant; - auto id(long id) -> WorkDoneProgressCancelNotification&; - auto id(std::string id) -> WorkDoneProgressCancelNotification&; + auto id(std::variant id) + -> WorkDoneProgressCancelNotification&; [[nodiscard]] auto params() const -> WorkDoneProgressCancelParams; auto params(WorkDoneProgressCancelParams result) @@ -2176,14 +2044,12 @@ class WorkDoneProgressCancelNotification final : public LSPRequest { class DidCreateFilesNotification final : public LSPRequest { public: + using LSPRequest::id; using LSPRequest::LSPRequest; + using LSPRequest::method; - [[nodiscard]] auto method() const -> std::string; auto method(std::string method) -> DidCreateFilesNotification&; - - [[nodiscard]] auto id() const -> std::variant; - auto id(long id) -> DidCreateFilesNotification&; - auto id(std::string id) -> DidCreateFilesNotification&; + auto id(std::variant id) -> DidCreateFilesNotification&; [[nodiscard]] auto params() const -> CreateFilesParams; auto params(CreateFilesParams result) -> DidCreateFilesNotification&; @@ -2191,14 +2057,12 @@ class DidCreateFilesNotification final : public LSPRequest { class DidRenameFilesNotification final : public LSPRequest { public: + using LSPRequest::id; using LSPRequest::LSPRequest; + using LSPRequest::method; - [[nodiscard]] auto method() const -> std::string; auto method(std::string method) -> DidRenameFilesNotification&; - - [[nodiscard]] auto id() const -> std::variant; - auto id(long id) -> DidRenameFilesNotification&; - auto id(std::string id) -> DidRenameFilesNotification&; + auto id(std::variant id) -> DidRenameFilesNotification&; [[nodiscard]] auto params() const -> RenameFilesParams; auto params(RenameFilesParams result) -> DidRenameFilesNotification&; @@ -2206,14 +2070,12 @@ class DidRenameFilesNotification final : public LSPRequest { class DidDeleteFilesNotification final : public LSPRequest { public: + using LSPRequest::id; using LSPRequest::LSPRequest; + using LSPRequest::method; - [[nodiscard]] auto method() const -> std::string; auto method(std::string method) -> DidDeleteFilesNotification&; - - [[nodiscard]] auto id() const -> std::variant; - auto id(long id) -> DidDeleteFilesNotification&; - auto id(std::string id) -> DidDeleteFilesNotification&; + auto id(std::variant id) -> DidDeleteFilesNotification&; [[nodiscard]] auto params() const -> DeleteFilesParams; auto params(DeleteFilesParams result) -> DidDeleteFilesNotification&; @@ -2221,14 +2083,13 @@ class DidDeleteFilesNotification final : public LSPRequest { class DidOpenNotebookDocumentNotification final : public LSPRequest { public: + using LSPRequest::id; using LSPRequest::LSPRequest; + using LSPRequest::method; - [[nodiscard]] auto method() const -> std::string; auto method(std::string method) -> DidOpenNotebookDocumentNotification&; - - [[nodiscard]] auto id() const -> std::variant; - auto id(long id) -> DidOpenNotebookDocumentNotification&; - auto id(std::string id) -> DidOpenNotebookDocumentNotification&; + auto id(std::variant id) + -> DidOpenNotebookDocumentNotification&; [[nodiscard]] auto params() const -> DidOpenNotebookDocumentParams; auto params(DidOpenNotebookDocumentParams result) @@ -2237,14 +2098,13 @@ class DidOpenNotebookDocumentNotification final : public LSPRequest { class DidChangeNotebookDocumentNotification final : public LSPRequest { public: + using LSPRequest::id; using LSPRequest::LSPRequest; + using LSPRequest::method; - [[nodiscard]] auto method() const -> std::string; auto method(std::string method) -> DidChangeNotebookDocumentNotification&; - - [[nodiscard]] auto id() const -> std::variant; - auto id(long id) -> DidChangeNotebookDocumentNotification&; - auto id(std::string id) -> DidChangeNotebookDocumentNotification&; + auto id(std::variant id) + -> DidChangeNotebookDocumentNotification&; [[nodiscard]] auto params() const -> DidChangeNotebookDocumentParams; auto params(DidChangeNotebookDocumentParams result) @@ -2253,14 +2113,13 @@ class DidChangeNotebookDocumentNotification final : public LSPRequest { class DidSaveNotebookDocumentNotification final : public LSPRequest { public: + using LSPRequest::id; using LSPRequest::LSPRequest; + using LSPRequest::method; - [[nodiscard]] auto method() const -> std::string; auto method(std::string method) -> DidSaveNotebookDocumentNotification&; - - [[nodiscard]] auto id() const -> std::variant; - auto id(long id) -> DidSaveNotebookDocumentNotification&; - auto id(std::string id) -> DidSaveNotebookDocumentNotification&; + auto id(std::variant id) + -> DidSaveNotebookDocumentNotification&; [[nodiscard]] auto params() const -> DidSaveNotebookDocumentParams; auto params(DidSaveNotebookDocumentParams result) @@ -2269,14 +2128,13 @@ class DidSaveNotebookDocumentNotification final : public LSPRequest { class DidCloseNotebookDocumentNotification final : public LSPRequest { public: + using LSPRequest::id; using LSPRequest::LSPRequest; + using LSPRequest::method; - [[nodiscard]] auto method() const -> std::string; auto method(std::string method) -> DidCloseNotebookDocumentNotification&; - - [[nodiscard]] auto id() const -> std::variant; - auto id(long id) -> DidCloseNotebookDocumentNotification&; - auto id(std::string id) -> DidCloseNotebookDocumentNotification&; + auto id(std::variant id) + -> DidCloseNotebookDocumentNotification&; [[nodiscard]] auto params() const -> DidCloseNotebookDocumentParams; auto params(DidCloseNotebookDocumentParams result) @@ -2285,14 +2143,12 @@ class DidCloseNotebookDocumentNotification final : public LSPRequest { class InitializedNotification final : public LSPRequest { public: + using LSPRequest::id; using LSPRequest::LSPRequest; + using LSPRequest::method; - [[nodiscard]] auto method() const -> std::string; auto method(std::string method) -> InitializedNotification&; - - [[nodiscard]] auto id() const -> std::variant; - auto id(long id) -> InitializedNotification&; - auto id(std::string id) -> InitializedNotification&; + auto id(std::variant id) -> InitializedNotification&; [[nodiscard]] auto params() const -> InitializedParams; auto params(InitializedParams result) -> InitializedNotification&; @@ -2300,26 +2156,23 @@ class InitializedNotification final : public LSPRequest { class ExitNotification final : public LSPRequest { public: + using LSPRequest::id; using LSPRequest::LSPRequest; + using LSPRequest::method; - [[nodiscard]] auto method() const -> std::string; auto method(std::string method) -> ExitNotification&; - - [[nodiscard]] auto id() const -> std::variant; - auto id(long id) -> ExitNotification&; - auto id(std::string id) -> ExitNotification&; + auto id(std::variant id) -> ExitNotification&; }; class DidChangeConfigurationNotification final : public LSPRequest { public: + using LSPRequest::id; using LSPRequest::LSPRequest; + using LSPRequest::method; - [[nodiscard]] auto method() const -> std::string; auto method(std::string method) -> DidChangeConfigurationNotification&; - - [[nodiscard]] auto id() const -> std::variant; - auto id(long id) -> DidChangeConfigurationNotification&; - auto id(std::string id) -> DidChangeConfigurationNotification&; + auto id(std::variant id) + -> DidChangeConfigurationNotification&; [[nodiscard]] auto params() const -> DidChangeConfigurationParams; auto params(DidChangeConfigurationParams result) @@ -2328,14 +2181,12 @@ class DidChangeConfigurationNotification final : public LSPRequest { class ShowMessageNotification final : public LSPRequest { public: + using LSPRequest::id; using LSPRequest::LSPRequest; + using LSPRequest::method; - [[nodiscard]] auto method() const -> std::string; auto method(std::string method) -> ShowMessageNotification&; - - [[nodiscard]] auto id() const -> std::variant; - auto id(long id) -> ShowMessageNotification&; - auto id(std::string id) -> ShowMessageNotification&; + auto id(std::variant id) -> ShowMessageNotification&; [[nodiscard]] auto params() const -> ShowMessageParams; auto params(ShowMessageParams result) -> ShowMessageNotification&; @@ -2343,14 +2194,12 @@ class ShowMessageNotification final : public LSPRequest { class LogMessageNotification final : public LSPRequest { public: + using LSPRequest::id; using LSPRequest::LSPRequest; + using LSPRequest::method; - [[nodiscard]] auto method() const -> std::string; auto method(std::string method) -> LogMessageNotification&; - - [[nodiscard]] auto id() const -> std::variant; - auto id(long id) -> LogMessageNotification&; - auto id(std::string id) -> LogMessageNotification&; + auto id(std::variant id) -> LogMessageNotification&; [[nodiscard]] auto params() const -> LogMessageParams; auto params(LogMessageParams result) -> LogMessageNotification&; @@ -2358,14 +2207,12 @@ class LogMessageNotification final : public LSPRequest { class TelemetryEventNotification final : public LSPRequest { public: + using LSPRequest::id; using LSPRequest::LSPRequest; + using LSPRequest::method; - [[nodiscard]] auto method() const -> std::string; auto method(std::string method) -> TelemetryEventNotification&; - - [[nodiscard]] auto id() const -> std::variant; - auto id(long id) -> TelemetryEventNotification&; - auto id(std::string id) -> TelemetryEventNotification&; + auto id(std::variant id) -> TelemetryEventNotification&; [[nodiscard]] auto params() const -> LSPAny; auto params(LSPAny result) -> TelemetryEventNotification&; @@ -2373,14 +2220,13 @@ class TelemetryEventNotification final : public LSPRequest { class DidOpenTextDocumentNotification final : public LSPRequest { public: + using LSPRequest::id; using LSPRequest::LSPRequest; + using LSPRequest::method; - [[nodiscard]] auto method() const -> std::string; auto method(std::string method) -> DidOpenTextDocumentNotification&; - - [[nodiscard]] auto id() const -> std::variant; - auto id(long id) -> DidOpenTextDocumentNotification&; - auto id(std::string id) -> DidOpenTextDocumentNotification&; + auto id(std::variant id) + -> DidOpenTextDocumentNotification&; [[nodiscard]] auto params() const -> DidOpenTextDocumentParams; auto params(DidOpenTextDocumentParams result) @@ -2389,14 +2235,13 @@ class DidOpenTextDocumentNotification final : public LSPRequest { class DidChangeTextDocumentNotification final : public LSPRequest { public: + using LSPRequest::id; using LSPRequest::LSPRequest; + using LSPRequest::method; - [[nodiscard]] auto method() const -> std::string; auto method(std::string method) -> DidChangeTextDocumentNotification&; - - [[nodiscard]] auto id() const -> std::variant; - auto id(long id) -> DidChangeTextDocumentNotification&; - auto id(std::string id) -> DidChangeTextDocumentNotification&; + auto id(std::variant id) + -> DidChangeTextDocumentNotification&; [[nodiscard]] auto params() const -> DidChangeTextDocumentParams; auto params(DidChangeTextDocumentParams result) @@ -2405,14 +2250,13 @@ class DidChangeTextDocumentNotification final : public LSPRequest { class DidCloseTextDocumentNotification final : public LSPRequest { public: + using LSPRequest::id; using LSPRequest::LSPRequest; + using LSPRequest::method; - [[nodiscard]] auto method() const -> std::string; auto method(std::string method) -> DidCloseTextDocumentNotification&; - - [[nodiscard]] auto id() const -> std::variant; - auto id(long id) -> DidCloseTextDocumentNotification&; - auto id(std::string id) -> DidCloseTextDocumentNotification&; + auto id(std::variant id) + -> DidCloseTextDocumentNotification&; [[nodiscard]] auto params() const -> DidCloseTextDocumentParams; auto params(DidCloseTextDocumentParams result) @@ -2421,14 +2265,13 @@ class DidCloseTextDocumentNotification final : public LSPRequest { class DidSaveTextDocumentNotification final : public LSPRequest { public: + using LSPRequest::id; using LSPRequest::LSPRequest; + using LSPRequest::method; - [[nodiscard]] auto method() const -> std::string; auto method(std::string method) -> DidSaveTextDocumentNotification&; - - [[nodiscard]] auto id() const -> std::variant; - auto id(long id) -> DidSaveTextDocumentNotification&; - auto id(std::string id) -> DidSaveTextDocumentNotification&; + auto id(std::variant id) + -> DidSaveTextDocumentNotification&; [[nodiscard]] auto params() const -> DidSaveTextDocumentParams; auto params(DidSaveTextDocumentParams result) @@ -2437,14 +2280,13 @@ class DidSaveTextDocumentNotification final : public LSPRequest { class WillSaveTextDocumentNotification final : public LSPRequest { public: + using LSPRequest::id; using LSPRequest::LSPRequest; + using LSPRequest::method; - [[nodiscard]] auto method() const -> std::string; auto method(std::string method) -> WillSaveTextDocumentNotification&; - - [[nodiscard]] auto id() const -> std::variant; - auto id(long id) -> WillSaveTextDocumentNotification&; - auto id(std::string id) -> WillSaveTextDocumentNotification&; + auto id(std::variant id) + -> WillSaveTextDocumentNotification&; [[nodiscard]] auto params() const -> WillSaveTextDocumentParams; auto params(WillSaveTextDocumentParams result) @@ -2453,14 +2295,13 @@ class WillSaveTextDocumentNotification final : public LSPRequest { class DidChangeWatchedFilesNotification final : public LSPRequest { public: + using LSPRequest::id; using LSPRequest::LSPRequest; + using LSPRequest::method; - [[nodiscard]] auto method() const -> std::string; auto method(std::string method) -> DidChangeWatchedFilesNotification&; - - [[nodiscard]] auto id() const -> std::variant; - auto id(long id) -> DidChangeWatchedFilesNotification&; - auto id(std::string id) -> DidChangeWatchedFilesNotification&; + auto id(std::variant id) + -> DidChangeWatchedFilesNotification&; [[nodiscard]] auto params() const -> DidChangeWatchedFilesParams; auto params(DidChangeWatchedFilesParams result) @@ -2469,14 +2310,13 @@ class DidChangeWatchedFilesNotification final : public LSPRequest { class PublishDiagnosticsNotification final : public LSPRequest { public: + using LSPRequest::id; using LSPRequest::LSPRequest; + using LSPRequest::method; - [[nodiscard]] auto method() const -> std::string; auto method(std::string method) -> PublishDiagnosticsNotification&; - - [[nodiscard]] auto id() const -> std::variant; - auto id(long id) -> PublishDiagnosticsNotification&; - auto id(std::string id) -> PublishDiagnosticsNotification&; + auto id(std::variant id) + -> PublishDiagnosticsNotification&; [[nodiscard]] auto params() const -> PublishDiagnosticsParams; auto params(PublishDiagnosticsParams result) @@ -2485,14 +2325,12 @@ class PublishDiagnosticsNotification final : public LSPRequest { class SetTraceNotification final : public LSPRequest { public: + using LSPRequest::id; using LSPRequest::LSPRequest; + using LSPRequest::method; - [[nodiscard]] auto method() const -> std::string; auto method(std::string method) -> SetTraceNotification&; - - [[nodiscard]] auto id() const -> std::variant; - auto id(long id) -> SetTraceNotification&; - auto id(std::string id) -> SetTraceNotification&; + auto id(std::variant id) -> SetTraceNotification&; [[nodiscard]] auto params() const -> SetTraceParams; auto params(SetTraceParams result) -> SetTraceNotification&; @@ -2500,14 +2338,12 @@ class SetTraceNotification final : public LSPRequest { class LogTraceNotification final : public LSPRequest { public: + using LSPRequest::id; using LSPRequest::LSPRequest; + using LSPRequest::method; - [[nodiscard]] auto method() const -> std::string; auto method(std::string method) -> LogTraceNotification&; - - [[nodiscard]] auto id() const -> std::variant; - auto id(long id) -> LogTraceNotification&; - auto id(std::string id) -> LogTraceNotification&; + auto id(std::variant id) -> LogTraceNotification&; [[nodiscard]] auto params() const -> LogTraceParams; auto params(LogTraceParams result) -> LogTraceNotification&; @@ -2515,14 +2351,12 @@ class LogTraceNotification final : public LSPRequest { class CancelNotification final : public LSPRequest { public: + using LSPRequest::id; using LSPRequest::LSPRequest; + using LSPRequest::method; - [[nodiscard]] auto method() const -> std::string; auto method(std::string method) -> CancelNotification&; - - [[nodiscard]] auto id() const -> std::variant; - auto id(long id) -> CancelNotification&; - auto id(std::string id) -> CancelNotification&; + auto id(std::variant id) -> CancelNotification&; [[nodiscard]] auto params() const -> CancelParams; auto params(CancelParams result) -> CancelNotification&; @@ -2530,14 +2364,12 @@ class CancelNotification final : public LSPRequest { class ProgressNotification final : public LSPRequest { public: + using LSPRequest::id; using LSPRequest::LSPRequest; + using LSPRequest::method; - [[nodiscard]] auto method() const -> std::string; auto method(std::string method) -> ProgressNotification&; - - [[nodiscard]] auto id() const -> std::variant; - auto id(long id) -> ProgressNotification&; - auto id(std::string id) -> ProgressNotification&; + auto id(std::variant id) -> ProgressNotification&; [[nodiscard]] auto params() const -> ProgressParams; auto params(ProgressParams result) -> ProgressNotification&;