From ccad02407d119113131f72baa71ed01a18435b07 Mon Sep 17 00:00:00 2001 From: Arcticae Date: Wed, 12 Feb 2025 00:05:30 +0100 Subject: [PATCH] Change `client_status` to `server_status` for consistency --- src/lang/db/swapper.rs | 2 +- src/lang/proc_macros/client/mod.rs | 2 +- src/lang/proc_macros/client/status.rs | 4 +-- src/lang/proc_macros/controller.rs | 36 +++++++++++++-------------- src/lang/proc_macros/db.rs | 12 ++++----- 5 files changed, 28 insertions(+), 28 deletions(-) diff --git a/src/lang/db/swapper.rs b/src/lang/db/swapper.rs index 5127e5a1..a04f6ab7 100644 --- a/src/lang/db/swapper.rs +++ b/src/lang/db/swapper.rs @@ -103,7 +103,7 @@ impl AnalysisDatabaseSwapper { new_db.set_inline_macro_plugins(old_db.inline_macro_plugins()); new_db.set_analyzer_plugins(old_db.analyzer_plugins()); - new_db.set_proc_macro_client_status(old_db.proc_macro_client_status()); + new_db.set_proc_macro_server_status(old_db.proc_macro_server_status()); // TODO(#6646): Probably this should not be part of migration as it will be ever growing, // but diagnostics going crazy every 5 minutes are no better. diff --git a/src/lang/proc_macros/client/mod.rs b/src/lang/proc_macros/client/mod.rs index ccf7ccfa..c39a53e5 100644 --- a/src/lang/proc_macros/client/mod.rs +++ b/src/lang/proc_macros/client/mod.rs @@ -14,7 +14,7 @@ use scarb_proc_macro_server_types::methods::expand::{ ExpandAttribute, ExpandAttributeParams, ExpandDerive, ExpandDeriveParams, ExpandInline, ExpandInlineMacroParams, }; -pub use status::ClientStatus; +pub use status::ServerStatus; use tracing::error; use crate::ide::analysis_progress::ProcMacroServerTracker; diff --git a/src/lang/proc_macros/client/status.rs b/src/lang/proc_macros/client/status.rs index 4050966a..75f425ef 100644 --- a/src/lang/proc_macros/client/status.rs +++ b/src/lang/proc_macros/client/status.rs @@ -3,7 +3,7 @@ use std::sync::Arc; use super::ProcMacroClient; #[derive(Debug, Default, Clone)] -pub enum ClientStatus { +pub enum ServerStatus { #[default] Pending, Starting(Arc), @@ -13,7 +13,7 @@ pub enum ClientStatus { Crashed, } -impl ClientStatus { +impl ServerStatus { pub fn ready(&self) -> Option<&ProcMacroClient> { if let Self::Ready(client) = self { Some(client) } else { None } } diff --git a/src/lang/proc_macros/controller.rs b/src/lang/proc_macros/controller.rs index d7d91d75..553b5eec 100644 --- a/src/lang/proc_macros/controller.rs +++ b/src/lang/proc_macros/controller.rs @@ -16,7 +16,7 @@ use scarb_proc_macro_server_types::methods::ProcMacroResult; use tracing::error; use super::client::connection::ProcMacroServerConnection; -use super::client::status::ClientStatus; +use super::client::status::ServerStatus; use super::client::{ProcMacroClient, RequestParams}; use crate::config::Config; use crate::ide::analysis_progress::{ProcMacroServerStatus, ProcMacroServerTracker}; @@ -57,13 +57,13 @@ pub struct ProcMacroClientController { proc_macro_server_tracker: ProcMacroServerTracker, } -impl From<&ClientStatus> for ProcMacroServerStatus { - fn from(value: &ClientStatus) -> Self { +impl From<&ServerStatus> for ProcMacroServerStatus { + fn from(value: &ServerStatus) -> Self { match value { - ClientStatus::Pending => ProcMacroServerStatus::Pending, - ClientStatus::Starting(_) => ProcMacroServerStatus::Starting, - ClientStatus::Ready(_) => ProcMacroServerStatus::Ready, - ClientStatus::Crashed => ProcMacroServerStatus::Crashed, + ServerStatus::Pending => ProcMacroServerStatus::Pending, + ServerStatus::Starting(_) => ProcMacroServerStatus::Starting, + ServerStatus::Ready(_) => ProcMacroServerStatus::Ready, + ServerStatus::Crashed => ProcMacroServerStatus::Crashed, } } } @@ -102,15 +102,15 @@ impl ProcMacroClientController { /// `ClientStatus::Starting` if config allows this. #[tracing::instrument(level = "trace", skip_all)] pub fn on_config_change(&mut self, db: &mut AnalysisDatabase, config: &Config) { - if db.proc_macro_client_status().is_pending() { + if db.proc_macro_server_status().is_pending() { self.try_initialize(db, config); } } - fn set_proc_macro_client_status(&self, db: &mut AnalysisDatabase, client_status: ClientStatus) { - let server_status = ProcMacroServerStatus::from(&client_status); - db.set_proc_macro_client_status(client_status); - self.proc_macro_server_tracker.set_server_status(server_status); + fn set_proc_macro_server_status(&self, db: &mut AnalysisDatabase, server_status: ServerStatus) { + let tracker_server_status = ProcMacroServerStatus::from(&server_status); + db.set_proc_macro_server_status(server_status); + self.proc_macro_server_tracker.set_server_status(tracker_server_status); } /// Forcibly restarts the proc-macro-server, shutting down any currently running instances. @@ -144,8 +144,8 @@ impl ProcMacroClientController { /// If the client is ready, apply all available responses. #[tracing::instrument(level = "trace", skip_all)] pub fn on_response(&mut self, db: &mut AnalysisDatabase, config: &Config) { - match db.proc_macro_client_status() { - ClientStatus::Starting(client) => { + match db.proc_macro_server_status() { + ServerStatus::Starting(client) => { let Ok(defined_macros) = client.finish_initialize() else { self.handle_error(db, config); @@ -164,9 +164,9 @@ impl ProcMacroClientController { db.add_plugin_suite(new_plugin_suite); } - self.set_proc_macro_client_status(db, ClientStatus::Ready(client)); + self.set_proc_macro_server_status(db, ServerStatus::Ready(client)); } - ClientStatus::Ready(client) => { + ServerStatus::Ready(client) => { self.apply_responses(db, config, &client); } _ => {} @@ -205,7 +205,7 @@ impl ProcMacroClientController { client.start_initialize(); - self.set_proc_macro_client_status(db, ClientStatus::Starting(Arc::new(client))); + db.set_proc_macro_server_status(ServerStatus::Starting(Arc::new(client))); } Err(err) => { error!("spawning proc-macro-server failed: {err:?}"); @@ -221,7 +221,7 @@ impl ProcMacroClientController { db: &mut AnalysisDatabase, initialization_failed_info: InitializationFailedInfo, ) { - self.set_proc_macro_client_status(db, ClientStatus::Crashed); + self.set_proc_macro_server_status(db, ServerStatus::Crashed); self.notifier.notify::(ShowMessageParams { typ: MessageType::ERROR, diff --git a/src/lang/proc_macros/db.rs b/src/lang/proc_macros/db.rs index d053c456..2a3a76e7 100644 --- a/src/lang/proc_macros/db.rs +++ b/src/lang/proc_macros/db.rs @@ -7,7 +7,7 @@ use scarb_proc_macro_server_types::methods::expand::{ ExpandAttributeParams, ExpandDeriveParams, ExpandInlineMacroParams, }; -use super::client::ClientStatus; +use super::client::ServerStatus; /// A set of queries that enable access to proc macro client from compiler plugins /// `.generate_code()` methods. @@ -21,7 +21,7 @@ pub trait ProcMacroGroup { fn inline_macro_resolution(&self) -> Arc>; #[salsa::input] - fn proc_macro_client_status(&self) -> ClientStatus; + fn proc_macro_server_status(&self) -> ServerStatus; /// Returns the expansion of attribute macro. fn get_attribute_expansion(&self, params: ExpandAttributeParams) -> ProcMacroResult; @@ -35,7 +35,7 @@ pub fn init_proc_macro_group(db: &mut dyn ProcMacroGroup) { db.set_attribute_macro_resolution(Default::default()); db.set_derive_macro_resolution(Default::default()); db.set_inline_macro_resolution(Default::default()); - db.set_proc_macro_client_status(Default::default()); + db.set_proc_macro_server_status(Default::default()); } fn get_attribute_expansion( @@ -45,7 +45,7 @@ fn get_attribute_expansion( db.attribute_macro_resolution().get(¶ms).cloned().unwrap_or_else(|| { let token_stream = params.item.clone(); - if let Some(client) = db.proc_macro_client_status().ready() { + if let Some(client) = db.proc_macro_server_status().ready() { client.request_attribute(params); } @@ -57,7 +57,7 @@ fn get_derive_expansion(db: &dyn ProcMacroGroup, params: ExpandDeriveParams) -> db.derive_macro_resolution().get(¶ms).cloned().unwrap_or_else(|| { let token_stream = params.item.clone(); - if let Some(client) = db.proc_macro_client_status().ready() { + if let Some(client) = db.proc_macro_server_status().ready() { client.request_derives(params); } @@ -73,7 +73,7 @@ fn get_inline_macros_expansion( // we can't return original node because it will make infinite recursive resolving. let token_stream = TokenStream::new("()".to_string()); - if let Some(client) = db.proc_macro_client_status().ready() { + if let Some(client) = db.proc_macro_server_status().ready() { client.request_inline_macros(params); }