From 59b382a7d86d266af40b7b7ce0ffb51ffb6211ed Mon Sep 17 00:00:00 2001 From: Marshall Bowers Date: Fri, 7 Feb 2025 13:59:27 -0500 Subject: [PATCH] Revert "Accept edit predictions with `alt-tab` in addition to `tab` (#24272)" This reverts commit eafad7d9db9dead3561e19070ff71a93f26f602a. --- assets/keymaps/default-linux.json | 12 ++++++------ assets/keymaps/default-macos.json | 12 ++++++------ 2 files changed, 12 insertions(+), 12 deletions(-) diff --git a/assets/keymaps/default-linux.json b/assets/keymaps/default-linux.json index 676af995318a68e968573d03c78d55e4d92d2ac8..90c8faaadf1006fd605bbd336ed9aac7d12bb3da 100644 --- a/assets/keymaps/default-linux.json +++ b/assets/keymaps/default-linux.json @@ -503,17 +503,17 @@ } }, { - "context": "Editor && inline_completion", + "context": "Editor && inline_completion && !showing_completions", + "use_key_equivalents": true, "bindings": { - // Changing the modifier currently breaks accepting while you also an LSP completions menu open - "alt-enter": "editor::AcceptInlineCompletion" + "tab": "editor::AcceptInlineCompletion" } }, { - "context": "Editor && inline_completion && !showing_completions", - "use_key_equivalents": true, + "context": "Editor && inline_completion && showing_completions", "bindings": { - "tab": "editor::AcceptInlineCompletion" + // Currently, changing this binding breaks the preview behavior + "alt-enter": "editor::AcceptInlineCompletion" } }, { diff --git a/assets/keymaps/default-macos.json b/assets/keymaps/default-macos.json index e865bc14ad44caddd559cd8b2778e329520e3a9a..934373b675727104875fa6ddaeb67ff98e053d21 100644 --- a/assets/keymaps/default-macos.json +++ b/assets/keymaps/default-macos.json @@ -580,17 +580,17 @@ } }, { - "context": "Editor && inline_completion", + "context": "Editor && inline_completion && !showing_completions", + "use_key_equivalents": true, "bindings": { - // Changing the modifier currently breaks accepting while you also an LSP completions menu open - "alt-tab": "editor::AcceptInlineCompletion" + "tab": "editor::AcceptInlineCompletion" } }, { - "context": "Editor && inline_completion && !showing_completions", - "use_key_equivalents": true, + "context": "Editor && inline_completion && showing_completions", "bindings": { - "tab": "editor::AcceptInlineCompletion" + // Currently, changing this binding breaks the preview behavior + "alt-tab": "editor::AcceptInlineCompletion" } }, {