remove global client state in favor of direct Client on server (#193)

Author: joshuadavidthomas

crates/djls-server/src/client.rs

@@ -1,4 +1,3 @@
-mod client;
 mod completions;
 mod logging;
 mod queue;
@@ -46,13 +45,17 @@ pub fn run() -> Result<()> {
         let stdout = tokio::io::stdout();
 
         let (service, socket) = LspService::build(|client| {
-            client::init_client(client);
-
-            let log_guard = logging::init_tracing(|message_type, message| {
-                client::log_message(message_type, message);
+            let log_guard = logging::init_tracing({
+                let client = client.clone();
+                move |message_type, message| {
+                    let client = client.clone();
+                    tokio::spawn(async move {
+                        client.log_message(message_type, message).await;
+                    });
+                }
             });
 
-            DjangoLanguageServer::new(log_guard)
+            DjangoLanguageServer::new(client, log_guard)
         })
         .finish();
 

crates/djls-server/src/lib.rs

@@ -6,6 +6,7 @@ use djls_workspace::FileKind;
 use tokio::sync::RwLock;
 use tower_lsp_server::jsonrpc::Result as LspResult;
 use tower_lsp_server::lsp_types;
+use tower_lsp_server::Client;
 use tower_lsp_server::LanguageServer;
 use tracing_appender::non_blocking::WorkerGuard;
 
@@ -16,15 +17,18 @@ const SERVER_NAME: &str = "Django Language Server";
 const SERVER_VERSION: &str = "0.1.0";
 
 pub struct DjangoLanguageServer {
+    #[allow(dead_code)] // will be needed when diagnostics and other features are added
+    client: Client,
     session: Arc<RwLock<Option<Session>>>,
     queue: Queue,
     _log_guard: WorkerGuard,
 }
 
 impl DjangoLanguageServer {
     #[must_use]
-    pub fn new(log_guard: WorkerGuard) -> Self {
+    pub fn new(client: Client, log_guard: WorkerGuard) -> Self {
         Self {
+            client,
             session: Arc::new(RwLock::new(None)),
             queue: Queue::new(),
             _log_guard: log_guard,
@@ -131,7 +135,7 @@ impl LanguageServer for DjangoLanguageServer {
     async fn initialized(&self, _params: lsp_types::InitializedParams) {
         tracing::info!("Server received initialized notification.");
 
-        self.with_session_task(|session_arc| async move {
+        self.with_session_task(move |session_arc| async move {
             let project_path_and_venv = {
                 let session_lock = session_arc.read().await;
                 match &*session_lock {