diff --git a/Cargo.lock b/Cargo.lock index d32a21d201..4cd3be4969 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 baaf787bee..11487af0af 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 c897586017..aa38ac8840 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 bae7b517e9..5d5c065b5e 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, 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(), )