Fix blame todos

Mikayla Maki created 2 months ago

Change summary

crates/editor/src/editor.rs                   |  4 +-
crates/editor/src/editor_settings_controls.rs |  2 
crates/git_ui/src/blame_ui.rs                 |  3 +
crates/onboarding/src/editing_page.rs         |  2 
crates/project/src/project_settings.rs        | 35 +++------------------
5 files changed, 11 insertions(+), 35 deletions(-)

Detailed changes

crates/editor/src/editor.rs

@@ -2187,7 +2187,7 @@ impl Editor {
             show_selection_menu: None,
             show_git_blame_inline_delay_task: None,
             git_blame_inline_enabled: full_mode
-                && ProjectSettings::get_global(cx).git.inline_blame_enabled(),
+                && ProjectSettings::get_global(cx).git.inline_blame.enabled,
             render_diff_hunk_controls: Arc::new(render_diff_hunk_controls),
             serialize_dirty_buffers: !is_minimap
                 && ProjectSettings::get_global(cx)
@@ -20722,7 +20722,7 @@ impl Editor {
 
         if self.mode.is_full() {
             let show_inline_diagnostics = project_settings.diagnostics.inline.enabled;
-            let inline_blame_enabled = project_settings.git.inline_blame_enabled();
+            let inline_blame_enabled = project_settings.git.inline_blame.enabled;
             if self.show_inline_diagnostics != show_inline_diagnostics {
                 self.show_inline_diagnostics = show_inline_diagnostics;
                 self.refresh_inline_diagnostics(false, window, cx);

crates/editor/src/editor_settings_controls.rs

@@ -267,7 +267,7 @@ impl EditableSettingControl for InlineGitBlameControl {
 
     fn read(cx: &App) -> Self::Value {
         let settings = ProjectSettings::get_global(cx);
-        settings.git.inline_blame_enabled()
+        settings.git.inline_blame.enabled
     }
 
     fn apply(settings: &mut SettingsContent, value: Self::Value, _cx: &App) {

crates/git_ui/src/blame_ui.rs

@@ -130,7 +130,8 @@ impl BlameRenderer for GitBlameRenderer {
         let author = blame_entry.author.as_deref().unwrap_or_default();
         let summary_enabled = ProjectSettings::get_global(cx)
             .git
-            .show_inline_commit_summary();
+            .inline_blame
+            .show_commit_summary;
 
         let text = match blame_entry.summary.as_ref() {
             Some(summary) if summary_enabled => {

crates/onboarding/src/editing_page.rs

@@ -70,7 +70,7 @@ fn write_inlay_hints(enabled: bool, cx: &mut App) {
 }
 
 fn read_git_blame(cx: &App) -> bool {
-    ProjectSettings::get_global(cx).git.inline_blame_enabled()
+    ProjectSettings::get_global(cx).git.inline_blame.enabled
 }
 
 fn write_git_blame(enabled: bool, cx: &mut App) {

crates/project/src/project_settings.rs

@@ -359,37 +359,12 @@ pub struct InlineBlameSettings {
 }
 
 impl GitSettings {
-    // todo! remove
-    pub fn inline_blame_enabled(&self) -> bool {
-        self.inline_blame.enabled
-        // #[allow(unknown_lints, clippy::manual_unwrap_or_default)]
-        // match self.inline_blame {
-        //     Some(InlineBlameSettings { enabled, .. }) => enabled,
-        //     _ => false,
-        // }
-    }
-
-    // todo! remove
     pub fn inline_blame_delay(&self) -> Option<Duration> {
-        Some(self.inline_blame.delay_ms)
-        // match self.inline_blame {
-        //     Some(InlineBlameSettings { delay_ms, .. }) if delay_ms > 0 => {
-        //         Some(Duration::from_millis(delay_ms))
-        //     }
-        //     _ => None,
-        // }
-    }
-
-    // todo! remove
-    pub fn show_inline_commit_summary(&self) -> bool {
-        self.inline_blame.show_commit_summary
-        // match self.inline_blame {
-        //     Some(InlineBlameSettings {
-        //         show_commit_summary,
-        //         ..
-        //     }) => show_commit_summary,
-        //     _ => false,
-        // }
+        if self.inline_blame.delay_ms.as_millis() > 0 {
+            Some(self.inline_blame.delay_ms)
+        } else {
+            None
+        }
     }
 }