From 15adc202aba5248e0978464721fb9bf3a421f32d Mon Sep 17 00:00:00 2001
From: Dhruv Manilawala <dhruvmanila@gmail.com>
Date: Mon, 27 May 2024 16:44:10 +0530
Subject: [PATCH 1/2] Avoid flattening global only server settings

---
 .../test/fixtures/settings/global_only.json   | 28 ++++++++++---------
 crates/ruff_server/src/session/settings.rs    |  1 -
 2 files changed, 15 insertions(+), 14 deletions(-)

diff --git a/crates/ruff_server/resources/test/fixtures/settings/global_only.json b/crates/ruff_server/resources/test/fixtures/settings/global_only.json
index 29c9956c77156..0ed3bf16d5526 100644
--- a/crates/ruff_server/resources/test/fixtures/settings/global_only.json
+++ b/crates/ruff_server/resources/test/fixtures/settings/global_only.json
@@ -1,15 +1,17 @@
 {
-    "codeAction": {
-        "disableRuleComment": {
-            "enable": false
-        }
-    },
-    "lint": {
-        "ignore": ["RUF001"],
-        "run": "onSave"
-    },
-    "fixAll": false,
-    "logLevel": "warn",
-    "lineLength": 80,
-    "exclude": ["third_party"]
+    "settings": {
+        "codeAction": {
+            "disableRuleComment": {
+                "enable": false
+            }
+        },
+        "lint": {
+            "ignore": ["RUF001"],
+            "run": "onSave"
+        },
+        "fixAll": false,
+        "logLevel": "warn",
+        "lineLength": 80,
+        "exclude": ["third_party"]
+    }
 }
diff --git a/crates/ruff_server/src/session/settings.rs b/crates/ruff_server/src/session/settings.rs
index bfbfeef5c42fe..00498a86a1d27 100644
--- a/crates/ruff_server/src/session/settings.rs
+++ b/crates/ruff_server/src/session/settings.rs
@@ -130,7 +130,6 @@ enum InitializationOptions {
         workspace_settings: Vec<WorkspaceSettings>,
     },
     GlobalOnly {
-        #[serde(flatten)]
         settings: ClientSettings,
     },
 }

From 0b9fd71e68bcea1b3901554bd19c08361b53a511 Mon Sep 17 00:00:00 2001
From: Dhruv Manilawala <dhruvmanila@gmail.com>
Date: Mon, 27 May 2024 17:47:45 +0530
Subject: [PATCH 2/2] Use `#[serde(default)]`

---
 crates/ruff_server/src/session/settings.rs | 1 +
 1 file changed, 1 insertion(+)

diff --git a/crates/ruff_server/src/session/settings.rs b/crates/ruff_server/src/session/settings.rs
index 00498a86a1d27..c929d0a9ce9b9 100644
--- a/crates/ruff_server/src/session/settings.rs
+++ b/crates/ruff_server/src/session/settings.rs
@@ -130,6 +130,7 @@ enum InitializationOptions {
         workspace_settings: Vec<WorkspaceSettings>,
     },
     GlobalOnly {
+        #[serde(default)]
         settings: ClientSettings,
     },
 }