From 1803b0ffd7f08b50a3f59272ebe7290ffd21e90f Mon Sep 17 00:00:00 2001
From: Javier Lopez <graulopezjavier@gmail.com>
Date: Mon, 4 Jul 2022 15:09:47 -0500
Subject: fix(tui): resize at startup #17795

* fix(test): screen.lua nil index
  When actual_rows and expected_rows are different avoid a nil index.
* fix(tui): resize at startup
  The deleted code is not needed after 402b4e8.
  It caused the condition to false positive when the function was called
  more than once before startup (first normal mode). Being itself what
  set the dimension and not the user, locking the size of the screen to
  an incorrect size.
  Make got_winch an int to mitigate: tui_grid_resize changing the size
  of the host terminal between the signal handler and the call to
  sigwinch_cb. Since the actual signal handler uv__signal_handle doesn't
  directly call the callback, the event loop does.

Fixes #17285
Fixes #15044
Fixes #11330
---
 test/functional/terminal/tui_spec.lua | 18 ++++++++++++++++++
 test/functional/ui/screen.lua         |  2 +-
 2 files changed, 19 insertions(+), 1 deletion(-)

(limited to 'test/functional')

diff --git a/test/functional/terminal/tui_spec.lua b/test/functional/terminal/tui_spec.lua
index 89704be820..15fcfd52da 100644
--- a/test/functional/terminal/tui_spec.lua
+++ b/test/functional/terminal/tui_spec.lua
@@ -85,6 +85,24 @@ describe('TUI', function()
     assert_alive()
   end)
 
+  it('resize at startup', function()
+    -- Issues: #17285 #15044 #11330
+    screen:try_resize(50, 10)
+    feed_command([[call termopen([v:progpath, '--clean', '--cmd', 'let start = reltime() | while v:true | if reltimefloat(reltime(start)) > 2 | break | endif | endwhile']) | sleep 500m | vs new]])
+    screen:expect([[
+      {1: }                        │                        |
+      {4:~                        }│{4:~                       }|
+      {4:~                        }│{4:~                       }|
+      {4:~                        }│{4:~                       }|
+      {4:~                        }│{4:~                       }|
+      {4:~                        }│{5:[No Name]   0,0-1    All}|
+      {4:~                        }│                        |
+      {5:new                       }{MATCH:<.*[/\]nvim }|
+                                                        |
+      {3:-- TERMINAL --}                                    |
+    ]])
+  end)
+
   it('accepts resize while pager is active', function()
     child_session:request("nvim_command", [[
     set more
diff --git a/test/functional/ui/screen.lua b/test/functional/ui/screen.lua
index e628fcea01..ea98705394 100644
--- a/test/functional/ui/screen.lua
+++ b/test/functional/ui/screen.lua
@@ -383,7 +383,7 @@ function Screen:expect(expected, attr_ids, ...)
       for i, row in ipairs(expected_rows) do
         msg_expected_rows[i] = row
         local m = (row ~= actual_rows[i] and row:match('{MATCH:(.*)}') or nil)
-        if row ~= actual_rows[i] and (not m or not actual_rows[i]:match(m)) then
+        if row ~= actual_rows[i] and (not m or not (actual_rows[i] and actual_rows[i]:match(m))) then
           msg_expected_rows[i] = '*' .. msg_expected_rows[i]
           if i <= #actual_rows then
             actual_rows[i] = '*' .. actual_rows[i]
-- 
cgit