From e0096ec1eb8c51459394312f35997d2c288aef03 Mon Sep 17 00:00:00 2001
From: Max Brunsfeld <maxbrunsfeld@gmail.com>
Date: Mon, 11 Apr 2022 15:22:18 -0700
Subject: [PATCH] Move keymap_file module into settings crate

Co-authored-by: Keith Simmons <keith@zed.dev
---
 Cargo.lock                                  | 1 +
 crates/settings/Cargo.toml                  | 1 +
 crates/{zed => settings}/src/keymap_file.rs | 0
 crates/settings/src/settings.rs             | 2 ++
 crates/zed/src/zed.rs                       | 3 +--
 5 files changed, 5 insertions(+), 2 deletions(-)
 rename crates/{zed => settings}/src/keymap_file.rs (100%)

diff --git a/Cargo.lock b/Cargo.lock
index d32a21d20158b2273f675779ea7670abd916f1f2..4cd3be49694d31dc5ea4a7cfaa5085b178e31f38 100644
--- a/Cargo.lock
+++ b/Cargo.lock
@@ -4425,6 +4425,7 @@ name = "settings"
 version = "0.1.0"
 dependencies = [
  "anyhow",
+ "collections",
  "gpui",
  "schemars",
  "serde",
diff --git a/crates/settings/Cargo.toml b/crates/settings/Cargo.toml
index baaf787bee4dc43530d8185864bcf5ea732e0722..11487af0af0aabc059327ad7419887b7d8119608 100644
--- a/crates/settings/Cargo.toml
+++ b/crates/settings/Cargo.toml
@@ -11,6 +11,7 @@ doctest = false
 test-support = []
 
 [dependencies]
+collections = { path = "../collections" }
 gpui = { path = "../gpui" }
 theme = { path = "../theme" }
 util = { path = "../util" }
diff --git a/crates/zed/src/keymap_file.rs b/crates/settings/src/keymap_file.rs
similarity index 100%
rename from crates/zed/src/keymap_file.rs
rename to crates/settings/src/keymap_file.rs
diff --git a/crates/settings/src/settings.rs b/crates/settings/src/settings.rs
index c897586017bf40b7fb2963fa0c389fb5ca7c0c9f..aa38ac8840a79873014ab5c1eaf09fea2bf1eab9 100644
--- a/crates/settings/src/settings.rs
+++ b/crates/settings/src/settings.rs
@@ -1,3 +1,5 @@
+pub mod keymap_file;
+
 use anyhow::Result;
 use gpui::font_cache::{FamilyId, FontCache};
 use schemars::{schema_for, JsonSchema};
diff --git a/crates/zed/src/zed.rs b/crates/zed/src/zed.rs
index bae7b517e94646fa68b877043a41783c84d46ac8..5d5c065b5e8ca7deb2951aee046b478cae537db8 100644
--- a/crates/zed/src/zed.rs
+++ b/crates/zed/src/zed.rs
@@ -1,5 +1,4 @@
 pub mod assets;
-mod keymap_file;
 pub mod languages;
 pub mod menus;
 pub mod settings_file;
@@ -105,7 +104,7 @@ pub fn init(app_state: &Arc<AppState>, cx: &mut gpui::MutableAppContext) {
 
     workspace::lsp_status::init(cx);
 
-    keymap_file::load_keymap(
+    settings::keymap_file::load_keymap(
         cx,
         std::str::from_utf8(Assets::get("keymaps/default.json").unwrap().data.as_ref()).unwrap(),
     )