refactor some things

Author: joshuadavidthomas

Cargo.lock

@@ -16,6 +16,7 @@ anyhow = { workspace = true }
 camino = { workspace = true }
 dashmap = { workspace = true }
 percent-encoding = { workspace = true }
+rustc-hash = { workspace = true }
 salsa = { workspace = true }
 serde = { workspace = true }
 serde_json = { workspace = true }

crates/djls-server/Cargo.toml

@@ -1,7 +1,6 @@
-use std::collections::HashMap;
-
 use djls_conf::Settings;
 use djls_source::PositionEncoding;
+use rustc_hash::FxHashMap;
 use serde::Deserialize;
 use serde_json::Value;
 use tower_lsp_server::lsp_types;
@@ -139,21 +138,7 @@ pub struct ClientOptions {
     pub settings: Settings,
 
     #[serde(flatten)]
-    pub unknown: HashMap<String, Value>,
-}
-
-impl ClientOptions {
-    #[must_use]
-    pub fn from_value(value: Option<Value>) -> (Self, Option<serde_json::Error>) {
-        let Some(value) = value else {
-            return (Self::default(), None);
-        };
-
-        match serde_json::from_value::<Self>(value) {
-            Ok(client_opts) => (client_opts, None),
-            Err(err) => (Self::default(), Some(err)),
-        }
-    }
+    pub unknown: FxHashMap<String, Value>,
 }
 
 #[cfg(test)]
@@ -306,77 +291,4 @@ mod tests {
             FileKind::Template
         );
     }
-
-    #[test]
-    fn test_client_options_from_value_none() {
-        let (opts, err) = super::ClientOptions::from_value(None);
-        assert!(err.is_none());
-        assert!(!opts.settings.debug());
-        assert!(opts.unknown.is_empty());
-    }
-
-    #[test]
-    fn test_client_options_from_value_empty_object() {
-        let value = serde_json::json!({});
-        let (opts, err) = super::ClientOptions::from_value(Some(value));
-        assert!(err.is_none());
-        assert!(!opts.settings.debug());
-        assert!(opts.unknown.is_empty());
-    }
-
-    #[test]
-    fn test_client_options_from_value_valid_settings() {
-        let value = serde_json::json!({
-            "debug": true,
-            "venv_path": "/path/to/venv",
-            "django_settings_module": "myproject.settings"
-        });
-        let (opts, err) = super::ClientOptions::from_value(Some(value));
-        assert!(err.is_none());
-        assert!(opts.settings.debug());
-        assert_eq!(opts.settings.venv_path(), Some("/path/to/venv"));
-        assert_eq!(
-            opts.settings.django_settings_module(),
-            Some("myproject.settings")
-        );
-        assert!(opts.unknown.is_empty());
-    }
-
-    #[test]
-    fn test_client_options_from_value_unknown_fields() {
-        let value = serde_json::json!({
-            "debug": true,
-            "unknownOption": "value",
-            "anotherUnknown": 42
-        });
-        let (opts, err) = super::ClientOptions::from_value(Some(value));
-        assert!(err.is_none());
-        assert!(opts.settings.debug());
-        assert_eq!(opts.unknown.len(), 2);
-        assert!(opts.unknown.contains_key("unknownOption"));
-        assert!(opts.unknown.contains_key("anotherUnknown"));
-    }
-
-    #[test]
-    fn test_client_options_from_value_invalid_json() {
-        let value = serde_json::json!({
-            "debug": "not_a_boolean"
-        });
-        let (opts, err) = super::ClientOptions::from_value(Some(value));
-        assert!(err.is_some());
-        assert!(!opts.settings.debug());
-        assert!(opts.unknown.is_empty());
-    }
-
-    #[test]
-    fn test_client_options_from_value_partial_settings() {
-        let value = serde_json::json!({
-            "venv_path": "/custom/venv"
-        });
-        let (opts, err) = super::ClientOptions::from_value(Some(value));
-        assert!(err.is_none());
-        assert!(!opts.settings.debug());
-        assert_eq!(opts.settings.venv_path(), Some("/custom/venv"));
-        assert_eq!(opts.settings.django_settings_module(), None);
-    }
 }

crates/djls-server/src/client.rs

@@ -13,6 +13,7 @@ use tower_lsp_server::lsp_types;
 use tower_lsp_server::UriExt as TowerUriExt;
 
 use crate::client::Client;
+use crate::client::ClientOptions;
 
 pub(crate) trait PositionExt {
     fn to_line_col(&self) -> LineCol;
@@ -96,6 +97,43 @@ impl TextDocumentIdentifierExt for lsp_types::TextDocumentIdentifier {
     }
 }
 
+pub(crate) trait InitializeParamsExt {
+    fn client_options(&self) -> ClientOptions;
+}
+
+impl InitializeParamsExt for lsp_types::InitializeParams {
+    fn client_options(&self) -> ClientOptions {
+        let client_options: ClientOptions = self
+            .initialization_options
+            .as_ref()
+            .and_then(|v| match serde_json::from_value(v.clone()) {
+                Ok(opts) => Some(opts),
+                Err(err) => {
+                    tracing::error!(
+                        "Failed to deserialize initialization options: {}. Using defaults.",
+                        err
+                    );
+                    None
+                }
+            })
+            .unwrap_or_default();
+
+        if !client_options.unknown.is_empty() {
+            tracing::warn!(
+                "Received unknown initialization options: {}",
+                client_options
+                    .unknown
+                    .keys()
+                    .map(String::as_str)
+                    .collect::<Vec<_>>()
+                    .join(", ")
+            );
+        }
+
+        client_options
+    }
+}
+
 pub(crate) trait ClientInfoExt {
     fn to_client(&self) -> Client;
 }

crates/djls-server/src/ext.rs

@@ -14,8 +14,8 @@ use djls_workspace::Workspace;
 use tower_lsp_server::lsp_types;
 
 use crate::client::ClientInfo;
-use crate::client::ClientOptions;
 use crate::db::DjangoDatabase;
+use crate::ext::InitializeParamsExt;
 use crate::ext::TextDocumentContentChangeEventExt;
 use crate::ext::TextDocumentItemExt;
 use crate::ext::UriExt;
@@ -57,29 +57,9 @@ impl Session {
                     .and_then(|p| Utf8PathBuf::from_path_buf(p).ok())
             });
 
-        let (client_opts, deser_error) =
-            ClientOptions::from_value(params.initialization_options.clone());
+        let client_options = params.client_options();
 
-        if let Some(err) = deser_error {
-            tracing::error!(
-                "Failed to deserialize initialization options: {}. Falling back to file-based configuration.",
-                err
-            );
-        }
-
-        if !client_opts.unknown.is_empty() {
-            tracing::warn!(
-                "Received unknown initialization options: {}",
-                client_opts
-                    .unknown
-                    .keys()
-                    .map(String::as_str)
-                    .collect::<Vec<_>>()
-                    .join(", ")
-            );
-        }
-
-        let client_settings = client_opts.settings.clone();
+        let client_settings = client_options.settings.clone();
 
         let workspace = Workspace::new();
         let settings = project_path
@@ -92,7 +72,7 @@ impl Session {
         let client_info = ClientInfo::new(
             &params.capabilities,
             params.client_info.as_ref(),
-            client_opts,
+            client_options,
         );
 
         Self {