fix: normalize SCSS/Sass workspace configuration

Ensure vscode-css-language-server and some-sass receive non-null, root-keyed workspace config payloads to prevent missing diagnostics and config lookup failures.

Fixes #31

Author: bajrangCoder

src/language_servers.rs

@@ -1,5 +1,7 @@
+mod config;
 mod scss_lsp;
 mod some_sass;
 
+pub use config::*;
 pub use scss_lsp::*;
 pub use some_sass::*;

src/language_servers/config.rs

@@ -0,0 +1,30 @@
+use zed_extension_api::{self as zed, settings::LspSettings, LanguageServerId};
+
+pub fn merge_json_value(target: &mut zed::serde_json::Value, source: zed::serde_json::Value) {
+    match (target, source) {
+        (zed::serde_json::Value::Object(target), zed::serde_json::Value::Object(source)) => {
+            for (key, value) in source {
+                merge_json_value(
+                    target.entry(key).or_insert(zed::serde_json::Value::Null),
+                    value,
+                );
+            }
+        }
+        (target, source) => *target = source,
+    }
+}
+
+pub fn settings_from_worktree(
+    language_server_id: &LanguageServerId,
+    worktree: &zed::Worktree,
+) -> Option<zed::serde_json::Value> {
+    LspSettings::for_worktree(language_server_id.as_ref(), worktree)
+        .ok()
+        .and_then(|lsp_settings| {
+            lsp_settings.settings.or_else(|| {
+                lsp_settings
+                    .initialization_options
+                    .and_then(|opts| opts.get("settings").cloned())
+            })
+        })
+}

src/language_servers/scss_lsp.rs

@@ -2,6 +2,8 @@ use std::{env, fs};
 
 use zed_extension_api::{self as zed, settings::LspSettings, LanguageServerId, Result};
 
+use super::{merge_json_value, settings_from_worktree};
+
 const SERVER_PATH: &str =
     "node_modules/vscode-langservers-extracted/bin/vscode-css-language-server";
 const PACKAGE_NAME: &str = "vscode-langservers-extracted";
@@ -107,13 +109,30 @@ impl SCSSLsp {
         language_server_id: &LanguageServerId,
         worktree: &zed::Worktree,
     ) -> Result<Option<zed::serde_json::Value>> {
-        if let Ok(Some(settings)) = LspSettings::for_worktree(language_server_id.as_ref(), worktree)
-            .map(|lsp_settings| lsp_settings.settings)
-        {
-            Ok(Some(settings))
-        } else {
-            self.language_server_initialization_options(language_server_id, worktree)
-                .map(|init_options| init_options.and_then(|opts| opts.get("settings").cloned()))
+        let mut config = zed::serde_json::json!({
+            "css": {
+                "lint": {}
+            },
+            "less": {
+                "lint": {}
+            },
+            "scss": {
+                "lint": {}
+            }
+        });
+
+        if let Some(settings) = settings_from_worktree(language_server_id, worktree) {
+            let has_css_roots = settings.get("scss").is_some()
+                || settings.get("css").is_some()
+                || settings.get("less").is_some();
+
+            if has_css_roots {
+                merge_json_value(&mut config, settings);
+            } else if let Some(scss_config) = config.get_mut("scss") {
+                merge_json_value(scss_config, settings);
+            }
         }
+
+        Ok(Some(config))
     }
 }

src/language_servers/some_sass.rs

@@ -2,6 +2,8 @@ use std::{env, fs};
 
 use zed_extension_api::{self as zed, settings::LspSettings, LanguageServerId, Result};
 
+use super::{merge_json_value, settings_from_worktree};
+
 const SERVER_PATH: &str = "node_modules/some-sass-language-server/bin/some-sass-language-server";
 const PACKAGE_NAME: &str = "some-sass-language-server";
 
@@ -106,13 +108,18 @@ impl SomeSass {
         language_server_id: &LanguageServerId,
         worktree: &zed::Worktree,
     ) -> Result<Option<zed::serde_json::Value>> {
-        if let Ok(Some(settings)) = LspSettings::for_worktree(language_server_id.as_ref(), worktree)
-            .map(|lsp_settings| lsp_settings.settings)
-        {
-            Ok(Some(settings))
-        } else {
-            self.language_server_initialization_options(language_server_id, worktree)
-                .map(|init_options| init_options.and_then(|opts| opts.get("settings").cloned()))
+        let mut config = zed::serde_json::json!({
+            "somesass": {}
+        });
+
+        if let Some(settings) = settings_from_worktree(language_server_id, worktree) {
+            if settings.get("somesass").is_some() {
+                merge_json_value(&mut config, settings);
+            } else if let Some(somesass_config) = config.get_mut("somesass") {
+                merge_json_value(somesass_config, settings);
+            }
         }
+
+        Ok(Some(config))
     }
 }