Skip to content

armgit / zed

Public Imported from GitHub
0

Code at the speed of thought – Zed is a high-performance, multiplayer code editor from the creators of Atom and Tree-sitter.

git_ui: Prevent Git panel bindings in repository selector (#61282)

Mikhail Pertsev43b5360ac845
diff --git a/assets/keymaps/default-linux.json b/assets/keymaps/default-linux.json
index 2b911f35c55..ffa1fc54562 100644
--- a/assets/keymaps/default-linux.json
+++ b/assets/keymaps/default-linux.json
@@ -1012,7 +1012,7 @@
},
},
{
- "context": "GitPanel && ChangesList && !GitBranchSelector",
+ "context": "GitPanel && ChangesList && !GitBranchSelector && !GitRepositorySelector",
"bindings": {
"left": "git_panel::CollapseSelectedEntry",
"right": "git_panel::ExpandSelectedEntry",
diff --git a/assets/keymaps/default-macos.json b/assets/keymaps/default-macos.json
index b44a32c0860..9aa17d53025 100644
--- a/assets/keymaps/default-macos.json
+++ b/assets/keymaps/default-macos.json
@@ -1071,7 +1071,7 @@
},
},
{
- "context": "GitPanel && ChangesList && !GitBranchSelector",
+ "context": "GitPanel && ChangesList && !GitBranchSelector && !GitRepositorySelector",
"use_key_equivalents": true,
"bindings": {
"up": "git_panel::PreviousEntry",
diff --git a/assets/keymaps/default-windows.json b/assets/keymaps/default-windows.json
index 2dabb393120..b9adaf88dd3 100644
--- a/assets/keymaps/default-windows.json
+++ b/assets/keymaps/default-windows.json
@@ -1005,7 +1005,7 @@
},
},
{
- "context": "GitPanel && ChangesList && !GitBranchSelector",
+ "context": "GitPanel && ChangesList && !GitBranchSelector && !GitRepositorySelector",
"use_key_equivalents": true,
"bindings": {
"up": "git_panel::PreviousEntry",
diff --git a/assets/keymaps/vim.json b/assets/keymaps/vim.json
index a8d218cb0b7..915e961e373 100644
--- a/assets/keymaps/vim.json
+++ b/assets/keymaps/vim.json
@@ -1088,7 +1088,7 @@
},
},
{
- "context": "GitPanel && ChangesList && !GitBranchSelector",
+ "context": "GitPanel && ChangesList && !GitBranchSelector && !GitRepositorySelector",
"use_key_equivalents": true,
"bindings": {
"k": "menu::SelectPrevious",