feat(extmarks): support hl_mode "combine" for inline virt_text (#24099)

1 files changed, 26 insertions, 20 deletions

diff --git a/test/functional/ui/decorations_spec.lua b/test/functional/ui/decorations_spec.lua
index 419a16e7b5..5de0106a8c 100644
--- a/test/functional/ui/decorations_spec.lua
+++ b/test/functional/ui/decorations_spec.lua
@@ -1587,13 +1587,15 @@ describe('decorations: inline virtual text', function()
       [9] = {background = Screen.colors.Plum1};
       [10] = {foreground = Screen.colors.SlateBlue};
       [11] = {blend = 30, background = Screen.colors.Red1};
-      [12] = {background = Screen.colors.Yellow1};
+      [12] = {background = Screen.colors.Yellow};
       [13] = {reverse = true};
       [14] = {foreground = Screen.colors.SlateBlue, background = Screen.colors.LightMagenta};
       [15] = {bold = true, reverse = true};
       [16] = {foreground = Screen.colors.Red};
       [17] = {background = Screen.colors.LightGrey, foreground = Screen.colors.DarkBlue};
       [18] = {background = Screen.colors.LightGrey, foreground = Screen.colors.Red};
+      [19] = {background = Screen.colors.Yellow, foreground = Screen.colors.SlateBlue};
+      [20] = {background = Screen.colors.LightGrey, foreground = Screen.colors.SlateBlue};
     }
 
     ns = meths.create_namespace 'test'
@@ -2000,13 +2002,15 @@ bbbbbbb]])
   end)
 
   it('search highlight is correct', function()
-    insert('foo foo foo foo')
-    feed('0')
-    meths.buf_set_extmark(0, ns, 0, 8,
-            { virt_text = { { 'virtual text', 'Special' } }, virt_text_pos = 'inline' })
+    insert('foo foo foo foo\nfoo foo foo foo')
+    feed('gg0')
+    meths.buf_set_extmark(0, ns, 0, 9, { virt_text = { { 'AAA', 'Special' } }, virt_text_pos = 'inline' })
+    meths.buf_set_extmark(0, ns, 0, 9, { virt_text = { { 'BBB', 'Special' } }, virt_text_pos = 'inline', hl_mode = 'combine' })
+    meths.buf_set_extmark(0, ns, 1, 9, { virt_text = { { 'CCC', 'Special' } }, virt_text_pos = 'inline', hl_mode = 'combine' })
+    meths.buf_set_extmark(0, ns, 1, 9, { virt_text = { { 'DDD', 'Special' } }, virt_text_pos = 'inline', hl_mode = 'replace' })
     screen:expect { grid = [[
-      ^foo foo {10:virtual text}foo foo                       |
-      {1:~                                                 }|
+      ^foo foo f{10:AAABBB}oo foo                             |
+      foo foo f{10:CCCDDD}oo foo                             |
       {1:~                                                 }|
       {1:~                                                 }|
       {1:~                                                 }|
@@ -2019,8 +2023,8 @@ bbbbbbb]])
 
     feed('/foo')
     screen:expect { grid = [[
-      {12:foo} {13:foo} {10:virtual text}{12:foo} {12:foo}                       |
-      {1:~                                                 }|
+      {12:foo} {13:foo} {12:f}{10:AAA}{19:BBB}{12:oo} {12:foo}                             |
+      {12:foo} {12:foo} {12:f}{19:CCC}{10:DDD}{12:oo} {12:foo}                             |
       {1:~                                                 }|
       {1:~                                                 }|
       {1:~                                                 }|
@@ -2033,14 +2037,16 @@ bbbbbbb]])
   end)
 
   it('visual select highlight is correct', function()
-    insert('foo foo foo foo')
-    feed('0')
-    meths.buf_set_extmark(0, ns, 0, 8,
-      { virt_text = { { 'virtual text', 'Special' } }, virt_text_pos = 'inline' })
+    insert('foo foo foo foo\nfoo foo foo foo')
+    feed('gg0')
+    meths.buf_set_extmark(0, ns, 0, 8, { virt_text = { { 'AAA', 'Special' } }, virt_text_pos = 'inline' })
+    meths.buf_set_extmark(0, ns, 0, 8, { virt_text = { { 'BBB', 'Special' } }, virt_text_pos = 'inline', hl_mode = 'combine' })
+    meths.buf_set_extmark(0, ns, 1, 8, { virt_text = { { 'CCC', 'Special' } }, virt_text_pos = 'inline', hl_mode = 'combine' })
+    meths.buf_set_extmark(0, ns, 1, 8, { virt_text = { { 'DDD', 'Special' } }, virt_text_pos = 'inline', hl_mode = 'replace' })
     feed('8l')
     screen:expect { grid = [[
-      foo foo {10:virtual text}^foo foo                       |
-      {1:~                                                 }|
+      foo foo {10:AAABBB}^foo foo                             |
+      foo foo {10:CCCDDD}foo foo                             |
       {1:~                                                 }|
       {1:~                                                 }|
       {1:~                                                 }|
@@ -2051,11 +2057,11 @@ bbbbbbb]])
                                                         |
       ]]}
 
-    feed('v')
-    feed('2h')
+    feed('<C-V>')
+    feed('2hj')
     screen:expect { grid = [[
-      foo fo^o{7: }{10:virtual text}{7:f}oo foo                       |
-      {1:~                                                 }|
+      foo fo{7:o }{10:AAA}{20:BBB}{7:f}oo foo                             |
+      foo fo^o{7: }{20:CCC}{10:DDD}{7:f}oo foo                             |
       {1:~                                                 }|
       {1:~                                                 }|
       {1:~                                                 }|
@@ -2063,7 +2069,7 @@ bbbbbbb]])
       {1:~                                                 }|
       {1:~                                                 }|
       {1:~                                                 }|
-      {8:-- VISUAL --}                                      |
+      {8:-- VISUAL BLOCK --}                                |
       ]]}
   end)