From 376de1483ee5380aaf5d2b6bb93d6ba245bfc329 Mon Sep 17 00:00:00 2001
From: zeertzjq <zeertzjq@outlook.com>
Date: Tue, 8 Oct 2024 06:24:36 +0800
Subject: fix(drawline): correct highlight priority with Visual selection
 (#30706)

---
 test/functional/ui/fold_spec.lua | 16 ++++++++++------
 1 file changed, 10 insertions(+), 6 deletions(-)

(limited to 'test/functional/ui/fold_spec.lua')

diff --git a/test/functional/ui/fold_spec.lua b/test/functional/ui/fold_spec.lua
index 2712e5ff48..8f6e8aef7e 100644
--- a/test/functional/ui/fold_spec.lua
+++ b/test/functional/ui/fold_spec.lua
@@ -55,6 +55,8 @@ describe('folded lines', function()
         },
         [19] = { background = Screen.colors.Yellow, foreground = Screen.colors.DarkBlue },
         [20] = { background = Screen.colors.Red, bold = true, foreground = Screen.colors.Blue },
+        [21] = { background = Screen.colors.LightGrey, foreground = Screen.colors.Green },
+        [22] = { background = Screen.colors.Red, foreground = Screen.colors.Green },
       })
     end)
 
@@ -2625,6 +2627,8 @@ describe('folded lines', function()
       command('hi! CursorLine guibg=NONE guifg=Red gui=NONE')
       command('hi F0 guibg=Red guifg=Black')
       command('hi F1 guifg=White')
+      command([[syn match Keyword /\<sentence\>/]])
+      command('hi! Keyword guibg=NONE guifg=Green')
       api.nvim_set_option_value('cursorline', true, {})
       api.nvim_set_option_value('foldcolumn', '4', {})
       api.nvim_set_option_value('foldtext', '', {})
@@ -2662,7 +2666,7 @@ describe('folded lines', function()
         ## grid 2
           {7:    }This is a                 |
           {7:-   }valid English             |
-          {7:│+  }{5:sentence composed by······}|
+          {7:│+  }{21:sentence}{5: composed by······}|
           {7:│+  }{13:^in his cave.··············}|
           {1:~                             }|*2
         ## grid 3
@@ -2672,7 +2676,7 @@ describe('folded lines', function()
         screen:expect([[
           {7:    }This is a                 |
           {7:-   }valid English             |
-          {7:│+  }{5:sentence composed by······}|
+          {7:│+  }{21:sentence}{5: composed by······}|
           {7:│+  }{13:^in his cave.··············}|
           {1:~                             }|*2
                                         |
@@ -2689,7 +2693,7 @@ describe('folded lines', function()
         ## grid 2
           {7:    }This is a                 |
           {7:-   }^v{14:alid English}             |
-          {7:│+  }{15:sentence composed by······}|
+          {7:│+  }{22:sentence}{15: composed by······}|
           {7:│+  }{15:in his cave.··············}|
           {1:~                             }|*2
         ## grid 3
@@ -2699,7 +2703,7 @@ describe('folded lines', function()
         screen:expect([[
           {7:    }This is a                 |
           {7:-   }^v{14:alid English}             |
-          {7:│+  }{15:sentence composed by······}|
+          {7:│+  }{22:sentence}{15: composed by······}|
           {7:│+  }{15:in his cave.··············}|
           {1:~                             }|*2
           {11:-- VISUAL LINE --}             |
@@ -2715,7 +2719,7 @@ describe('folded lines', function()
         ## grid 2
                            a si sihT{7:    }|
                        {14:hsilgnE dila}^v{7:   -}|
-          {15:······yb desopmoc ecnetnes}{7:  +│}|
+          {15:······yb desopmoc }{22:ecnetnes}{7:  +│}|
           {15:··············.evac sih ni}{7:  +│}|
           {1:                             ~}|*2
         ## grid 3
@@ -2725,7 +2729,7 @@ describe('folded lines', function()
         screen:expect([[
                            a si sihT{7:    }|
                        {14:hsilgnE dila}^v{7:   -}|
-          {15:······yb desopmoc ecnetnes}{7:  +│}|
+          {15:······yb desopmoc }{22:ecnetnes}{7:  +│}|
           {15:··············.evac sih ni}{7:  +│}|
           {1:                             ~}|*2
           {11:-- VISUAL LINE --}             |
-- 
cgit 


From e61228a214ebda9845db9462dad0a8c362d3963f Mon Sep 17 00:00:00 2001
From: bfredl <bjorn.linse@gmail.com>
Date: Mon, 11 Nov 2024 22:15:19 +0100
Subject: fix(tests): needing two calls to setup a screen is cringe

Before calling "attach" a screen object is just a dummy container for
(row, col) values whose purpose is to be sent as part of the "attach"
function call anyway.

Just create the screen in an attached state directly. Keep the complete
(row, col, options) config together. It is still completely valid to
later detach and re-attach as needed, including to another session.
---
 test/functional/ui/fold_spec.lua | 3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)

(limited to 'test/functional/ui/fold_spec.lua')

diff --git a/test/functional/ui/fold_spec.lua b/test/functional/ui/fold_spec.lua
index 8f6e8aef7e..aea629df07 100644
--- a/test/functional/ui/fold_spec.lua
+++ b/test/functional/ui/fold_spec.lua
@@ -28,8 +28,7 @@ describe('folded lines', function()
   local function with_ext_multigrid(multigrid)
     local screen
     before_each(function()
-      screen = Screen.new(45, 8)
-      screen:attach({ rgb = true, ext_multigrid = multigrid })
+      screen = Screen.new(45, 8, { rgb = true, ext_multigrid = multigrid })
       screen:set_default_attr_ids({
         [1] = { bold = true, foreground = Screen.colors.Blue1 },
         [2] = { reverse = true },
-- 
cgit