completions: Restore tab behavior when both visible (#22069)

Thorsten Ball created 1 year ago

This reverts part of #21858 by changing how `tab` works again:

- If both, completions and inline completions, are visible, then `tab`
accepts the completion and `shif-tab` the inline completion.
- If only one of them is shown, then `tab` accepts it.

I'm not a fan of this solution, but I think it's a short-term fix that
avoids breaking people's `tab` muscle memory.

Release Notes:

- (These release notes invalidate the release notes contained in:
https://github.com/zed-industries/zed/pull/21858)
- Changed how inline completions (Copilot, Supermaven, ...) and normal
completions (from language servers) interact. Zed will now also show
inline completions when the completion menu is visible. The user can
accept the inline completion with `<shift-tab>` and the active entry in
the completion menu with `<tab>`.

Change summary

assets/keymaps/default-linux.json | 13 ++++++++-----
assets/keymaps/default-macos.json | 13 ++++++++-----
2 files changed, 16 insertions(+), 10 deletions(-)

Detailed changes

assets/keymaps/default-linux.json

@@ -468,21 +468,24 @@
     }
   },
   {
-    "context": "Editor && showing_completions",
+    "context": "Editor && !inline_completion && showing_completions",
     "use_key_equivalents": true,
     "bindings": {
-      "enter": "editor::ConfirmCompletion"
+      "enter": "editor::ConfirmCompletion",
+      "tab": "editor::ComposeCompletion"
     }
   },
   {
-    "context": "Editor && !inline_completion && showing_completions",
+    "context": "Editor && inline_completion && showing_completions",
     "use_key_equivalents": true,
     "bindings": {
-      "tab": "editor::ComposeCompletion"
+      "enter": "editor::ConfirmCompletion",
+      "tab": "editor::ComposeCompletion",
+      "shift-tab": "editor::AcceptInlineCompletion"
     }
   },
   {
-    "context": "Editor && inline_completion",
+    "context": "Editor && inline_completion && !showing_completions",
     "use_key_equivalents": true,
     "bindings": {
       "tab": "editor::AcceptInlineCompletion"

assets/keymaps/default-macos.json

@@ -539,21 +539,24 @@
     }
   },
   {
-    "context": "Editor && showing_completions",
+    "context": "Editor && !inline_completion && showing_completions",
     "use_key_equivalents": true,
     "bindings": {
-      "enter": "editor::ConfirmCompletion"
+      "enter": "editor::ConfirmCompletion",
+      "tab": "editor::ComposeCompletion"
     }
   },
   {
-    "context": "Editor && !inline_completion && showing_completions",
+    "context": "Editor && inline_completion && showing_completions",
     "use_key_equivalents": true,
     "bindings": {
-      "tab": "editor::ComposeCompletion"
+      "enter": "editor::ConfirmCompletion",
+      "tab": "editor::ComposeCompletion",
+      "shift-tab": "editor::AcceptInlineCompletion"
     }
   },
   {
-    "context": "Editor && inline_completion",
+    "context": "Editor && inline_completion && !showing_completions",
     "use_key_equivalents": true,
     "bindings": {
       "tab": "editor::AcceptInlineCompletion"