language server code cleanup

Author: micahscopes

crates/language-server/src/backend.rs

@@ -1,6 +1,5 @@
 use std::sync::Arc;
-use std::sync::{Mutex, MutexGuard};
-// use tokio::sync::{Mutex, MutexGuard};
+use std::sync::Mutex;
 
 use crate::db::LanguageServerDatabase;
 
@@ -18,14 +17,6 @@ pub struct Backend {
 }
 
 impl Backend {
-    // pub(crate) fn db(&self) -> MutexGuard<LanguageServerDatabase> {
-    //     self.db.lock().unwrap()
-    // }
-
-    // pub(crate) fn workspace(&self) -> MutexGuard<Workspace> {
-    //     self.workspace.lock().unwrap()
-    // }
-
     pub fn new(client: Client) -> Self {
         let db = Arc::new(Mutex::new(LanguageServerDatabase::default()));
         let workspace = Arc::new(Mutex::new(Workspace::default()));

crates/language-server/src/language_server.rs

@@ -4,8 +4,7 @@ use lsp_types::{
     TextDocumentItem,
 };
 
-use tokio::sync::MutexGuard;
-use tower_lsp::{jsonrpc::Result, Client, LanguageServer};
+use tower_lsp::{jsonrpc::Result, LanguageServer};
 
 use crate::{
     backend::Backend,
@@ -188,12 +187,11 @@ async fn on_change(backend: &Backend, params: TextDocumentItem) {
     };
 
     let client = backend.client.lock().await;
-    let diagnostics = 
-        diagnostics
-            .unwrap()
-            .into_iter()
-            .map(|(uri, diags)| client.publish_diagnostics(uri, diags, None))
-            .collect::<Vec<_>>();
+    let diagnostics = diagnostics
+        .unwrap()
+        .into_iter()
+        .map(|(uri, diags)| client.publish_diagnostics(uri, diags, None))
+        .collect::<Vec<_>>();
 
     futures::future::join_all(diagnostics).await;
 }

crates/language-server/src/logger.rs

@@ -23,7 +23,7 @@ impl log::Log for Logger {
             let level = record.level();
             let client = self.client.clone();
             tokio::spawn(async move {
-                let mut client = client.lock().await;
+                let client = client.lock().await;
                 client
                     .log_message(
                         match level {
@@ -37,22 +37,6 @@ impl log::Log for Logger {
                     )
                     .await;
             });
-            // let client = self.client.clone();
-            // tokio::task::spawn_blocking(async move {
-            //     let client = client.lock().await;
-            //     client
-            //         .log_message(
-            //             match level {
-            //                 log::Level::Error => lsp_types::MessageType::ERROR,
-            //                 log::Level::Warn => lsp_types::MessageType::WARNING,
-            //                 log::Level::Info => lsp_types::MessageType::INFO,
-            //                 log::Level::Debug => lsp_types::MessageType::LOG,
-            //                 log::Level::Trace => lsp_types::MessageType::LOG,
-            //             },
-            //             message,
-            //         )
-            //         .await;
-            // });
         }
     }
 

crates/language-server/src/workspace.rs

@@ -384,8 +384,8 @@ impl IngotFileContext for Workspace {
         new_path: &str,
     ) -> Result<()> {
         let ctx = get_containing_ingot(&mut self.ingot_contexts, old_path);
-        if ctx.is_some() {
-            ctx.unwrap().rename_file(db, old_path, new_path)
+        if let Some(ctx) = ctx {
+            ctx.rename_file(db, old_path, new_path)
         } else {
             self.standalone_ingot_context
                 .rename_file(db, old_path, new_path)