From 2cdfae9ce3141852073083445c5730586bd6065b Mon Sep 17 00:00:00 2001
From: Conrad Irwin <conrad.irwin@gmail.com>
Date: Tue, 16 Jul 2024 20:24:13 -0600
Subject: [PATCH] Show an initial empty keymap (#14609)

Release Notes:

- Added default content for the user keymap file.
---
 assets/keymaps/initial.json                | 21 +++++++++++++++++++++
 assets/settings/initial_user_settings.json |  4 ++--
 crates/settings/src/settings.rs            |  4 ++++
 crates/zed/src/zed.rs                      |  2 +-
 4 files changed, 28 insertions(+), 3 deletions(-)
 create mode 100644 assets/keymaps/initial.json

diff --git a/assets/keymaps/initial.json b/assets/keymaps/initial.json
new file mode 100644
index 0000000000..07af2894de
--- /dev/null
+++ b/assets/keymaps/initial.json
@@ -0,0 +1,21 @@
+// Zed keymap
+//
+// For information on binding keys, see the Zed
+// documentation: https://zed.dev/docs/key-bindings
+//
+// To see the default key bindings run `zed: Open Default Keymap`
+// from the command palette.
+[
+  {
+    "context": "Workspace",
+    "bindings": {
+      // "shift shift": "file_finder::Toggle"
+    }
+  },
+  {
+    "context": "Editor",
+    "bindings": {
+      // "j k": ["workspace::SendKeystrokes", "escape"]
+    }
+  }
+]
diff --git a/assets/settings/initial_user_settings.json b/assets/settings/initial_user_settings.json
index 2c0c5849ca..705dc30428 100644
--- a/assets/settings/initial_user_settings.json
+++ b/assets/settings/initial_user_settings.json
@@ -4,8 +4,8 @@
 // documentation: https://zed.dev/docs/configuring-zed
 //
 // 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.
+// custom settings, run the `zed: Open Default Settings` command
+// from the command palette
 {
   "ui_font_size": 16,
   "buffer_font_size": 16,
diff --git a/crates/settings/src/settings.rs b/crates/settings/src/settings.rs
index e716ef5b07..fcfc86dd3d 100644
--- a/crates/settings/src/settings.rs
+++ b/crates/settings/src/settings.rs
@@ -54,6 +54,10 @@ pub fn initial_local_settings_content() -> Cow<'static, str> {
     asset_str::<SettingsAssets>("settings/initial_local_settings.json")
 }
 
+pub fn initial_keymap_content() -> Cow<'static, str> {
+    asset_str::<SettingsAssets>("keymaps/initial.json")
+}
+
 pub fn initial_tasks_content() -> Cow<'static, str> {
     asset_str::<SettingsAssets>("settings/initial_tasks.json")
 }
diff --git a/crates/zed/src/zed.rs b/crates/zed/src/zed.rs
index ef9e4b591a..f3e7a99f2e 100644
--- a/crates/zed/src/zed.rs
+++ b/crates/zed/src/zed.rs
@@ -372,7 +372,7 @@ pub fn initialize_workspace(app_state: Arc<AppState>, cx: &mut AppContext) {
                 move |_: &mut Workspace,
                       _: &zed_actions::OpenKeymap,
                       cx: &mut ViewContext<Workspace>| {
-                    open_settings_file(&paths::keymap_file(), Rope::default, cx);
+                    open_settings_file(&paths::keymap_file(), || settings::initial_keymap_content().as_ref().into(), cx);
                 },
             )
             .register_action(