History

Revert "keymaps: Update defaults for inline assist and signature help" (#40903)

Reverts zed-industries/zed#39587

David Kleingeld committed 1 year agov0.210.0-pre

Commit 00a14341 parent aa8128e3 files · +9 −9Browse files

Unified · Split

3 files
  1. assets/keymaps/default-linux.json +3 −3
  2. assets/keymaps/default-macos.json +3 −3
  3. assets/keymaps/default-windows.json +3 −3
assets/keymaps/default-linux.json+3−3
@@ -539,7 +539,7 @@ · 538 unmodified lines
539 "ctrl-k ctrl-0": "editor::FoldAll",539 "ctrl-k ctrl-0": "editor::FoldAll",
540 "ctrl-k ctrl-j": "editor::UnfoldAll",540 "ctrl-k ctrl-j": "editor::UnfoldAll",
541 "ctrl-space": "editor::ShowCompletions",541 "ctrl-space": "editor::ShowCompletions",
542 "ctrl-shift-space": "editor::ShowSignatureHelp",542 "ctrl-shift-space": "editor::ShowWordCompletions",
543 "ctrl-.": "editor::ToggleCodeActions",543 "ctrl-.": "editor::ToggleCodeActions",
544 "ctrl-k r": "editor::RevealInFileManager",544 "ctrl-k r": "editor::RevealInFileManager",
545 "ctrl-k p": "editor::CopyPath",545 "ctrl-k p": "editor::CopyPath",
@@ -799,7 +799,7 @@ · 253 unmodified lines
799 "ctrl-shift-e": "pane::RevealInProjectPanel",799 "ctrl-shift-e": "pane::RevealInProjectPanel",
800 "ctrl-f8": "editor::GoToHunk",800 "ctrl-f8": "editor::GoToHunk",
801 "ctrl-shift-f8": "editor::GoToPreviousHunk",801 "ctrl-shift-f8": "editor::GoToPreviousHunk",
802 "ctrl-i": "assistant::InlineAssist",802 "ctrl-enter": "assistant::InlineAssist",
803 "ctrl-:": "editor::ToggleInlayHints"803 "ctrl-:": "editor::ToggleInlayHints"
804 }804 }
805 },805 },
@@ -1094,7 +1094,7 @@ · 288 unmodified lines
1094 "paste": "terminal::Paste",1094 "paste": "terminal::Paste",
1095 "shift-insert": "terminal::Paste",1095 "shift-insert": "terminal::Paste",
1096 "ctrl-shift-v": "terminal::Paste",1096 "ctrl-shift-v": "terminal::Paste",
1097 "ctrl-i": "assistant::InlineAssist",1097 "ctrl-enter": "assistant::InlineAssist",
1098 "alt-b": ["terminal::SendText", "\u001bb"],1098 "alt-b": ["terminal::SendText", "\u001bb"],
1099 "alt-f": ["terminal::SendText", "\u001bf"],1099 "alt-f": ["terminal::SendText", "\u001bf"],
1100 "alt-.": ["terminal::SendText", "\u001b."],1100 "alt-.": ["terminal::SendText", "\u001b."],
assets/keymaps/default-macos.json+3−3
@@ -142,7 +142,7 @@ · 141 unmodified lines
142 "cmd-\"": "editor::ExpandAllDiffHunks",142 "cmd-\"": "editor::ExpandAllDiffHunks",
143 "cmd-alt-g b": "git::Blame",143 "cmd-alt-g b": "git::Blame",
144 "cmd-alt-g m": "git::OpenModifiedFiles",144 "cmd-alt-g m": "git::OpenModifiedFiles",
145 "cmd-shift-space": "editor::ShowSignatureHelp",145 "cmd-i": "editor::ShowSignatureHelp",
146 "f9": "editor::ToggleBreakpoint",146 "f9": "editor::ToggleBreakpoint",
147 "shift-f9": "editor::EditLogBreakpoint",147 "shift-f9": "editor::EditLogBreakpoint",
148 "ctrl-f12": "editor::GoToDeclaration",148 "ctrl-f12": "editor::GoToDeclaration",
@@ -864,7 +864,7 @@ · 715 unmodified lines
864 "cmd-shift-e": "pane::RevealInProjectPanel",864 "cmd-shift-e": "pane::RevealInProjectPanel",
865 "cmd-f8": "editor::GoToHunk",865 "cmd-f8": "editor::GoToHunk",
866 "cmd-shift-f8": "editor::GoToPreviousHunk",866 "cmd-shift-f8": "editor::GoToPreviousHunk",
867 "cmd-i": "assistant::InlineAssist",867 "ctrl-enter": "assistant::InlineAssist",
868 "ctrl-:": "editor::ToggleInlayHints"868 "ctrl-:": "editor::ToggleInlayHints"
869 }869 }
870 },870 },
@@ -1168,7 +1168,7 @@ · 297 unmodified lines
1168 "cmd-a": "editor::SelectAll",1168 "cmd-a": "editor::SelectAll",
1169 "cmd-k": "terminal::Clear",1169 "cmd-k": "terminal::Clear",
1170 "cmd-n": "workspace::NewTerminal",1170 "cmd-n": "workspace::NewTerminal",
1171 "cmd-i": "assistant::InlineAssist",1171 "ctrl-enter": "assistant::InlineAssist",
1172 "ctrl-_": null, // emacs undo1172 "ctrl-_": null, // emacs undo
1173 // Some nice conveniences1173 // Some nice conveniences
1174 "cmd-backspace": ["terminal::SendText", "\u0015"], // ctrl-u: clear line1174 "cmd-backspace": ["terminal::SendText", "\u0015"], // ctrl-u: clear line
assets/keymaps/default-windows.json+3−3
@@ -548,7 +548,7 @@ · 547 unmodified lines
548 "ctrl-k ctrl-0": "editor::FoldAll",548 "ctrl-k ctrl-0": "editor::FoldAll",
549 "ctrl-k ctrl-j": "editor::UnfoldAll",549 "ctrl-k ctrl-j": "editor::UnfoldAll",
550 "ctrl-space": "editor::ShowCompletions",550 "ctrl-space": "editor::ShowCompletions",
551 "ctrl-shift-space": "editor::ShowSignatureHelp",551 "ctrl-shift-space": "editor::ShowWordCompletions",
552 "ctrl-.": "editor::ToggleCodeActions",552 "ctrl-.": "editor::ToggleCodeActions",
553 "ctrl-k r": "editor::RevealInFileManager",553 "ctrl-k r": "editor::RevealInFileManager",
554 "ctrl-k p": "editor::CopyPath",554 "ctrl-k p": "editor::CopyPath",
@@ -812,7 +812,7 @@ · 257 unmodified lines
812 "ctrl-shift-e": "pane::RevealInProjectPanel",812 "ctrl-shift-e": "pane::RevealInProjectPanel",
813 "ctrl-f8": "editor::GoToHunk",813 "ctrl-f8": "editor::GoToHunk",
814 "ctrl-shift-f8": "editor::GoToPreviousHunk",814 "ctrl-shift-f8": "editor::GoToPreviousHunk",
815 "ctrl-i": "assistant::InlineAssist",815 "ctrl-enter": "assistant::InlineAssist",
816 "ctrl-shift-;": "editor::ToggleInlayHints"816 "ctrl-shift-;": "editor::ToggleInlayHints"
817 }817 }
818 },818 },
@@ -1120,7 +1120,7 @@ · 301 unmodified lines
1120 "shift-insert": "terminal::Paste",1120 "shift-insert": "terminal::Paste",
1121 "ctrl-v": "terminal::Paste",1121 "ctrl-v": "terminal::Paste",
1122 "ctrl-shift-v": "terminal::Paste",1122 "ctrl-shift-v": "terminal::Paste",
1123 "ctrl-i": "assistant::InlineAssist",1123 "ctrl-enter": "assistant::InlineAssist",
1124 "alt-b": ["terminal::SendText", "\u001bb"],1124 "alt-b": ["terminal::SendText", "\u001bb"],
1125 "alt-f": ["terminal::SendText", "\u001bf"],1125 "alt-f": ["terminal::SendText", "\u001bf"],
1126 "alt-.": ["terminal::SendText", "\u001b."],1126 "alt-.": ["terminal::SendText", "\u001b."],