refactor: move icandidate observer back to inkstone core

Author: NoaLand

core/include/scriptorium/core/observer/icandidate_observer.h

@@ -0,0 +1,12 @@
+#pragma once
+
+#include <vector>
+#include <string>
+
+namespace scriptorium::inkstone::core {
+	class icandidate_observer {
+	public:
+        virtual void on_candidate_update(const std::vector<std::string>& candidates, size_t highlight_index) = 0;
+        virtual ~icandidate_observer() = default;
+	};
+}

inkstone/CMakeLists.txt

@@ -1,7 +1,6 @@
 add_library(scriptorium_inkstone_server server.cpp)
 
 target_link_libraries(scriptorium_inkstone_server PUBLIC
-    scriptorium::felt::core::observer
     scriptorium::felt::core::logger
     scriptorium::felt::service::protocol
     scriptorium::felt::infra::utils

inkstone/server.cpp

@@ -3,18 +3,19 @@
 #include <memory>
 #include <string>
 
-#include "scriptorium/felt/core/observer/icandidate_observer.h"
 #include "scriptorium/felt/core/logger/logger_service.h"
 #include "scriptorium/felt/infra/ipc/ipc_server_factory.h"
 
 #include "scriptorium/felt/service/protocol/input_protocol_service.h"
 #include "scriptorium/felt/service/protocol/ui_protocol_service.h"
 
+#include "scriptorium/core/observer/icandidate_observer.h"
+
 namespace scriptorium::inkstone {
 	const std::string INPUT_PROTOCOL_PIPE_NAME = R"(\\.\pipe\scriptorium_input_protocol_pipe)";
 	const std::string UI_PROTOCOL_PIPE_NAME = R"(\\.\pipe\scriptorium_ui_protocol_pipe)";
 
-	class ui_bridge : public felt::core::icandidate_observer {
+	class ui_bridge : public core::icandidate_observer {
 	public:
 		explicit ui_bridge(std::unique_ptr<felt::core::ipc::iasync_ipc_server<std::string, std::string>> pipe)
 			: async_server_(std::move(pipe)) {}

manager/CMakeLists.txt

@@ -7,7 +7,6 @@ add_library(scriptorium_inkstone_manager STATIC
 target_link_libraries(
     scriptorium_inkstone_manager
     PRIVATE
-    scriptorium::felt::core::observer
     scriptorium::felt::core::protocol
     scriptorium::felt::core::logger
     scriptorium::inkstone::core

manager/include/scriptorium/manager/candidate_manager.h

@@ -5,7 +5,7 @@
 #include <string>
 #include <shared_mutex>
 
-#include "scriptorium/felt/core/observer/icandidate_observer.h"
+#include "scriptorium/core/observer/icandidate_observer.h"
 
 namespace scriptorium::inkstone::manager {
 	class candidate_manager {
@@ -18,13 +18,13 @@ namespace scriptorium::inkstone::manager {
 
 		[[nodiscard]] const std::vector<std::string>& get_candidates() const;
 
-		void add_observer(std::shared_ptr<felt::core::icandidate_observer> observer);
-		void remove_observer(const std::shared_ptr<felt::core::icandidate_observer>& observer);
+		void add_observer(std::shared_ptr<core::icandidate_observer> observer);
+		void remove_observer(const std::shared_ptr<core::icandidate_observer>& observer);
 	private:
 		std::vector<std::string> candidates_;
 		size_t highlight_index_{0};
 
-		std::vector<std::shared_ptr<felt::core::icandidate_observer>> observers_;
+		std::vector<std::shared_ptr<core::icandidate_observer>> observers_;
 
 		mutable std::shared_mutex mutex_;
 

manager/src/candidate_manager.cpp

@@ -49,7 +49,7 @@ namespace scriptorium::inkstone::manager {
         return candidates_;
     }
 
-    void candidate_manager::add_observer(std::shared_ptr<felt::core::icandidate_observer> observer) {
+    void candidate_manager::add_observer(std::shared_ptr<core::icandidate_observer> observer) {
        std::unique_lock lock(mutex_);
 
        if (std::ranges::find(observers_, observer) == observers_.end()) {
@@ -58,7 +58,7 @@ namespace scriptorium::inkstone::manager {
        }
     }
 
-    void candidate_manager::remove_observer(const std::shared_ptr<felt::core::icandidate_observer>& observer) {
+    void candidate_manager::remove_observer(const std::shared_ptr<core::icandidate_observer>& observer) {
        std::unique_lock lock(mutex_);
 
        const auto old_size = observers_.size();
@@ -70,7 +70,7 @@ namespace scriptorium::inkstone::manager {
     }
 
    void candidate_manager::notify_observers() const {
-      std::vector<std::shared_ptr<felt::core::icandidate_observer>> observers_copy;
+      std::vector<std::shared_ptr<core::icandidate_observer>> observers_copy;
       {
          std::shared_lock lock(mutex_);
          observers_copy = observers_;

tests/unit_tests/CMakeLists.txt

@@ -6,7 +6,6 @@ add_executable(scriptorium_inkstone_unit_tests
 )
 
 target_link_libraries(scriptorium_inkstone_unit_tests PRIVATE
-    scriptorium::felt::core::observer
     scriptorium::felt::infra::utils
     scriptorium::inkstone::core
     scriptorium::inkstone::manager

tests/unit_tests/manager/candidate_manager_test.cpp

@@ -3,7 +3,7 @@
 
 #include "scriptorium/manager/candidate_manager.h"
 
-class mock_observer : public scriptorium::felt::core::icandidate_observer {
+class mock_observer : public scriptorium::inkstone::core::icandidate_observer {
 public:
 	MOCK_METHOD(void, on_candidate_update, (const std::vector<std::string>&, size_t), (override));
 };
@@ -20,7 +20,7 @@ TEST(candidate_manager_test, ShouldNotifyObserverOnUpdate) {
 	manager->update_candidates({"ni", "hao"});
 }
 
-class suicidal_observer : public scriptorium::felt::core::icandidate_observer, public std::enable_shared_from_this<suicidal_observer> {
+class suicidal_observer : public scriptorium::inkstone::core::icandidate_observer, public std::enable_shared_from_this<suicidal_observer> {
 public:
 	std::weak_ptr<scriptorium::inkstone::manager::candidate_manager> manager_weak_;
 	int call_count_ = 0;