From 39db02616158020b180a56dc8f1bdcf9f8365945 Mon Sep 17 00:00:00 2001
From: Junegunn Choi <junegunn.c@gmail.com>
Date: Thu, 5 Jun 2025 22:02:22 +0900
Subject: Fix inconsistent placement of header-lines with border options

fzf displayed --header-lines inconsistently depending on the presence of borders:

  # --header and --header-lines co-located
  seq 10 | fzf --header-lines 3 --header "$(seq 101 103)" --header-first

  # --header and --header-lines separated
  seq 10 | fzf --header-lines 3 --header "$(seq 101 103)" --header-first --header-lines-border

This commit fixes the inconsistency with the following logic:

* If only one of --header or --header-lines is provided, --header-first
  applies to that single header.
* If both are present, --header-first affects only the regular --header,
  not --header-lines.
---
 test/test_layout.rb | 18 +++++++++---------
 1 file changed, 9 insertions(+), 9 deletions(-)

(limited to 'test')

diff --git a/test/test_layout.rb b/test/test_layout.rb
index 2d30c87a..152abb8c 100644
--- a/test/test_layout.rb
+++ b/test/test_layout.rb
@@ -39,11 +39,11 @@ class TestLayout < TestInteractive
     tmux.send_keys "seq 1000 | #{FZF} --header foobar --header-lines 3 --header-first", :Enter
     block = <<~OUTPUT
       > 4
-        997/997
-      >
         3
         2
         1
+        997/997
+      >
         foobar
     OUTPUT
     tmux.until { assert_block(block, it) }
@@ -53,10 +53,10 @@ class TestLayout < TestInteractive
     tmux.send_keys "seq 1000 | #{FZF} --header foobar --header-lines 3 --header-first --reverse --inline-info", :Enter
     block = <<~OUTPUT
         foobar
+      >   < 997/997
         1
         2
         3
-      >   < 997/997
       > 4
     OUTPUT
     tmux.until { assert_block(block, it) }
@@ -148,10 +148,10 @@ class TestLayout < TestInteractive
       │
       │   4
       │ > 3
-      │   2/2
-      │ >
       │   2
       │   1
+      │   2/2
+      │ >
       │   foo
       ╰───────
     OUTPUT
@@ -609,11 +609,11 @@ class TestLayout < TestInteractive
       │   4
       │ > 3
       ╰──────────
+          2
+          1
           98/98 ─
         >
       ╭──────────
-      │   2
-      │   1
       │   hello
       ╰──────────
     BLOCK
@@ -666,12 +666,12 @@ class TestLayout < TestInteractive
       │   4
       │ > 3
       ╰──────────
+          98/98 ─
+        >
       ╔══════════
       ║   2
       ║   1
       ╚══════════
-          98/98 ─
-        >
     BLOCK
     tmux.until { assert_block(block1, it) }
 
-- 
cgit v1.2.3