vim: Load keymap after base keymap (#24161)

Conrad Irwin created 1 year ago

Closes #22562

Release Notes:

- vim: Load vim keymap after a user-configured keymap

Change summary

crates/zed/src/zed.rs | 7 ++++---
1 file changed, 4 insertions(+), 3 deletions(-)

Detailed changes

crates/zed/src/zed.rs

@@ -1239,13 +1239,14 @@ pub fn load_default_keymap(cx: &mut App) {
     }
 
     cx.bind_keys(KeymapFile::load_asset(DEFAULT_KEYMAP_PATH, cx).unwrap());
-    if VimModeSetting::get_global(cx).0 {
-        cx.bind_keys(KeymapFile::load_asset(VIM_KEYMAP_PATH, cx).unwrap());
-    }
 
     if let Some(asset_path) = base_keymap.asset_path() {
         cx.bind_keys(KeymapFile::load_asset(asset_path, cx).unwrap());
     }
+
+    if VimModeSetting::get_global(cx).0 {
+        cx.bind_keys(KeymapFile::load_asset(VIM_KEYMAP_PATH, cx).unwrap());
+    }
 }
 
 pub fn handle_settings_changed(error: Option<anyhow::Error>, cx: &mut App) {