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

Use the word 'keymap' more consistently

Browse source 
Co-authored-by: Keith Simmons <keith@zed.dev>
This commit is contained in:
Max Brunsfeld 2022-04-11 17:02:16 -07:00
parent be11f63f1e
commit ee3eb9658f
6 changed files with 15 additions and 17 deletions
Download patch file Download diff file Expand all files Collapse all files

13
crates/zed/src/main.rs
View file

@ -10,7 +10,7 @@ use gpui::{App, AssetSource, Task};
use log::LevelFilter;
use parking_lot::Mutex;
use project::Fs;
use settings::{self, KeyMapFile, Settings, SettingsFileContent};
use settings::{self, KeymapFile, Settings, SettingsFileContent};
use smol::process::Command;
use std::{env, fs, path::PathBuf, sync::Arc};
use theme::{ThemeRegistry, DEFAULT_THEME_NAME};
@ -112,7 +112,7 @@ fn main() {
})
.detach_and_log_err(cx);
let (settings_file, bindings_file) = cx.background().block(config_files).unwrap();
let (settings_file, keymap_file) = cx.background().block(config_files).unwrap();
let mut settings_rx = settings_from_files(
default_settings,
vec![settings_file],
@ -120,7 +120,7 @@ fn main() {
cx.font_cache().clone(),
);
cx.spawn(|cx| watch_keymap_file(bindings_file, cx)).detach();
cx.spawn(|cx| watch_keymap_file(keymap_file, cx)).detach();
let settings = cx.background().block(settings_rx.next()).unwrap();
cx.spawn(|mut cx| async move {
@ -262,7 +262,7 @@ fn load_config_files(
fs: Arc<dyn Fs>,
) -> oneshot::Receiver<(
WatchedJsonFile<SettingsFileContent>,
WatchedJsonFile<KeyMapFile>,
WatchedJsonFile<KeymapFile>,
)> {
let executor = app.background();
let (tx, rx) = oneshot::channel();
@ -271,9 +271,8 @@ fn load_config_files(
.spawn(async move {
let settings_file =
WatchedJsonFile::new(fs.clone(), &executor, zed::SETTINGS_PATH.clone()).await;
let bindings_file =
WatchedJsonFile::new(fs, &executor, zed::BINDINGS_PATH.clone()).await;
tx.send((settings_file, bindings_file)).ok()
let keymap_file = WatchedJsonFile::new(fs, &executor, zed::KEYMAP_PATH.clone()).await;
tx.send((settings_file, keymap_file)).ok()
})
.detach();
rx