Merge remote-tracking branch 'upstream/master' into mix_20240309

1 files changed, 22 insertions, 3 deletions

diff --git a/test/functional/ui/winbar_spec.lua b/test/functional/ui/winbar_spec.lua
index fb907026a5..d1fd273dc1 100644
--- a/test/functional/ui/winbar_spec.lua
+++ b/test/functional/ui/winbar_spec.lua
@@ -18,7 +18,6 @@ describe('winbar', function()
   before_each(function()
     clear()
     screen = Screen.new(60, 13)
-    screen:attach()
     screen:set_default_attr_ids({
       [1] = { bold = true },
       [2] = { reverse = true },
@@ -40,6 +39,16 @@ describe('winbar', function()
         bold = true,
         foreground = Screen.colors.Magenta,
       },
+      [12] = {
+        underline = true,
+        background = Screen.colors.Red,
+      },
+      [13] = {
+        underline = true,
+        bold = true,
+        foreground = Screen.colors.Blue,
+        background = Screen.colors.Red,
+      },
     })
     api.nvim_set_option_value('winbar', 'Set Up The Bars', {})
   end)
@@ -182,6 +191,18 @@ describe('winbar', function()
     ]])
   end)
 
+  it('works with combined highlight attributes', function()
+    command('hi Winbar guibg=red gui=underline')
+    command('hi Identifier guifg=blue gui=bold')
+    command('set winbar=Lookatmy%#Identifier#highlights')
+    screen:expect([[
+      {12:Lookatmy}{13:highlights                                          }|
+      ^                                                            |
+      {3:~                                                           }|*10
+                                                                  |
+    ]])
+  end)
+
   it('can be ruler', function()
     insert [[
       just some
@@ -526,7 +547,6 @@ describe('local winbar with tabs', function()
   before_each(function()
     clear()
     screen = Screen.new(60, 10)
-    screen:attach()
     api.nvim_set_option_value('winbar', 'foo', { scope = 'local', win = 0 })
   end)
 
@@ -604,7 +624,6 @@ it('winbar works properly when redrawing is postponed #23534', function()
     },
   })
   local screen = Screen.new(60, 6)
-  screen:attach()
   screen:expect([[
     {5:(winbar)                                                    }|
     ^                                                            |