Merge pull request #19409 from bfredl/uiunpack

perf(ui): some ui_client fixes/optimizations before externalized TUI

3 files changed, 15 insertions, 5 deletions

diff --git a/test/functional/editor/put_spec.lua b/test/functional/editor/put_spec.lua
index cc9fce8f67..5050edff5c 100644
--- a/test/functional/editor/put_spec.lua
+++ b/test/functional/editor/put_spec.lua
@@ -879,9 +879,13 @@ describe('put command', function()
 	ine of words 2]], curbuf_contents())
     end)
 
-    local function bell_test(actions, should_ring)
-      local screen = Screen.new()
+    local screen
+    setup(function()
+      screen = Screen.new()
       screen:attach()
+    end)
+
+    local function bell_test(actions, should_ring)
       if should_ring then
         -- check bell is not set by nvim before the action
         screen:sleep(50)
@@ -899,7 +903,6 @@ describe('put command', function()
           end
         end
       end, unchanged=(not should_ring)}
-      screen:detach()
     end
 
     it('should not ring the bell with gp at end of line', function()
diff --git a/test/functional/ui/cursor_spec.lua b/test/functional/ui/cursor_spec.lua
index a1423c98a8..03cd4bfd06 100644
--- a/test/functional/ui/cursor_spec.lua
+++ b/test/functional/ui/cursor_spec.lua
@@ -215,7 +215,7 @@ describe('ui/cursor', function()
           m.hl_id = 60
           m.attr = {background = Screen.colors.DarkGray}
       end
-      if m.id_lm then m.id_lm = 65 end
+      if m.id_lm then m.id_lm = 61 end
     end
 
     -- Assert the new expectation.
diff --git a/test/functional/ui/options_spec.lua b/test/functional/ui/options_spec.lua
index c2b0bcdb64..8d7c404637 100644
--- a/test/functional/ui/options_spec.lua
+++ b/test/functional/ui/options_spec.lua
@@ -51,7 +51,7 @@ describe('UI receives option updates', function()
   end)
 
   it('on attach #11372', function()
-    clear()
+    clear{args_rm={'--headless'}}
     local evs = {}
     screen = Screen.new(20,5)
     -- Override mouse_on/mouse_off handlers.
@@ -88,6 +88,13 @@ describe('UI receives option updates', function()
       eq(expected, screen.options)
     end)
 
+    command("set pumblend=50")
+    expected.pumblend = 50
+    screen:expect(function()
+        eq(expected, screen.options)
+    end)
+
+    -- check handling of out-of-bounds value
     command("set pumblend=-1")
     expected.pumblend = 0
     screen:expect(function()