From e602221dd3f784ebee964adf0b4b6dc6c72e28c6 Mon Sep 17 00:00:00 2001
From: "Joseph T. Lyons" <JosephTLyons@gmail.com>
Date: Fri, 30 Jun 2023 13:32:42 -0400
Subject: [PATCH] Fix bug preventing the assist command from working in certain
 keymaps (#2669)

Fixes: https://github.com/zed-industries/community/issues/1712

The keymaps were adding in a `"cmd-enter": "editor::NewlineBelow",`
entry in the context of `Editor`, and this was clobbering the assist
command in the assistant panel context. Zed now defines this command in
the default keymap under the context of `"context": "Editor && mode ==
full"`. All I needed to basically do was remove that command from the
keymaps. I also removed the `"cmd-shift-enter": "editor::NewlineAbove"
from the `Editor` context in those keymaps as wel, as it is also defined
in the default keymap.

Release Notes:

- Fix bug preventing the `assistant: assist` command from working in
certain keymaps
---
 assets/keymaps/atom.json         | 4 +---
 assets/keymaps/sublime_text.json | 4 +---
 assets/keymaps/textmate.json     | 6 +++---
 3 files changed, 5 insertions(+), 9 deletions(-)

diff --git a/assets/keymaps/atom.json b/assets/keymaps/atom.json
index 60acf5ea6f17563c4d27ea42728f45509dc582ed..af845ae4f2111c6009a6b0629777987b22f1b8e3 100644
--- a/assets/keymaps/atom.json
+++ b/assets/keymaps/atom.json
@@ -24,9 +24,7 @@
       ],
       "ctrl-shift-down": "editor::AddSelectionBelow",
       "ctrl-shift-up": "editor::AddSelectionAbove",
-      "cmd-shift-backspace": "editor::DeleteToBeginningOfLine",
-      "cmd-shift-enter": "editor::NewlineAbove",
-      "cmd-enter": "editor::NewlineBelow"
+      "cmd-shift-backspace": "editor::DeleteToBeginningOfLine"
     }
   },
   {
diff --git a/assets/keymaps/sublime_text.json b/assets/keymaps/sublime_text.json
index 2d32b77d58a91b0a508a8da03754ce5eada9d64b..ca20802295923ec992ceaeb6dc2f514aa6a628c9 100644
--- a/assets/keymaps/sublime_text.json
+++ b/assets/keymaps/sublime_text.json
@@ -24,9 +24,7 @@
       "ctrl-.": "editor::GoToHunk",
       "ctrl-,": "editor::GoToPrevHunk",
       "ctrl-backspace": "editor::DeleteToPreviousWordStart",
-      "ctrl-delete": "editor::DeleteToNextWordEnd",
-      "cmd-shift-enter": "editor::NewlineAbove",
-      "cmd-enter": "editor::NewlineBelow"
+      "ctrl-delete": "editor::DeleteToNextWordEnd"
     }
   },
   {
diff --git a/assets/keymaps/textmate.json b/assets/keymaps/textmate.json
index 06be72742950a320ae483df70c37b2db8a4bcf02..591d6e443fec6e362a48dd40a6912a64f198732a 100644
--- a/assets/keymaps/textmate.json
+++ b/assets/keymaps/textmate.json
@@ -12,8 +12,6 @@
       "ctrl-shift-d": "editor::DuplicateLine",
       "cmd-b": "editor::GoToDefinition",
       "cmd-j": "editor::ScrollCursorCenter",
-      "cmd-alt-enter": "editor::NewlineAbove",
-      "cmd-enter": "editor::NewlineBelow",
       "cmd-shift-l": "editor::SelectLine",
       "cmd-shift-t": "outline::Toggle",
       "alt-backspace": "editor::DeleteToPreviousWordStart",
@@ -56,7 +54,9 @@
   },
   {
     "context": "Editor && mode == full",
-    "bindings": {}
+    "bindings": {
+      "cmd-alt-enter": "editor::NewlineAbove"
+    }
   },
   {
     "context": "BufferSearchBar",