settings: Use a derive macro for refine (#38451)

When we refactored settings to not pass JSON blobs around, we ended up
needing
to write *a lot* of code that just merged things (like json merge used
to do).

Use a derive macro to prevent typos in this logic.

Release Notes:

- N/A
This commit is contained in:
Conrad Irwin
2025-09-18 21:13:49 +00:00
committed by GitHub
parent 5f4f0a873e
commit b09764c54a
74 changed files with 1089 additions and 2818 deletions
Generated
+11 -17
View File
@@ -3144,7 +3144,6 @@ dependencies = [
"release_channel",
"rpc",
"rustls-pki-types",
"schemars 1.0.1",
"serde",
"serde_json",
"serde_urlencoded",
@@ -9302,7 +9301,6 @@ dependencies = [
"serde",
"settings",
"shellexpand 2.1.2",
"util",
"workspace",
"workspace-hack",
]
@@ -9523,7 +9521,6 @@ dependencies = [
"http_client",
"imara-diff",
"indoc",
"inventory",
"itertools 0.14.0",
"log",
"lsp",
@@ -15499,7 +15496,7 @@ dependencies = [
"serde_path_to_error",
"serde_repr",
"serde_with",
"settings_ui_macros",
"settings_macros",
"smallvec",
"tree-sitter",
"tree-sitter-json",
@@ -15509,6 +15506,16 @@ dependencies = [
"zlog",
]
[[package]]
name = "settings_macros"
version = "0.1.0"
dependencies = [
"quote",
"settings",
"syn 2.0.101",
"workspace-hack",
]
[[package]]
name = "settings_profile_selector"
version = "0.1.0"
@@ -15530,18 +15537,6 @@ dependencies = [
"zed_actions",
]
[[package]]
name = "settings_ui_macros"
version = "0.1.0"
dependencies = [
"heck 0.5.0",
"proc-macro2",
"quote",
"settings",
"syn 2.0.101",
"workspace-hack",
]
[[package]]
name = "sha1"
version = "0.10.6"
@@ -17190,7 +17185,6 @@ dependencies = [
"futures 0.3.31",
"gpui",
"indexmap 2.9.0",
"inventory",
"log",
"palette",
"parking_lot",