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
539539 "ctrl-k ctrl-0": "editor::FoldAll",
540540 "ctrl-k ctrl-j": "editor::UnfoldAll",
541541 "ctrl-space": "editor::ShowCompletions",
542− "ctrl-shift-space": "editor::ShowSignatureHelp",
542+ "ctrl-shift-space": "editor::ShowWordCompletions",
543543 "ctrl-.": "editor::ToggleCodeActions",
544544 "ctrl-k r": "editor::RevealInFileManager",
545545 "ctrl-k p": "editor::CopyPath",
@@ -799,7 +799,7 @@ · 253 unmodified lines
799799 "ctrl-shift-e": "pane::RevealInProjectPanel",
800800 "ctrl-f8": "editor::GoToHunk",
801801 "ctrl-shift-f8": "editor::GoToPreviousHunk",
802− "ctrl-i": "assistant::InlineAssist",
802+ "ctrl-enter": "assistant::InlineAssist",
803803 "ctrl-:": "editor::ToggleInlayHints"
804804 }
805805 },
@@ -1094,7 +1094,7 @@ · 288 unmodified lines
10941094 "paste": "terminal::Paste",
10951095 "shift-insert": "terminal::Paste",
10961096 "ctrl-shift-v": "terminal::Paste",
1097− "ctrl-i": "assistant::InlineAssist",
1097+ "ctrl-enter": "assistant::InlineAssist",
10981098 "alt-b": ["terminal::SendText", "\u001bb"],
10991099 "alt-f": ["terminal::SendText", "\u001bf"],
11001100 "alt-.": ["terminal::SendText", "\u001b."],
assets/keymaps/default-macos.json+3−3
@@ -142,7 +142,7 @@ · 141 unmodified lines
142142 "cmd-\"": "editor::ExpandAllDiffHunks",
143143 "cmd-alt-g b": "git::Blame",
144144 "cmd-alt-g m": "git::OpenModifiedFiles",
145− "cmd-shift-space": "editor::ShowSignatureHelp",
145+ "cmd-i": "editor::ShowSignatureHelp",
146146 "f9": "editor::ToggleBreakpoint",
147147 "shift-f9": "editor::EditLogBreakpoint",
148148 "ctrl-f12": "editor::GoToDeclaration",
@@ -864,7 +864,7 @@ · 715 unmodified lines
864864 "cmd-shift-e": "pane::RevealInProjectPanel",
865865 "cmd-f8": "editor::GoToHunk",
866866 "cmd-shift-f8": "editor::GoToPreviousHunk",
867− "cmd-i": "assistant::InlineAssist",
867+ "ctrl-enter": "assistant::InlineAssist",
868868 "ctrl-:": "editor::ToggleInlayHints"
869869 }
870870 },
@@ -1168,7 +1168,7 @@ · 297 unmodified lines
11681168 "cmd-a": "editor::SelectAll",
11691169 "cmd-k": "terminal::Clear",
11701170 "cmd-n": "workspace::NewTerminal",
1171− "cmd-i": "assistant::InlineAssist",
1171+ "ctrl-enter": "assistant::InlineAssist",
11721172 "ctrl-_": null, // emacs undo
11731173 // Some nice conveniences
11741174 "cmd-backspace": ["terminal::SendText", "\u0015"], // ctrl-u: clear line
assets/keymaps/default-windows.json+3−3
@@ -548,7 +548,7 @@ · 547 unmodified lines
548548 "ctrl-k ctrl-0": "editor::FoldAll",
549549 "ctrl-k ctrl-j": "editor::UnfoldAll",
550550 "ctrl-space": "editor::ShowCompletions",
551− "ctrl-shift-space": "editor::ShowSignatureHelp",
551+ "ctrl-shift-space": "editor::ShowWordCompletions",
552552 "ctrl-.": "editor::ToggleCodeActions",
553553 "ctrl-k r": "editor::RevealInFileManager",
554554 "ctrl-k p": "editor::CopyPath",
@@ -812,7 +812,7 @@ · 257 unmodified lines
812812 "ctrl-shift-e": "pane::RevealInProjectPanel",
813813 "ctrl-f8": "editor::GoToHunk",
814814 "ctrl-shift-f8": "editor::GoToPreviousHunk",
815− "ctrl-i": "assistant::InlineAssist",
815+ "ctrl-enter": "assistant::InlineAssist",
816816 "ctrl-shift-;": "editor::ToggleInlayHints"
817817 }
818818 },
@@ -1120,7 +1120,7 @@ · 301 unmodified lines
11201120 "shift-insert": "terminal::Paste",
11211121 "ctrl-v": "terminal::Paste",
11221122 "ctrl-shift-v": "terminal::Paste",
1123− "ctrl-i": "assistant::InlineAssist",
1123+ "ctrl-enter": "assistant::InlineAssist",
11241124 "alt-b": ["terminal::SendText", "\u001bb"],
11251125 "alt-f": ["terminal::SendText", "\u001bf"],
11261126 "alt-.": ["terminal::SendText", "\u001b."],