From 8292ba15ed934e8d975e7b59e3dfa278baace275 Mon Sep 17 00:00:00 2001
From: Max Brunsfeld <maxbrunsfeld@gmail.com>
Date: Wed, 13 Jul 2022 17:05:36 -0700
Subject: [PATCH] Avoid copying all default settings to initial user settings

This would cause top-level default editor settings to override
language-specific default settings.

Co-authored-by: Nathan Sobo <nathan@zed.dev>
---
 ...-comments.json => initial_user_settings.json} |  3 +++
 crates/zed/src/zed.rs                            | 16 ++++++++--------
 2 files changed, 11 insertions(+), 8 deletions(-)
 rename assets/settings/{header-comments.json => initial_user_settings.json} (91%)

diff --git a/assets/settings/header-comments.json b/assets/settings/initial_user_settings.json
similarity index 91%
rename from assets/settings/header-comments.json
rename to assets/settings/initial_user_settings.json
index 6180d310df2959f89e0d4847778e67436b3557de..4c90b8a002d5f8e9ef025df578bfcb5adfc26476 100644
--- a/assets/settings/header-comments.json
+++ b/assets/settings/initial_user_settings.json
@@ -6,3 +6,6 @@
 // To see all of Zed's default settings without changing your
 // custom settings, run the `open default settings` command
 // from the command palette or from `Zed` application menu.
+{
+    "buffer_font_size": 15
+}
diff --git a/crates/zed/src/zed.rs b/crates/zed/src/zed.rs
index a033be4dee7a0b6a9b48e0c66cfe31dc14009810..3a2bbb9be8dc4f1ae99a0b4f5e55067296558033 100644
--- a/crates/zed/src/zed.rs
+++ b/crates/zed/src/zed.rs
@@ -102,14 +102,14 @@ pub fn init(app_state: &Arc<AppState>, cx: &mut gpui::MutableAppContext) {
         let app_state = app_state.clone();
         move |_: &mut Workspace, _: &OpenSettings, cx: &mut ViewContext<Workspace>| {
             open_config_file(&SETTINGS_PATH, app_state.clone(), cx, || {
-                let header = Assets.load("settings/header-comments.json").unwrap();
-                let json = Assets.load("settings/default.json").unwrap();
-                let header = str::from_utf8(header.as_ref()).unwrap();
-                let json = str::from_utf8(json.as_ref()).unwrap();
-                let mut content = Rope::new();
-                content.push(header);
-                content.push(json);
-                content
+                str::from_utf8(
+                    Assets
+                        .load("settings/initial_user_settings.json")
+                        .unwrap()
+                        .as_ref(),
+                )
+                .unwrap()
+                .into()
             });
         }
     });