Move keymap_file module into settings crate

Max Brunsfeld and Keith Simmons created 3 years ago

Co-authored-by: Keith Simmons <[e-mail]

Change summary

Cargo.lock                         | 1 +
crates/settings/Cargo.toml         | 1 +
crates/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(-)

Detailed changes

Cargo.lock

@@ -4425,6 +4425,7 @@ name = "settings"
 version = "0.1.0"
 dependencies = [
  "anyhow",
+ "collections",
  "gpui",
  "schemars",
  "serde",

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" }

crates/zed/src/keymap_file.rs → crates/settings/src/keymap_file.rs

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};

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(),
     )