diff --git a/crates/lang_srv/src/registry.rs b/crates/lang_srv/src/registry.rs index bfa788811d..7b00e5c61f 100644 --- a/crates/lang_srv/src/registry.rs +++ b/crates/lang_srv/src/registry.rs @@ -41,11 +41,7 @@ pub(crate) struct Registry { impl Registry { pub async fn get_latest_version(&self, url: &Url) -> Option { - self.documents - .lock() - .await - .get(url) - .map(|x| x.info.version) + self.documents.lock().await.get(url).map(|x| x.info.version) } fn update_document( @@ -54,8 +50,9 @@ impl Registry { updating_url: &Url, ) { if &document.doc_info.url == updating_url { - if let Some(a) = documents - .get_mut(updating_url) { a.latest_document.set(document.clone()).unwrap() } + if let Some(a) = documents.get_mut(updating_url) { + a.latest_document.set(document.clone()).unwrap() + } } let url = document.url().clone(); @@ -146,9 +143,8 @@ impl Registry { } pub async fn diagnostics(&self, url: &Url) -> Vec { - let Some( document) = self.latest_document_by_url(url).await else { + let Some(document) = self.latest_document_by_url(url).await else { return vec![]; - }; document.diagnostics() } diff --git a/crates/lang_srv/src/server.rs b/crates/lang_srv/src/server.rs index 0a55547e85..6582f11473 100644 --- a/crates/lang_srv/src/server.rs +++ b/crates/lang_srv/src/server.rs @@ -118,9 +118,7 @@ impl RocServerState { &self.registry } - async fn close(&self, _fi: Url) { - - } + async fn close(&self, _fi: Url) {} pub async fn change( &self, @@ -312,7 +310,7 @@ impl LanguageServer for RocServer { async fn completion(&self, params: CompletionParams) -> Result> { let doc = params.text_document_position; trace!("got completion request"); - + panic_wrapper_async(|| async { self.state .registry @@ -348,14 +346,11 @@ async fn main() { #[cfg(test)] mod tests { - use std::{ - sync::{Once}, - }; + use std::sync::Once; - use indoc::indoc; use expect_test::expect; + use indoc::indoc; use log::info; - use super::*;