move initializer to ClientFlags

Author: juleswritescode

crates/pg_lsp/src/client/client_flags.rs

@@ -1,10 +1,36 @@
+use lsp_types::InitializeParams;
+
 /// Contains information about the client's capabilities.
 /// This is used to determine which features the server can use.
 #[derive(Debug, Clone)]
 pub struct ClientFlags {
-    /// If `true`, the server can pull the configuration from the client.
-    pub configuration_pull: bool,
+    /// If `true`, the server can pull configuration from the client.
+    pub has_configuration: bool,
+
+    /// If `true`, the client notifies the server when its configuration changes.
+    pub will_push_configuration: bool,
+}
+
+impl ClientFlags {
+    pub(crate) fn from_initialize_request_params(params: &InitializeParams) -> Self {
+        let has_configuration = params
+            .capabilities
+            .workspace
+            .as_ref()
+            .and_then(|w| w.configuration)
+            .unwrap_or(false);
+
+        let will_push_configuration = params
+            .capabilities
+            .workspace
+            .as_ref()
+            .and_then(|w| w.did_change_configuration)
+            .and_then(|c| c.dynamic_registration)
+            .unwrap_or(false);
 
-    /// If `true`, the client notifies the server when the configuration changes.
-    pub configuration_push: bool,
+        Self {
+            has_configuration,
+            will_push_configuration,
+        }
+    }
 }

crates/pg_lsp/src/main.rs

@@ -4,8 +4,8 @@ use pg_lsp::server::Server;
 #[tokio::main]
 async fn main() -> anyhow::Result<()> {
     let (connection, threads) = Connection::stdio();
-    let server = Server::init(connection)?;
 
+    let server = Server::init(connection)?;
     server.run().await?;
     threads.join()?;
 

crates/pg_lsp/src/server.rs

@@ -127,7 +127,7 @@ impl Server {
 
         connection.initialize_finish(id, serde_json::to_value(result)?)?;
 
-        let client_flags = Arc::new(from_proto::client_flags(params.capabilities));
+        let client_flags = Arc::new(ClientFlags::from_initialize_request_params(&params));
 
         let pool = Arc::new(threadpool::Builder::new().build());
 
@@ -200,7 +200,7 @@ impl Server {
 
         self.compute_debouncer.clear();
 
-        self.pool.execute(move || {
+        tokio::spawn(async move {
             client
                 .send_notification::<ShowMessage>(ShowMessageParams {
                     typ: lsp_types::MessageType::INFO,
@@ -778,7 +778,7 @@ impl Server {
         &mut self,
         params: DidChangeConfigurationParams,
     ) -> anyhow::Result<()> {
-        if self.client_flags.configuration_pull {
+        if self.client_flags.has_configuration {
             self.pull_options();
         } else {
             let options = self.client.parse_options(params.settings)?;
@@ -869,7 +869,7 @@ impl Server {
     }
 
     fn pull_options(&mut self) {
-        if !self.client_flags.configuration_pull {
+        if !self.client_flags.has_configuration {
             return;
         }
 
@@ -899,7 +899,7 @@ impl Server {
     }
 
     fn register_configuration(&mut self) {
-        if self.client_flags.configuration_push {
+        if self.client_flags.will_push_configuration {
             let registration = Registration {
                 id: "pull-config".to_string(),
                 method: DidChangeConfiguration::METHOD.to_string(),

crates/pg_lsp/src/utils/from_proto.rs

@@ -1,5 +1,3 @@
-use crate::client::client_flags::ClientFlags;
-
 use super::line_index_ext::LineIndexExt;
 use pg_base_db::{Change, Document};
 
@@ -17,23 +15,3 @@ pub fn content_changes(
         })
         .collect()
 }
-
-pub fn client_flags(capabilities: lsp_types::ClientCapabilities) -> ClientFlags {
-    let configuration_pull = capabilities
-        .workspace
-        .as_ref()
-        .and_then(|cap| cap.configuration)
-        .unwrap_or(false);
-
-    let configuration_push = capabilities
-        .workspace
-        .as_ref()
-        .and_then(|cap| cap.did_change_configuration)
-        .and_then(|cap| cap.dynamic_registration)
-        .unwrap_or(false);
-
-    ClientFlags {
-        configuration_pull,
-        configuration_push,
-    }
-}