From 9e44de90afaae38416510d6c4f1e8db0be67ae97 Mon Sep 17 00:00:00 2001
From: Conrad Irwin <conrad.irwin@gmail.com>
Date: Mon, 17 Jul 2023 14:57:21 -0600
Subject: [PATCH] Allow ctrl+[ as an alias for escape

Also remove unneeded mappings in `g` and `z` modes

Fixes: zed-industries/community#358
---
 assets/keymaps/vim.json | 19 ++++++++++---------
 1 file changed, 10 insertions(+), 9 deletions(-)

diff --git a/assets/keymaps/vim.json b/assets/keymaps/vim.json
index 639daef614332a7103b2195e298fe0fcf8f2eef3..e6421114ec800ec80face8b97f9e4ebaa608027b 100644
--- a/assets/keymaps/vim.json
+++ b/assets/keymaps/vim.json
@@ -99,6 +99,10 @@
         "vim::SwitchMode",
         "Normal"
       ],
+      "ctrl+[": [
+        "vim::SwitchMode",
+        "Normal"
+      ],
       "0": "vim::StartOfLine", // When no number operator present, use start of line motion
       "1": [
         "vim::Number",
@@ -234,10 +238,6 @@
       "h": "editor::Hover",
       "t": "pane::ActivateNextItem",
       "shift-t": "pane::ActivatePrevItem",
-      "escape": [
-        "vim::SwitchMode",
-        "Normal"
-      ],
       "d": "editor::GoToDefinition"
     }
   },
@@ -265,10 +265,6 @@
       "t": "editor::ScrollCursorTop",
       "z": "editor::ScrollCursorCenter",
       "b": "editor::ScrollCursorBottom",
-      "escape": [
-        "vim::SwitchMode",
-        "Normal"
-      ]
     }
   },
   {
@@ -322,7 +318,8 @@
     "context": "Editor && vim_mode == insert",
     "bindings": {
       "escape": "vim::NormalBefore",
-      "ctrl-c": "vim::NormalBefore"
+      "ctrl-c": "vim::NormalBefore",
+      "ctrl-[": "vim::NormalBefore",
     }
   },
   {
@@ -333,6 +330,10 @@
       "escape": [
         "vim::SwitchMode",
         "Normal"
+      ],
+      "ctrl+[": [
+        "vim::SwitchMode",
+        "Normal"
       ]
     }
   }