diff --git a/lsp-server/src/core/dispacther.cpp b/lsp-server/src/core/dispacther.cpp index 2f616d0..dc11214 100644 --- a/lsp-server/src/core/dispacther.cpp +++ b/lsp-server/src/core/dispacther.cpp @@ -19,10 +19,10 @@ namespace lsp::core spdlog::debug("RequestScheduler set in dispatcher"); } - void RequestDispatcher::SetDocumentManager(services::DocumentManager* document_manager) + void RequestDispatcher::SetDocumentService(services::DocumentService* document_manager) { - document_manager_ = document_manager; - spdlog::debug("DocumentManager is set in dispatcher"); + document_service_ = document_manager; + spdlog::debug("DocumentService is set in dispatcher"); } void RequestDispatcher::RegisterRequestProvider(std::shared_ptr provider) @@ -52,7 +52,7 @@ namespace lsp::core std::string RequestDispatcher::Dispatch(const protocol::RequestMessage& request) { - providers::ExecutionContext context(scheduler_, context_lifecycle_callback_, document_manager_); + providers::ExecutionContext context(scheduler_, context_lifecycle_callback_, document_service_); std::shared_lock lock(providers_mutex_); auto it = providers_.find(request.method); @@ -76,7 +76,7 @@ namespace lsp::core void RequestDispatcher::Dispatch(const protocol::NotificationMessage& notification) { - providers::ExecutionContext context(scheduler_, context_lifecycle_callback_, document_manager_); + providers::ExecutionContext context(scheduler_, context_lifecycle_callback_, document_service_); std::shared_lock lock(notification_providers_mutex_); // 先尝试精确匹配 diff --git a/lsp-server/src/core/dispacther.hpp b/lsp-server/src/core/dispacther.hpp index f265178..2576ce5 100644 --- a/lsp-server/src/core/dispacther.hpp +++ b/lsp-server/src/core/dispacther.hpp @@ -15,7 +15,7 @@ namespace lsp::core ~RequestDispatcher() = default; void SetRequestScheduler(scheduler::RequestScheduler* scheduler); - void SetDocumentManager(services::DocumentManager* document_manager); + void SetDocumentService(services::DocumentService* document_manager); void RegisterRequestProvider(std::shared_ptr provider); void RegisterNotificationProvider(std::shared_ptr provider); @@ -52,7 +52,6 @@ namespace lsp::core // 服务引用 scheduler::RequestScheduler* scheduler_ = nullptr; - services::DocumentManager* document_manager_ = nullptr; + services::DocumentService* document_service_ = nullptr; }; - } diff --git a/lsp-server/src/core/server.cpp b/lsp-server/src/core/server.cpp index 8e24cdd..d3e7f72 100644 --- a/lsp-server/src/core/server.cpp +++ b/lsp-server/src/core/server.cpp @@ -279,7 +279,7 @@ namespace lsp::core void LspServer::InitializeCoreServices() { - spdlog::debug("Initializing core services..."); + spdlog::debug("Initializing core services..."); dispatcher_.SetRequestScheduler(&scheduler_); @@ -300,8 +300,8 @@ namespace lsp::core { spdlog::debug("Initializing extension services..."); - document_manager_ = std::make_unique(); - dispatcher_.SetDocumentManager(document_manager_.get()); + document_service_ = std::make_unique(); + dispatcher_.SetDocumentService(document_service_.get()); spdlog::debug("Extension services initialized"); } diff --git a/lsp-server/src/core/server.hpp b/lsp-server/src/core/server.hpp index c730875..49777c1 100644 --- a/lsp-server/src/core/server.hpp +++ b/lsp-server/src/core/server.hpp @@ -55,7 +55,7 @@ namespace lsp::core scheduler::RequestScheduler scheduler_; // 可选/扩展组件 -- 所以用智能指针 - std::unique_ptr document_manager_; + std::unique_ptr document_service_; std::atomic is_initialized_ = false; std::atomic is_shutting_down_ = false; diff --git a/lsp-server/src/provider/base/provider_interface.hpp b/lsp-server/src/provider/base/provider_interface.hpp index e9837a5..ee84f72 100644 --- a/lsp-server/src/provider/base/provider_interface.hpp +++ b/lsp-server/src/provider/base/provider_interface.hpp @@ -21,12 +21,12 @@ namespace lsp::providers class ExecutionContext { public: - ExecutionContext(scheduler::RequestScheduler* scheduler, LifecycleCallback lifecycle_callback, services::DocumentManager* document_manager = nullptr) : - scheduler_(scheduler), lifecycle_callback_(lifecycle_callback), document_manager_(document_manager) {} + ExecutionContext(scheduler::RequestScheduler* scheduler, LifecycleCallback lifecycle_callback, services::DocumentService* document_manager = nullptr) : + scheduler_(scheduler), lifecycle_callback_(lifecycle_callback), document_service_(document_manager) {} scheduler::RequestScheduler* GetScheduler() const { return scheduler_; } - services::DocumentManager* GetDocumentManager() const { return document_manager_; } + services::DocumentService* GetDocumentService() const { return document_service_; } void TriggerLifecycleEvent(ServerLifecycleEvent event) const { @@ -37,7 +37,7 @@ namespace lsp::providers private: scheduler::RequestScheduler* scheduler_; LifecycleCallback lifecycle_callback_; - services::DocumentManager* document_manager_; + services::DocumentService* document_service_; }; // LSP请求提供者接口基类