From 5c5fb972d0402abe97d1ed58cacfc73f7aad9d54 Mon Sep 17 00:00:00 2001 From: Thorsten Ball Date: Tue, 16 Apr 2024 17:25:24 +0200 Subject: [PATCH] Handle setting git blame delay to 0 (#10626) Release Notes: - N/A --- crates/editor/src/editor.rs | 16 +++++++++------- 1 file changed, 9 insertions(+), 7 deletions(-) diff --git a/crates/editor/src/editor.rs b/crates/editor/src/editor.rs index 73c457ed89..851c6b558b 100644 --- a/crates/editor/src/editor.rs +++ b/crates/editor/src/editor.rs @@ -8920,14 +8920,16 @@ impl Editor { } fn start_git_blame_inline(&mut self, user_triggered: bool, cx: &mut ViewContext) { - if let Some(inline_blame_settings) = ProjectSettings::get_global(cx).git.inline_blame { - self.start_git_blame(user_triggered, cx); + self.start_git_blame(user_triggered, cx); - if inline_blame_settings.delay_ms.is_some() { - self.start_inline_blame_timer(cx); - } else { - self.show_git_blame_inline = true - } + if ProjectSettings::get_global(cx) + .git + .inline_blame_delay() + .is_some() + { + self.start_inline_blame_timer(cx); + } else { + self.show_git_blame_inline = true } }