refactor(server): refactor sending requests

g-plane · Jan 30, 2025 · ad22239 · ad22239
1 parent 256e0cc
commit ad22239
Show file tree

Hide file tree

Showing 2 changed files with 10 additions and 5 deletions.
diff --git a/crates/server/src/sent.rs b/crates/server/src/sent.rs
@@ -1,5 +1,6 @@
 use crate::message::Message;
 use rustc_hash::FxHashMap;
+use serde_json::Value;
 
 #[derive(Debug, Default)]
 pub struct SentRequests<T> {
@@ -8,7 +9,13 @@ pub struct SentRequests<T> {
 }
 
 impl<T> SentRequests<T> {
-    pub fn add(&mut self, method: String, params: serde_json::Value, data: T) -> Message {
+    pub fn add(&mut self, method: String, params: Value) -> Message {
+        let id = self.id;
+        self.id += 1;
+        Message::Request { id, method, params }
+    }
+
+    pub fn add_with_data(&mut self, method: String, params: Value, data: T) -> Message {
         let id = self.id;
         self.data.insert(id, data);
         self.id += 1;

diff --git a/crates/server/src/server.rs b/crates/server/src/server.rs
@@ -41,7 +41,6 @@ impl Server {
         stdio::write(self.sent_requests.add(
             RegisterCapability::METHOD.into(),
             serde_json::to_value(self.service.dynamic_capabilities())?,
-            vec![],
         ))
         .await?;
 
@@ -418,7 +417,6 @@ impl Server {
                 stdio::write(self.sent_requests.add(
                     WorkspaceDiagnosticRefresh::METHOD.into(),
                     serde_json::Value::Null,
-                    vec![],
                 ))
                 .await?;
             }
@@ -436,7 +434,7 @@ impl Server {
             self.publish_diagnostics(uri.clone()).await?;
         }
         if self.support_pull_config {
-            stdio::write(self.sent_requests.add(
+            stdio::write(self.sent_requests.add_with_data(
                 WorkspaceConfiguration::METHOD.into(),
                 serde_json::to_value(ConfigurationParams {
                     items: vec![ConfigurationItem {
@@ -476,7 +474,7 @@ impl Server {
                 .map(|(uri, _)| uri)
                 .collect::<Vec<_>>();
             stdio::write(
-                self.sent_requests.add(
+                self.sent_requests.add_with_data(
                     WorkspaceConfiguration::METHOD.into(),
                     serde_json::to_value(ConfigurationParams {
                         items: uris