From 12163c9b45f551540b4687a2cbdd563cf9b68711 Mon Sep 17 00:00:00 2001
From: Michael Sloan <michael@zed.dev>
Date: Tue, 11 Feb 2025 12:42:43 -0700
Subject: [PATCH] Add `Editor &&` to accept edit contexts in vim keymap
 (#24684)

Without this, these default vim bindings were taking precedence over
user keybindings

Release Notes:

- N/A
---
 assets/keymaps/vim.json | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/assets/keymaps/vim.json b/assets/keymaps/vim.json
index 111d4c8181f111dca294f2d7dc1eeccab9f1373e..450e435bb37d3cd0e20ecee1077e2c5e436c2d31 100644
--- a/assets/keymaps/vim.json
+++ b/assets/keymaps/vim.json
@@ -696,7 +696,7 @@
     }
   },
   {
-    "context": "edit_prediction && !edit_prediction_requires_modifier",
+    "context": "Editor && edit_prediction && !edit_prediction_requires_modifier",
     "bindings": {
       // This is identical to the binding in the base keymap, but the vim bindings above to
       // "vim::Tab" shadow it, so it needs to be bound again.
@@ -704,7 +704,7 @@
     }
   },
   {
-    "context": "os != macos && edit_prediction",
+    "context": "os != macos && Editor && edit_prediction",
     "bindings": {
       // alt-l is provided as an alternative to tab/alt-tab. and will be displayed in the UI. This
       // is because alt-tab may not be available, as it is often used for window switching on Linux