From da577cf1acc5e968b933a278a0f02fc212a92eb9 Mon Sep 17 00:00:00 2001
From: Nikita Revenco <154856872+NikitaRevenco@users.noreply.github.com>
Date: Fri, 7 Feb 2025 21:04:56 +0000
Subject: [PATCH] feat: always render the statusline
---
helix-term/src/ui/editor.rs | 15 +--------------
1 file changed, 1 insertion(+), 14 deletions(-)
diff --git a/helix-term/src/ui/editor.rs b/helix-term/src/ui/editor.rs
index 3ca5fd2d..989de61b 100644
--- a/helix-term/src/ui/editor.rs
+++ b/helix-term/src/ui/editor.rs
@@ -241,20 +241,7 @@ impl EditorView {
let mut context =
statusline::RenderContext::new(editor, doc, view, is_focused, &self.spinners);
- let is_bottom_statusline = viewport.height - statusline_area.y == 1;
- let has_editor_status = editor.status_msg.is_some();
-
- // We always render the statusline, unless it meets all of these conditions:
- // - It's at the bottom of the screen
- // - There is a status message
- // - We want to merge the statusline with the commandline
- //
- // In this case, the status message is overlaid on top of the statusline, and we do not render the statusline.
- if is_bottom_statusline && has_editor_status && config.statusline.merge_with_commandline {
- // do not render the statusline
- } else {
- statusline::render(&mut context, statusline_area, surface)
- }
+ statusline::render(&mut context, statusline_area, surface)
}
pub fn render_rulers(