From 7733bf686bdd636ea954bd03e2bc5bbf5d46933c Mon Sep 17 00:00:00 2001
From: Kyle Kelley <rgbkrk@gmail.com>
Date: Fri, 19 Jul 2024 10:05:08 -0700
Subject: [PATCH] Repl reorder keybinding (#14824)

Ensures that the assistant keybinding for cmd-enter takes precedence
over `repl::Run`.

On Linux, `ctrl-enter` (the equivalent), issues `repl::Run` when in a
jupyter context.

Release Notes:

- N/A
---
 assets/keymaps/default-linux.json | 13 ++++++++++++-
 assets/keymaps/default-macos.json | 12 ++++++------
 2 files changed, 18 insertions(+), 7 deletions(-)

diff --git a/assets/keymaps/default-linux.json b/assets/keymaps/default-linux.json
index 8be6d12390..3317a59a48 100644
--- a/assets/keymaps/default-linux.json
+++ b/assets/keymaps/default-linux.json
@@ -107,7 +107,6 @@
       "enter": "editor::Newline",
       "shift-enter": "editor::Newline",
       "ctrl-shift-enter": "editor::NewlineBelow",
-      "ctrl-enter": "editor::NewlineAbove",
       "alt-z": "editor::ToggleSoftWrap",
       "ctrl-f": "buffer_search::Deploy",
       "ctrl-h": ["buffer_search::Deploy", { "replace_enabled": true }],
@@ -117,6 +116,12 @@
       "ctrl-alt-e": "editor::SelectEnclosingSymbol"
     }
   },
+  {
+    "context": "Editor && mode == full && !jupyter",
+    "bindings": {
+      "ctrl-enter": "editor::NewlineAbove"
+    }
+  },
   {
     "context": "Editor && mode == full && inline_completion",
     "bindings": {
@@ -477,6 +482,12 @@
       "ctrl-enter": "assistant::InlineAssist"
     }
   },
+  {
+    "context": "Editor && jupyter && !ContextEditor",
+    "bindings": {
+      "ctrl-enter": "repl::Run"
+    }
+  },
   {
     "context": "ContextEditor > Editor",
     "bindings": {
diff --git a/assets/keymaps/default-macos.json b/assets/keymaps/default-macos.json
index 1527e3e943..d366d79339 100644
--- a/assets/keymaps/default-macos.json
+++ b/assets/keymaps/default-macos.json
@@ -180,6 +180,12 @@
       "cmd-c": "markdown::Copy"
     }
   },
+  {
+    "context": "Editor && jupyter && !ContextEditor",
+    "bindings": {
+      "cmd-enter": "repl::Run"
+    }
+  },
   {
     "context": "AssistantPanel",
     "bindings": {
@@ -570,12 +576,6 @@
       "space": "project_panel::Open"
     }
   },
-  {
-    "context": "Editor && jupyter && !ContextEditor",
-    "bindings": {
-      "cmd-enter": "repl::Run"
-    }
-  },
   {
     "context": "CollabPanel && not_editing",
     "bindings": {