Merge #4744 'highlight listchar in cursorline'

1 files changed, 250 insertions, 0 deletions

diff --git a/test/functional/ui/highlight_spec.lua b/test/functional/ui/highlight_spec.lua
index d0df99677a..0229b8bbf7 100644
--- a/test/functional/ui/highlight_spec.lua
+++ b/test/functional/ui/highlight_spec.lua
@@ -361,3 +361,253 @@ describe('guisp (special/undercurl)', function()
 
   end)
 end)
+
+describe("'cursorline' with 'listchars'", function()
+  local screen
+
+  local hlgroup_colors = {
+    NonText = Screen.colors.Blue,
+    Cursorline = Screen.colors.Grey90,
+    SpecialKey = Screen.colors.Red,
+    Visual = Screen.colors.LightGrey,
+  }
+
+  before_each(function()
+    clear()
+    screen = Screen.new(20,5)
+    screen:attach()
+  end)
+
+  after_each(function()
+    screen:detach()
+  end)
+
+  it("'cursorline' and 'cursorcolumn'", function()
+    screen:set_default_attr_ids({[1] = {background=hlgroup_colors.Cursorline}})
+    screen:set_default_attr_ignore( {{bold=true, foreground=hlgroup_colors.NonText}} )
+    execute('highlight clear ModeMsg')
+    execute('set cursorline')
+    feed('i')
+    screen:expect([[
+      {1:^                    }|
+      ~                   |
+      ~                   |
+      ~                   |
+      -- INSERT --        |
+    ]])
+    feed('abcdefg<cr>kkasdf')
+    screen:expect([[
+      abcdefg             |
+      {1:kkasdf^              }|
+      ~                   |
+      ~                   |
+      -- INSERT --        |
+    ]])
+    feed('<esc>')
+    screen:expect([[
+      abcdefg             |
+      {1:kkasd^f              }|
+      ~                   |
+      ~                   |
+                          |
+    ]])
+    execute('set nocursorline')
+    screen:expect([[
+      abcdefg             |
+      kkasd^f              |
+      ~                   |
+      ~                   |
+      :set nocursorline   |
+    ]])
+    feed('k')
+    screen:expect([[
+      abcde^fg             |
+      kkasdf              |
+      ~                   |
+      ~                   |
+      :set nocursorline   |
+    ]])
+    feed('jjji<cr><cr><cr><esc>')
+    screen:expect([[
+      kkasd               |
+                          |
+                          |
+      ^f                   |
+                          |
+    ]])
+    execute('set cursorline')
+    execute('set cursorcolumn')
+    feed('kkiabcdefghijk<esc>hh')
+    screen:expect([[
+      kkasd   {1: }           |
+      {1:abcdefgh^ijk         }|
+              {1: }           |
+      f       {1: }           |
+                          |
+    ]])
+    feed('khh')
+    screen:expect([[
+      {1:kk^asd               }|
+      ab{1:c}defghijk         |
+        {1: }                 |
+      f {1: }                 |
+                          |
+    ]])
+  end)
+
+  it("'cursorline' and with 'listchar' option: space, eol, tab, and trail", function()
+    screen:set_default_attr_ids({
+      [1] = {background=hlgroup_colors.Cursorline},
+      [2] = {
+        foreground=hlgroup_colors.SpecialKey,
+        background=hlgroup_colors.Cursorline,
+      },
+      [3] = {
+        background=hlgroup_colors.Cursorline,
+        foreground=hlgroup_colors.NonText,
+        bold=true,
+      },
+      [4] = {
+        foreground=hlgroup_colors.NonText,
+        bold=true,
+      },
+      [5] = {
+        foreground=hlgroup_colors.SpecialKey,
+      },
+    })
+    execute('highlight clear ModeMsg')
+    execute('highlight SpecialKey guifg=#FF0000')
+    execute('set cursorline')
+    execute('set tabstop=8')
+    execute('set listchars=space:.,eol:¬,tab:>-,extends:>,precedes:<,trail:* list')
+    feed('i\t abcd <cr>\t abcd <cr><esc>k')
+    screen:expect([[
+      {5:>-------.}abcd{5:*}{4:¬}     |
+      {2:^>-------.}{1:abcd}{2:*}{3:¬}{1:     }|
+      {4:¬}                   |
+      {4:~                   }|
+                          |
+    ]])
+    feed('k')
+    screen:expect([[
+      {2:^>-------.}{1:abcd}{2:*}{3:¬}{1:     }|
+      {5:>-------.}abcd{5:*}{4:¬}     |
+      {4:¬}                   |
+      {4:~                   }|
+                          |
+    ]])
+    execute('set nocursorline')
+    screen:expect([[
+      {5:^>-------.}abcd{5:*}{4:¬}     |
+      {5:>-------.}abcd{5:*}{4:¬}     |
+      {4:¬}                   |
+      {4:~                   }|
+      :set nocursorline   |
+    ]])
+    execute('set nowrap')
+    feed('ALorem ipsum dolor sit amet<ESC>0')
+    screen:expect([[
+      {5:^>-------.}abcd{5:.}Lorem{4:>}|
+      {5:>-------.}abcd{5:*}{4:¬}     |
+      {4:¬}                   |
+      {4:~                   }|
+                          |
+    ]])
+    execute('set cursorline')
+    screen:expect([[
+      {2:^>-------.}{1:abcd}{2:.}{1:Lorem}{4:>}|
+      {5:>-------.}abcd{5:*}{4:¬}     |
+      {4:¬}                   |
+      {4:~                   }|
+      :set cursorline     |
+    ]])
+    feed('$')
+    screen:expect([[
+      {4:<}{1:r}{2:.}{1:sit}{2:.}{1:ame^t}{3:¬}{1:        }|
+      {4:<}                   |
+      {4:<}                   |
+      {4:~                   }|
+      :set cursorline     |
+    ]])
+    feed('G')
+    screen:expect([[
+      {5:>-------.}abcd{5:.}Lorem{4:>}|
+      {5:>-------.}abcd{5:*}{4:¬}     |
+      {3:^¬}{1:                   }|
+      {4:~                   }|
+      :set cursorline     |
+    ]])
+  end)
+
+  it("'listchar' in visual mode", function()
+    screen:set_default_attr_ids({
+      [1] = {background=hlgroup_colors.Cursorline},
+      [2] = {
+        foreground=hlgroup_colors.SpecialKey,
+        background=hlgroup_colors.Cursorline,
+      },
+      [3] = {
+        background=hlgroup_colors.Cursorline,
+        foreground=hlgroup_colors.NonText,
+        bold=true,
+      },
+      [4] = {
+        foreground=hlgroup_colors.NonText,
+        bold=true,
+      },
+      [5] = {
+        foreground=hlgroup_colors.SpecialKey,
+      },
+      [6] = {
+        background=hlgroup_colors.Visual,
+      },
+      [7] = {
+        background=hlgroup_colors.Visual,
+        foreground=hlgroup_colors.SpecialKey,
+      },
+      [8] = {
+        background=hlgroup_colors.Visual,
+        foreground=hlgroup_colors.NonText,
+        bold=true,
+      },
+    })
+    execute('highlight clear ModeMsg')
+    execute('highlight SpecialKey guifg=#FF0000')
+    execute('set cursorline')
+    execute('set tabstop=8')
+    execute('set nowrap')
+    execute('set listchars=space:.,eol:¬,tab:>-,extends:>,precedes:<,trail:* list')
+    feed('i\t abcd <cr>\t abcd Lorem ipsum dolor sit amet<cr><esc>kkk0')
+    screen:expect([[
+      {2:^>-------.}{1:abcd}{2:*}{3:¬}{1:     }|
+      {5:>-------.}abcd{5:.}Lorem{4:>}|
+      {4:¬}                   |
+      {4:~                   }|
+                          |
+    ]])
+    feed('lllvj')
+    screen:expect([[
+      {5:>-------.}a{6:bcd}{7:*}{8:¬}     |
+      {7:>-------.}{6:a}^bcd{5:.}Lorem{4:>}|
+      {4:¬}                   |
+      {4:~                   }|
+      -- VISUAL --        |
+    ]])
+    feed('<esc>V')
+    screen:expect([[
+      {5:>-------.}abcd{5:*}{4:¬}     |
+      {7:>-------.}{6:a}^b{6:cd}{7:.}{6:Lorem}{4:>}|
+      {4:¬}                   |
+      {4:~                   }|
+      -- VISUAL LINE --   |
+    ]])
+    feed('<esc>$')
+    screen:expect([[
+      {4:<}                   |
+      {4:<}{1:r}{2:.}{1:sit}{2:.}{1:ame^t}{3:¬}{1:        }|
+      {4:<}                   |
+      {4:~                   }|
+                          |
+    ]])
+  end)
+end)