refactor: render inline blame in a separate Editor function

Author: nik-rev

helix-term/src/ui/editor.rs

@@ -25,7 +25,7 @@ use helix_core::{
 use helix_view::{
     annotations::diagnostics::DiagnosticFilter,
     document::{Mode, SCRATCH_BUFFER_NAME},
-    editor::{CompleteAction, CursorShapeConfig, InlineBlameBehaviour},
+    editor::{CompleteAction, CursorShapeConfig, InlineBlameBehaviour, InlineBlameConfig},
     graphics::{Color, CursorKind, Modifier, Rect, Style},
     input::{KeyEvent, MouseButton, MouseEvent, MouseEventKind},
     keyboard::{KeyCode, KeyModifiers},
@@ -204,21 +204,70 @@ impl EditorView {
             config.end_of_line_diagnostics,
         ));
 
-        if config.inline_blame.behaviour == InlineBlameBehaviour::CursorLine {
+        Self::render_inline_blame(&config.inline_blame, doc, view, &mut decorations, theme);
+
+        render_document(
+            surface,
+            inner,
+            doc,
+            view_offset,
+            &text_annotations,
+            syntax_highlights,
+            overlay_highlights,
+            theme,
+            decorations,
+        );
+
+        // if we're not at the edge of the screen, draw a right border
+        if viewport.right() != view.area.right() {
+            let x = area.right();
+            let border_style = theme.get("ui.window");
+            for y in area.top()..area.bottom() {
+                surface[(x, y)]
+                    .set_symbol(tui::symbols::line::VERTICAL)
+                    //.set_symbol(" ")
+                    .set_style(border_style);
+            }
+        }
+
+        if config.inline_diagnostics.disabled()
+            && config.end_of_line_diagnostics == DiagnosticFilter::Disable
+        {
+            Self::render_diagnostics(doc, view, inner, surface, theme);
+        }
+
+        let statusline_area = view
+            .area
+            .clip_top(view.area.height.saturating_sub(1))
+            .clip_bottom(1); // -1 from bottom to remove commandline
+
+        let mut context =
+            statusline::RenderContext::new(editor, doc, view, is_focused, &self.spinners);
+
+        statusline::render(&mut context, statusline_area, surface);
+    }
+
+    fn render_inline_blame(
+        inline_blame: &InlineBlameConfig,
+        doc: &Document,
+        view: &View,
+        decorations: &mut DecorationManager,
+        theme: &Theme,
+    ) {
+        if inline_blame.behaviour == InlineBlameBehaviour::CursorLine {
             let cursor_line_idx = doc.cursor_line(view.id);
 
             // do not render inline blame for empty lines to reduce visual noise
             if doc.text().line(cursor_line_idx) != doc.line_ending.as_str() {
-                if let Ok(line_blame) =
-                    doc.line_blame(cursor_line_idx as u32, &config.inline_blame.format)
+                if let Ok(line_blame) = doc.line_blame(cursor_line_idx as u32, &inline_blame.format)
                 {
                     decorations.add_decoration(InlineBlame::new(
                         theme,
                         text_decorations::blame::LineBlame::OneLine((cursor_line_idx, line_blame)),
                     ));
                 };
             }
-        } else if config.inline_blame.behaviour == InlineBlameBehaviour::AllLines {
+        } else if inline_blame.behaviour == InlineBlameBehaviour::AllLines {
             let text = doc.text();
             let text_line_count = text.len_lines();
             let view_height = view.inner_height();
@@ -237,7 +286,7 @@ impl EditorView {
             let blame_for_all_lines = (first_line..last_line).filter_map(|line_idx| {
                 // do not render inline blame for empty lines to reduce visual noise
                 if text.line(line_idx) != doc.line_ending.as_str() {
-                    doc.line_blame(line_idx as u32, &config.inline_blame.format)
+                    doc.line_blame(line_idx as u32, &inline_blame.format)
                         .ok()
                         .map(|blame| (line_idx, blame))
                 } else {
@@ -253,46 +302,6 @@ impl EditorView {
                 text_decorations::blame::LineBlame::ManyLines(blame_lines),
             ));
         }
-
-        render_document(
-            surface,
-            inner,
-            doc,
-            view_offset,
-            &text_annotations,
-            syntax_highlights,
-            overlay_highlights,
-            theme,
-            decorations,
-        );
-
-        // if we're not at the edge of the screen, draw a right border
-        if viewport.right() != view.area.right() {
-            let x = area.right();
-            let border_style = theme.get("ui.window");
-            for y in area.top()..area.bottom() {
-                surface[(x, y)]
-                    .set_symbol(tui::symbols::line::VERTICAL)
-                    //.set_symbol(" ")
-                    .set_style(border_style);
-            }
-        }
-
-        if config.inline_diagnostics.disabled()
-            && config.end_of_line_diagnostics == DiagnosticFilter::Disable
-        {
-            Self::render_diagnostics(doc, view, inner, surface, theme);
-        }
-
-        let statusline_area = view
-            .area
-            .clip_top(view.area.height.saturating_sub(1))
-            .clip_bottom(1); // -1 from bottom to remove commandline
-
-        let mut context =
-            statusline::RenderContext::new(editor, doc, view, is_focused, &self.spinners);
-
-        statusline::render(&mut context, statusline_area, surface);
     }
 
     pub fn render_rulers(