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..c929d0a9ce9b9 100644 --- a/crates/ruff_server/src/session/settings.rs +++ b/crates/ruff_server/src/session/settings.rs @@ -130,7 +130,7 @@ enum InitializationOptions { workspace_settings: Vec, }, GlobalOnly { - #[serde(flatten)] + #[serde(default)] settings: ClientSettings, }, }