bpp-lsp: Use libfrozen-dev to make request/notification handler maps constexpr

Author: rail5

debian/control

@@ -1,7 +1,7 @@
 Source: bpp
 Priority: optional
 Maintainer: rail5 <[email protected]>
-Build-Depends: debhelper (>= 10), pandoc, antlr4, libantlr4-runtime-dev, perl, nlohmann-json3-dev
+Build-Depends: debhelper (>= 10), pandoc, antlr4, libantlr4-runtime-dev, perl, nlohmann-json3-dev, libfrozen-dev
 Standards-Version: 4.6.2
 Section: utils
 

src/lsp/BashppServer.cpp

@@ -12,6 +12,24 @@
 std::mutex bpp::BashppServer::output_mutex;
 std::mutex bpp::BashppServer::log_mutex;
 
+const frozen::unordered_map<frozen::string, bpp::BashppServer::RequestHandler, 8> bpp::BashppServer::request_handlers = {
+	{frozen::string("initialize"), &BashppServer::handleInitialize},
+	{frozen::string("textDocument/definition"), &BashppServer::handleDefinition},
+	{frozen::string("textDocument/completion"), &BashppServer::handleCompletion},
+	{frozen::string("textDocument/hover"), &BashppServer::handleHover},
+	{frozen::string("textDocument/documentSymbol"), &BashppServer::handleDocumentSymbol},
+	{frozen::string("textDocument/rename"), &BashppServer::handleRename},
+	{frozen::string("textDocument/references"), &BashppServer::handleReferences},
+	{frozen::string("shutdown"), &BashppServer::shutdown}
+};
+
+const frozen::unordered_map<frozen::string, bpp::BashppServer::NotificationHandler, 4> bpp::BashppServer::notification_handlers = {
+	{"textDocument/didOpen", &BashppServer::handleDidOpen},
+	{"textDocument/didChange", &BashppServer::handleDidChange},
+	{"workspace/didChangeWatchedFiles", &BashppServer::handleDidChangeWatchedFiles},
+	{"textDocument/didClose", &BashppServer::handleDidClose}
+};
+
 bpp::BashppServer::BashppServer() {
 	log("Bash++ Language Server initialized.");
 	log("Using ", thread_pool.getThreadCount(), " threads for processing requests.");
@@ -232,9 +250,9 @@ void bpp::BashppServer::processRequest(const GenericRequestMessage& request) {
 	GenericResponseMessage response;
 	response.id = request.id;
 	std::function<GenericResponseMessage(const GenericRequestMessage&)> request_handler = invalidRequestHandler;
-	auto it = request_handlers.find(request.method);
+	auto it = request_handlers.find(frozen::string(request.method.c_str()));
 	if (it != request_handlers.end()) {
-		request_handler = it->second; // Set the handler to the appropriate function
+		request_handler = std::bind(it->second, this, std::placeholders::_1); // Bind the method to the current instance
 	} else {
 		log("No handler found for request method: ", request.method);
 	}
@@ -254,9 +272,9 @@ void bpp::BashppServer::processRequest(const GenericRequestMessage& request) {
 
 void bpp::BashppServer::processNotification(const GenericNotificationMessage& notification) {
 	std::function<void(const GenericNotificationMessage&)> notification_handler = invalidNotificationHandler;
-	auto it = notification_handlers.find(notification.method);
+	auto it = notification_handlers.find(frozen::string(notification.method.c_str()));
 	if (it != notification_handlers.end()) {
-		notification_handler = it->second; // Set the handler to the appropriate function
+		notification_handler = std::bind(it->second, this, std::placeholders::_1); // Bind the method to the current instance
 	} else {
 		log("No handler found for notification method: ", notification.method);
 	}

src/lsp/BashppServer.h

@@ -17,6 +17,9 @@
 #include <nlohmann/json.hpp>
 #include <unistd.h>
 
+#include <frozen/string.h>
+#include <frozen/unordered_map.h>
+
 #include "ThreadPool.h"
 #include "ProgramPool.h"
 
@@ -74,32 +77,19 @@ class BashppServer {
 		static std::mutex output_mutex; // Mutex for thread-safe output
 		static std::mutex log_mutex; // Mutex for thread-safe logging
 
-		// TODO(@rail5): When Debian 13 is released, use libfrozen-dev to make these maps constexpr
+		using RequestHandler = GenericResponseMessage (BashppServer::*)(const GenericRequestMessage&);
+		using NotificationHandler = void (BashppServer::*)(const GenericNotificationMessage&);
 		/**
 		 * @brief Maps request types to the functions that handle them.
 		 * 
 		 */
-		const std::unordered_map<std::string, std::function<GenericResponseMessage(const GenericRequestMessage& )>> request_handlers = {
-			{"initialize", std::bind(&BashppServer::handleInitialize, this, std::placeholders::_1)},
-			{"textDocument/definition", std::bind(&BashppServer::handleDefinition, this, std::placeholders::_1)},
-			{"textDocument/completion", std::bind(&BashppServer::handleCompletion, this, std::placeholders::_1)},
-			{"textDocument/hover", std::bind(&BashppServer::handleHover, this, std::placeholders::_1)},
-			{"textDocument/documentSymbol", std::bind(&BashppServer::handleDocumentSymbol, this, std::placeholders::_1)},
-			{"textDocument/rename", std::bind(&BashppServer::handleRename, this, std::placeholders::_1)},
-			{"textDocument/references", std::bind(&BashppServer::handleReferences, this, std::placeholders::_1)},
-			{"shutdown", std::bind(&BashppServer::shutdown, this, std::placeholders::_1)}
-		};
+		static const frozen::unordered_map<frozen::string, RequestHandler, 8> request_handlers;
 
 		/**
 		 * @brief Maps notification types to the functions that handle them.
 		 * 
 		 */
-		const std::unordered_map<std::string, std::function<void(const GenericNotificationMessage& )>> notification_handlers = {
-			{"textDocument/didOpen", std::bind(&BashppServer::handleDidOpen, this, std::placeholders::_1)},
-			{"textDocument/didChange", std::bind(&BashppServer::handleDidChange, this, std::placeholders::_1)},
-			{"workspace/didChangeWatchedFiles", std::bind(&BashppServer::handleDidChangeWatchedFiles, this, std::placeholders::_1)},
-			{"textDocument/didClose", std::bind(&BashppServer::handleDidClose, this, std::placeholders::_1)}
-		};
+		static const frozen::unordered_map<frozen::string, NotificationHandler, 4> notification_handlers;
 
 		static const GenericResponseMessage invalidRequestHandler(const GenericRequestMessage& request);
 		static void invalidNotificationHandler(const GenericNotificationMessage& request);