(lsp) rewrite LSP service using traits

A dashmap of closures was silly. This is much cleaner

Cargo.toml

@@ -48,7 +48,6 @@ crossbeam-channel = { version = "0.5.13" }
 dashmap = { version = "6.1.0" }
 
 # Logging
-log = { version = "0.4.22" }
 tracing = { version = "0.1.41" }
 tracing-subscriber = { version = "0.3.19" }
 console = { version = "0.15.8" }

crates/hdx/src/main.rs

@@ -1,7 +1,7 @@
 use bumpalo::Bump;
 use clap::{crate_version, Parser, Subcommand};
 use hdx_ast::css::StyleSheet;
-use hdx_lsp::server_with_handlers;
+use hdx_lsp::{LSPService, Server};
 use hdx_parser::{CursorStream, ToCursors};
 use miette::{GraphicalReportHandler, GraphicalTheme, NamedSource};
 use std::io;
@@ -141,7 +141,7 @@ fn main() {
 			}
 		}
 		Commands::Lsp {} => {
-			let server = server_with_handlers(crate_version!());
+			let server = Server::new(LSPService::new(crate_version!()));
 			let stderr_log = fmt::layer().with_writer(io::stderr).with_filter(LevelFilter::TRACE);
 			registry().with(stderr_log).with(server.tracer()).init();
 			let thread = server.listen_stdio().unwrap();

crates/hdx_lsp/src/jsonrpc/id.rs

@@ -16,6 +16,12 @@ pub enum Id {
 	String(String),
 }
 
+impl Default for Id {
+	fn default() -> Self {
+		Self::Number(0)
+	}
+}
+
 impl From<&str> for Id {
 	fn from(value: &str) -> Self {
 		Self::String(value.into())

crates/hdx_lsp/src/jsonrpc/message.rs

@@ -1,10 +1,12 @@
 use httparse::{parse_headers, EMPTY_HEADER};
-use serde::{Deserialize, Serialize};
-use serde_json::to_string;
+use serde::{de::DeserializeOwned, Deserialize, Serialize};
+use serde_json::{from_value, to_string, to_value, Error, Value};
 use std::io;
 
 use crate::{Notification, Request, Response};
 
+use super::{ErrorCode, Id};
+
 /// JSON RPC Message
 /// This represents a single message coming in or going out, that is
 /// compliant with the [JSON-RPC 2.0 spec](https://www.jsonrpc.org/specification).
@@ -30,6 +32,49 @@ impl Message {
 			false
 		}
 	}
+
+	#[doc(hidden)]
+	#[inline]
+	pub fn is_initialize_request(&self) -> bool {
+		if let Message::Request(request) = self {
+			matches!(request.method.as_str(), "initialize")
+		} else {
+			false
+		}
+	}
+
+	pub fn method(&self) -> Option<&str> {
+		match self {
+			Message::Request(Request { method, .. }) => Some(method),
+			Message::Notification(Notification { method, .. }) => Some(method),
+			_ => None,
+		}
+	}
+
+	pub fn id(&self) -> Option<Id> {
+		match self {
+			Message::Request(Request { id, .. }) => Some(id.clone()),
+			Message::Notification(_) => None,
+			Message::Response(Response::Ok(id, _)) => Some(id.clone()),
+			Message::Response(Response::Err(id, _, _, _)) => Some(id.clone()),
+		}
+	}
+
+	pub fn from_value<T: DeserializeOwned>(&self) -> Result<T, Error> {
+		match self {
+			Message::Request(Request { params, .. }) => from_value(params.clone()),
+			Message::Notification(Notification { params, .. }) => from_value(params.clone()),
+			Message::Response(Response::Ok(_, params)) => from_value(params.clone()),
+			Message::Response(Response::Err(_, _, _, params)) => from_value(params.clone()),
+		}
+	}
+
+	pub fn from_result(id: Id, result: Result<impl Serialize, ErrorCode>) -> Message {
+		match result {
+			Err(code) => Message::Response(Response::Err(id, code, "".into(), Value::Null)),
+			Ok(value) => Message::Response(Response::Ok(id, to_value(value).unwrap())),
+		}
+	}
 }
 
 impl Message {

crates/hdx_lsp/src/lib.rs

@@ -1,10 +1,10 @@
-mod handlers;
 mod jsonrpc;
 mod server;
+mod service;
 
 #[doc(inline)]
 pub use jsonrpc::*;
 #[doc(inline)]
 pub use server::*;
-
-pub use handlers::*;
+#[doc(inline)]
+pub use service::*;