d4f965724c
Closes [#20574](https://github.com/zed-industries/zed/issues/20574) Release Notes: - Replaced editor action editor::AcceptPartialEditPrediction with editor::AcceptNextLineEditPrediction and editor::AcceptNextWordEditPrediction Tested manually on windows, attaching screen cap. https://github.com/user-attachments/assets/fea04499-fd16-4b7d-a6aa-3661bb85cf4f Updated existing test for accepting word prediction in copilot - it is already marked as flaky, not sure what to do about it and I'm not really confident creating new one without a working example. Added migration of keymaps and new defaults for windows, linux, macos in defaults and in cursor. This should alleviate [#21645](https://github.com/zed-industries/zed/issues/21645) I used some work done in stale PR https://github.com/zed-industries/zed/pull/25274, hopefully this one makes it through! --------- Co-authored-by: Agus Zubiaga <agus@zed.dev>
86 lines
2.7 KiB
JSON
86 lines
2.7 KiB
JSON
[
|
|
// Cursor for MacOS. See: https://docs.cursor.com/kbd
|
|
{
|
|
"context": "Workspace",
|
|
"use_key_equivalents": true,
|
|
"bindings": {
|
|
"cmd-i": "agent::ToggleFocus",
|
|
"cmd-shift-i": "agent::ToggleFocus",
|
|
"cmd-l": "agent::ToggleFocus",
|
|
"cmd-shift-l": "agent::ToggleFocus",
|
|
"cmd-shift-j": "agent::OpenSettings",
|
|
},
|
|
},
|
|
{
|
|
"context": "Editor && mode == full",
|
|
"use_key_equivalents": true,
|
|
"bindings": {
|
|
"cmd-i": "agent::ToggleFocus",
|
|
"cmd-shift-i": "agent::ToggleFocus",
|
|
"cmd-shift-l": "agent::AddSelectionToThread", // In cursor uses "Ask" mode
|
|
"cmd-l": "agent::AddSelectionToThread", // In cursor uses "Agent" mode
|
|
"cmd-k": "assistant::InlineAssist",
|
|
"cmd-shift-k": "assistant::InsertIntoEditor",
|
|
},
|
|
},
|
|
{
|
|
"context": "InlineAssistEditor",
|
|
"use_key_equivalents": true,
|
|
"bindings": {
|
|
"cmd-shift-backspace": "editor::Cancel",
|
|
"cmd-enter": "menu::Confirm",
|
|
// "alt-enter": // Quick Question
|
|
// "cmd-shift-enter": // Full File Context
|
|
// "cmd-shift-k": // Toggle input focus (editor <> inline assist)
|
|
},
|
|
},
|
|
{
|
|
"context": "AgentPanel || ContextEditor || (MessageEditor > Editor)",
|
|
"use_key_equivalents": true,
|
|
"bindings": {
|
|
"cmd-i": "workspace::ToggleRightDock",
|
|
"cmd-shift-i": "workspace::ToggleRightDock",
|
|
"cmd-l": "workspace::ToggleRightDock",
|
|
"cmd-shift-l": "workspace::ToggleRightDock",
|
|
"cmd-w": "workspace::ToggleRightDock", // technically should close chat
|
|
"cmd-.": "agent::ToggleProfileSelector",
|
|
"cmd-/": "agent::ToggleModelSelector",
|
|
"cmd-shift-backspace": "editor::Cancel",
|
|
"cmd-r": "agent::NewThread",
|
|
"cmd-shift-v": "editor::Paste",
|
|
"cmd-shift-k": "assistant::InsertIntoEditor",
|
|
// "escape": "agent::ToggleFocus"
|
|
///// Enable when Zed supports multiple thread tabs
|
|
// "cmd-t": // new thread tab
|
|
// "cmd-[": // next thread tab
|
|
// "cmd-]": // next thread tab
|
|
///// Enable if Zed adds support for keyboard navigation of thread elements
|
|
// "tab": // cycle to next message
|
|
// "shift-tab": // cycle to previous message
|
|
},
|
|
},
|
|
{
|
|
"context": "Editor && editor_agent_diff",
|
|
"use_key_equivalents": true,
|
|
"bindings": {
|
|
"cmd-enter": "agent::KeepAll",
|
|
"cmd-backspace": "agent::RejectAll",
|
|
},
|
|
},
|
|
{
|
|
"context": "Editor && mode == full && edit_prediction",
|
|
"use_key_equivalents": true,
|
|
"bindings": {
|
|
"cmd-right": "editor::AcceptNextWordEditPrediction",
|
|
"cmd-down": "editor::AcceptNextLineEditPrediction",
|
|
},
|
|
},
|
|
{
|
|
"context": "Terminal",
|
|
"use_key_equivalents": true,
|
|
"bindings": {
|
|
"cmd-k": "assistant::InlineAssist",
|
|
},
|
|
},
|
|
]
|