Yehowshua/ZIm
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Move keymap_file module into settings crate

Browse source 
Co-authored-by: Keith Simmons <keith@zed.dev
This commit is contained in:
Max Brunsfeld 2022-04-11 15:22:18 -07:00
parent 9a4b8e3d8c
commit e0096ec1eb
5 changed files with 5 additions and 2 deletions
Download patch file Download diff file Expand all files Collapse all files

1
Cargo.lock generated
View file

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

1
crates/settings/Cargo.toml
View file

@ -11,6 +11,7 @@ doctest = false
test-support = [] test-support = []
[dependencies] [dependencies]
collections = { path = "../collections" }
gpui = { path = "../gpui" } gpui = { path = "../gpui" }
theme = { path = "../theme" } theme = { path = "../theme" }
util = { path = "../util" } util = { path = "../util" }

0
crates/zed/src/keymap_file.rs → crates/settings/src/keymap_file.rs
View file

2
crates/settings/src/settings.rs
View file

@ -1,3 +1,5 @@
pub mod keymap_file;
use anyhow::Result; use anyhow::Result;
use gpui::font_cache::{FamilyId, FontCache}; use gpui::font_cache::{FamilyId, FontCache};
use schemars::{schema_for, JsonSchema}; use schemars::{schema_for, JsonSchema};

3
crates/zed/src/zed.rs
View file

@ -1,5 +1,4 @@
pub mod assets; pub mod assets;
mod keymap_file;
pub mod languages; pub mod languages;
pub mod menus; pub mod menus;
pub mod settings_file; pub mod settings_file;
@ -105,7 +104,7 @@ pub fn init(app_state: &Arc<AppState>, cx: &mut gpui::MutableAppContext) {
workspace::lsp_status::init(cx); workspace::lsp_status::init(cx);
keymap_file::load_keymap( settings::keymap_file::load_keymap(
cx, cx,
std::str::from_utf8(Assets::get("keymaps/default.json").unwrap().data.as_ref()).unwrap(), std::str::from_utf8(Assets::get("keymaps/default.json").unwrap().data.as_ref()).unwrap(),
) )