Merge pull request #8455 from UtkarshMe/grid-split

implement ext_multigrid: draw each window on a separate resizable grid.

2 files changed, 10 insertions, 10 deletions

diff --git a/test/functional/terminal/helpers.lua b/test/functional/terminal/helpers.lua
index ae8d4704e4..7de0152de0 100644
--- a/test/functional/terminal/helpers.lua
+++ b/test/functional/terminal/helpers.lua
@@ -72,10 +72,10 @@ local function screen_setup(extra_rows, command, cols)
   if command == default_command then
     -- Wait for "tty ready" to be printed before each test or the terminal may
     -- still be in canonical mode (will echo characters for example).
-    local empty_line = (' '):rep(cols + 1)
+    local empty_line = (' '):rep(cols)
     local expected = {
-      'tty ready'..(' '):rep(cols - 8),
-      '{1: }'    ..(' '):rep(cols),
+      'tty ready'..(' '):rep(cols - 9),
+      '{1: }'    ..(' '):rep(cols - 1),
       empty_line,
       empty_line,
       empty_line,
@@ -85,8 +85,8 @@ local function screen_setup(extra_rows, command, cols)
       table.insert(expected, empty_line)
     end
 
-    table.insert(expected, '{3:-- TERMINAL --}' .. ((' '):rep(cols - 13)))
-    screen:expect(table.concat(expected, '\n'))
+    table.insert(expected, '{3:-- TERMINAL --}' .. ((' '):rep(cols - 14)))
+    screen:expect(table.concat(expected, '|\n')..'|')
   else
     -- This eval also acts as a wait().
     if 0 == nvim('eval', "exists('b:terminal_job_id')") then
diff --git a/test/functional/terminal/tui_spec.lua b/test/functional/terminal/tui_spec.lua
index 0b47314be7..68652bfb7f 100644
--- a/test/functional/terminal/tui_spec.lua
+++ b/test/functional/terminal/tui_spec.lua
@@ -259,10 +259,10 @@ describe('tui', function()
     feed_data(':echo map(nvim_list_uis(), {k,v -> sort(items(v))})\013')
     screen:expect([=[
       [[['ext_cmdline', v:false], ['ext_hlstate', v:fals|
-      e], ['ext_linegrid', v:true], ['ext_popupmenu', v:|
-      false], ['ext_tabline', v:false], ['ext_wildmenu',|
-       v:false], ['height', 6], ['rgb', v:false], ['widt|
-      h', 50]]]                                         |
+      e], ['ext_linegrid', v:true], ['ext_multigrid', v:|
+      false], ['ext_popupmenu', v:false], ['ext_tabline'|
+      , v:false], ['ext_wildmenu', v:false], ['height', |
+      6], ['rgb', v:false], ['width', 50]]]             |
       {10:Press ENTER or type command to continue}{1: }          |
       {3:-- TERMINAL --}                                    |
     ]=])
@@ -401,7 +401,7 @@ describe('tui FocusGained/FocusLost', function()
       -- Exit cmdline-mode. Redraws from timers/events are blocked during
       -- cmdline-mode, so the buffer won't be updated until we exit cmdline-mode.
       feed_data('\n')
-      screen:expect{any='lost'..(' '):rep(46)..'\ngained'}
+      screen:expect{any='lost'..(' '):rep(46)..'|\ngained'}
     end)
   end)