Yehowshua/ZIm
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

edit predictions: Fix predictions bar disappearing while loading (#24582)

Browse source 
Release Notes:

- N/A

---------

Co-authored-by: Max <max@zed.dev>
This commit is contained in:
Agus Zubiaga 2025-02-10 18:49:46 -03:00 • committed by GitHub
parent 89e051d650
commit 1f288f7327
No known key found for this signature in database
GPG key ID: B5690EEEBB952194
3 changed files with 65 additions and 50 deletions
Download patch file Download diff file Expand all files Collapse all files

29
crates/editor/src/editor.rs
View file

@ -190,6 +190,7 @@ pub const CODE_ACTIONS_DEBOUNCE_TIMEOUT: Duration = Duration::from_millis(250);
pub(crate) const FORMAT_TIMEOUT: Duration = Duration::from_secs(2);
pub(crate) const SCROLL_CENTER_TOP_BOTTOM_DEBOUNCE_TIMEOUT: Duration = Duration::from_secs(1);
pub(crate) const EDIT_PREDICTION_KEY_CONTEXT: &str = "edit_prediction";
pub(crate) const EDIT_PREDICTION_REQUIRES_MODIFIER_KEY_CONTEXT: &str =
"edit_prediction_requires_modifier";
@ -1488,13 +1489,13 @@ impl Editor {
this
}
pub fn mouse_menu_is_focused(&self, window: &mut Window, cx: &mut App) -> bool {
pub fn mouse_menu_is_focused(&self, window: &Window, cx: &App) -> bool {
self.mouse_context_menu
.as_ref()
.is_some_and(|menu| menu.context_menu.focus_handle(cx).is_focused(window))
}
fn key_context(&self, window: &mut Window, cx: &mut Context<Self>) -> KeyContext {
fn key_context(&self, window: &Window, cx: &App) -> KeyContext {
let mut key_context = KeyContext::new_with_defaults();
key_context.add("Editor");
let mode = match self.mode {
@ -1547,7 +1548,7 @@ impl Editor {
if self.has_active_inline_completion() {
key_context.add("copilot_suggestion");
key_context.add("edit_prediction");
key_context.add(EDIT_PREDICTION_KEY_CONTEXT);
if showing_completions || self.edit_prediction_requires_modifier() {
key_context.add(EDIT_PREDICTION_REQUIRES_MODIFIER_KEY_CONTEXT);
@ -1561,6 +1562,22 @@ impl Editor {
key_context
}
pub fn accept_edit_prediction_keybind(
&self,
window: &Window,
cx: &App,
) -> AcceptEditPredictionBinding {
let mut context = self.key_context(window, cx);
context.add(EDIT_PREDICTION_KEY_CONTEXT);
AcceptEditPredictionBinding(
window
.bindings_for_action_in_context(&AcceptEditPrediction, context)
.into_iter()
.next(),
)
}
pub fn new_file(
workspace: &mut Workspace,
_: &workspace::NewFile,
@ -5128,8 +5145,7 @@ impl Editor {
cx: &mut Context<Self>,
) {
if self.show_edit_predictions_in_menu() {
let accept_binding =
AcceptEditPredictionBinding::resolve(self.focus_handle(cx), window);
let accept_binding = self.accept_edit_prediction_keybind(window, cx);
if let Some(accept_keystroke) = accept_binding.keystroke() {
let was_previewing_inline_completion = self.previewing_inline_completion;
self.previewing_inline_completion = modifiers == accept_keystroke.modifiers
@ -14408,7 +14424,8 @@ impl Editor {
});
supports
}
pub fn is_focused(&self, window: &mut Window) -> bool {
pub fn is_focused(&self, window: &Window) -> bool {
self.focus_handle.is_focused(window)
}