Add `VIM_KEYMAP_PATH` constant (#23228)

Michael Sloan created 1 year ago

Deduplicates 2 occurrences

Release Notes:

- N/A

Change summary

crates/settings/src/settings.rs | 4 +++-
crates/zed/src/zed.rs           | 4 ++--
2 files changed, 5 insertions(+), 3 deletions(-)

Detailed changes

crates/settings/src/settings.rs

@@ -82,8 +82,10 @@ pub fn default_keymap() -> Cow<'static, str> {
     asset_str::<SettingsAssets>(DEFAULT_KEYMAP_PATH)
 }
 
+pub const VIM_KEYMAP_PATH: &str = "keymaps/vim.json";
+
 pub fn vim_keymap() -> Cow<'static, str> {
-    asset_str::<SettingsAssets>("keymaps/vim.json")
+    asset_str::<SettingsAssets>(VIM_KEYMAP_PATH)
 }
 
 pub fn initial_user_settings_content() -> Cow<'static, str> {

crates/zed/src/zed.rs

@@ -39,7 +39,7 @@ use rope::Rope;
 use search::project_search::ProjectSearchBar;
 use settings::{
     initial_project_settings_content, initial_tasks_content, KeymapFile, Settings, SettingsStore,
-    DEFAULT_KEYMAP_PATH,
+    DEFAULT_KEYMAP_PATH, VIM_KEYMAP_PATH,
 };
 use std::any::TypeId;
 use std::path::PathBuf;
@@ -1022,7 +1022,7 @@ pub fn load_default_keymap(cx: &mut AppContext) {
 
     KeymapFile::load_asset(DEFAULT_KEYMAP_PATH, cx).unwrap();
     if VimModeSetting::get_global(cx).0 {
-        KeymapFile::load_asset("keymaps/vim.json", cx).unwrap();
+        KeymapFile::load_asset(VIM_KEYMAP_PATH, cx).unwrap();
     }
 
     if let Some(asset_path) = base_keymap.asset_path() {