Settings refactor (#38367)

Co-Authored-By: Ben K <ben@zed.dev>
Co-Authored-By: Anthony <anthony@zed.dev>
Co-Authored-By: Mikayla <mikayla@zed.dev>

Release Notes:

- settings: Major internal changes to settings. The primary user-facing
effect is that some settings which did not make sense in project
settings files are no-longer read from there. (For example the inline
blame settings)

---------

Co-authored-by: Ben Kunkle <ben@zed.dev>
Co-authored-by: Mikayla Maki <mikayla.c.maki@gmail.com>
Co-authored-by: Anthony <anthony@zed.dev>

crates/theme/src/styles/accents.rs

@@ -2,8 +2,8 @@ use gpui::Hsla;
 use serde::Deserialize;
 
 use crate::{
-    AccentContent, amber, blue, cyan, gold, grass, indigo, iris, jade, lime, orange, pink, purple,
-    tomato, try_parse_color,
+    amber, blue, cyan, gold, grass, indigo, iris, jade, lime, orange, pink, purple, tomato,
+    try_parse_color,
 };
 
 /// A collection of colors that are used to color indent aware lines in the editor.
@@ -66,7 +66,7 @@ impl AccentColors {
     }
 
     /// Merges the given accent colors into this [`AccentColors`] instance.
-    pub fn merge(&mut self, accent_colors: &[AccentContent]) {
+    pub fn merge(&mut self, accent_colors: &[settings::AccentContent]) {
         if accent_colors.is_empty() {
             return;
         }

crates/theme/src/styles/players.rs

@@ -3,9 +3,7 @@
 use gpui::Hsla;
 use serde::Deserialize;
 
-use crate::{
-    PlayerColorContent, amber, blue, jade, lime, orange, pink, purple, red, try_parse_color,
-};
+use crate::{amber, blue, jade, lime, orange, pink, purple, red, try_parse_color};
 
 #[derive(Debug, Clone, Copy, Deserialize, Default, PartialEq)]
 pub struct PlayerColor {
@@ -152,7 +150,7 @@ impl PlayerColors {
     }
 
     /// Merges the given player colors into this [`PlayerColors`] instance.
-    pub fn merge(&mut self, user_player_colors: &[PlayerColorContent]) {
+    pub fn merge(&mut self, user_player_colors: &[settings::PlayerColorContent]) {
         if user_player_colors.is_empty() {
             return;
         }