refactor(tests): all screen tests should use highlights

This is the first installment of a multi-PR series significantly
refactoring how highlights are being specified.

The end goal is to have a base set of 20 ish most common highlights,
and then specific files only need to add more groups to that as needed.

As a complicating factor, we also want to migrate to the new default
color scheme eventually. But by sharing a base set, that future PR
will hopefully be a lot smaller since a lot of tests will be migrated
just simply by updating the base set in place.

As a first step, fix the anti-pattern than Screen defaults to ignoring
highlights. Highlights are integral part of the screen state, not
something "extra" which we only test "sometimes". For now, we still
allow opt-out via the intentionally ugly

  screen._default_attr_ids = nil

The end goal is to get rid of all of these eventually (which will be
easier as part of the color scheme migration)

3 files changed, 36 insertions, 35 deletions

diff --git a/test/functional/options/chars_spec.lua b/test/functional/options/chars_spec.lua
index e9c20b5da9..2348c5fc1a 100644
--- a/test/functional/options/chars_spec.lua
+++ b/test/functional/options/chars_spec.lua
@@ -22,7 +22,7 @@ describe("'fillchars'", function()
       eq('', eval('&fillchars'))
       screen:expect([[
         ^                         |
-        ~                        |*3
+        {1:~                        }|*3
                                  |
       ]])
     end)
@@ -30,13 +30,14 @@ describe("'fillchars'", function()
     it('supports whitespace', function()
       screen:expect([[
         ^                         |
-        ~                        |*3
+        {1:~                        }|*3
                                  |
       ]])
       command('set fillchars=eob:\\ ')
       screen:expect([[
         ^                         |
-                                 |*4
+        {1:                         }|*3
+                                 |
       ]])
     end)
 
@@ -44,7 +45,7 @@ describe("'fillchars'", function()
       command('set fillchars=eob:ñ')
       screen:expect([[
         ^                         |
-        ñ                        |*3
+        {1:ñ                        }|*3
                                  |
       ]])
     end)
@@ -53,7 +54,7 @@ describe("'fillchars'", function()
       command('set fillchars=eob:å̲')
       screen:expect([[
         ^                         |
-        å̲                        |*3
+        {1:å̲                        }|*3
                                  |
       ]])
     end)
@@ -112,8 +113,8 @@ describe("'fillchars'", function()
     command('vsplit')
     command('set fillchars=fold:x')
     screen:expect([[
-      ^+--  2 lines: fooxxxxxxxx│+--  2 lines: fooxxxxxxx|
-      ~                        │~                       |*3
+      {13:^+--  2 lines: fooxxxxxxxx}│{13:+--  2 lines: fooxxxxxxx}|
+      {1:~                        }│{1:~                       }|*3
                                                         |
     ]])
   end)
@@ -126,8 +127,8 @@ describe("'fillchars'", function()
     command('vsplit')
     command('setl fillchars=fold:x')
     screen:expect([[
-      ^+--  2 lines: fooxxxxxxxx│+--  2 lines: foo·······|
-      ~                        │~                       |*3
+      {13:^+--  2 lines: fooxxxxxxxx}│{13:+--  2 lines: foo·······}|
+      {1:~                        }│{1:~                       }|*3
                                                         |
     ]])
   end)
@@ -141,8 +142,8 @@ describe("'fillchars'", function()
     command('vsplit')
     command('set fillchars&')
     screen:expect([[
-      ^+--  2 lines: foo········│+--  2 lines: fooxxxxxxx|
-      ~                        │~                       |*3
+      {13:^+--  2 lines: foo········}│{13:+--  2 lines: fooxxxxxxx}|
+      {1:~                        }│{1:~                       }|*3
                                                         |
     ]])
   end)
@@ -163,8 +164,8 @@ describe("'listchars'", function()
     command('vsplit')
     command('set listchars=tab:<->')
     screen:expect([[
-      <------><------>^<------> │<------><------><------>|
-      ~                        │~                       |*3
+      {1:<------><------>^<------>} │{1:<------><------><------>}|
+      {1:~                        }│{1:~                       }|*3
                                                         |
     ]])
   end)
@@ -176,8 +177,8 @@ describe("'listchars'", function()
     command('vsplit')
     command('setl listchars<')
     screen:expect([[
-      >       >       ^>        │<------><------><------>|
-      ~                        │~                       |*3
+      {1:>       >       ^>       } │{1:<------><------><------>}|
+      {1:~                        }│{1:~                       }|*3
                                                         |
     ]])
   end)
@@ -189,8 +190,8 @@ describe("'listchars'", function()
     command('vsplit')
     command('set listchars=tab:>-,eol:$')
     screen:expect([[
-      >------->-------^>-------$│<------><------><------>|
-      ~                        │~                       |*3
+      {1:>------->-------^>-------$}│{1:<------><------><------>}|
+      {1:~                        }│{1:~                       }|*3
                                                         |
     ]])
   end)
diff --git a/test/functional/options/defaults_spec.lua b/test/functional/options/defaults_spec.lua
index a7cdc5f9fa..70000f52d2 100644
--- a/test/functional/options/defaults_spec.lua
+++ b/test/functional/options/defaults_spec.lua
@@ -32,7 +32,7 @@ describe('startup defaults', function()
       command('filetype')
       screen:expect([[
         ^                                                  |
-        ~                                                 |*2
+        {1:~                                                 }|*2
         ]] .. expected)
     end
 
@@ -132,9 +132,9 @@ describe('startup defaults', function()
       command('vsp')
       screen:expect([[
         1                        │1                       |
-        ^+--  2 lines: 2··········│+--  2 lines: 2·········|
+        {13:^+--  2 lines: 2··········}│{13:+--  2 lines: 2·········}|
         4                        │4                       |
-        ~                        │~                       |
+        {1:~                        }│{1:~                       }|
                                                           |
       ]])
 
@@ -142,9 +142,9 @@ describe('startup defaults', function()
       command('set ambiwidth=double')
       screen:expect([[
         1                        |1                       |
-        ^+--  2 lines: 2----------|+--  2 lines: 2---------|
+        {13:^+--  2 lines: 2----------}|{13:+--  2 lines: 2---------}|
         4                        |4                       |
-        ~                        |~                       |
+        {1:~                        }|{1:~                       }|
                                                           |
       ]])
 
@@ -152,9 +152,9 @@ describe('startup defaults', function()
       fn.setcellwidths({ { 0x2502, 0x2502, 1 } })
       screen:expect([[
         1                        │1                       |
-        ^+--  2 lines: 2----------│+--  2 lines: 2---------|
+        {13:^+--  2 lines: 2----------}│{13:+--  2 lines: 2---------}|
         4                        │4                       |
-        ~                        │~                       |
+        {1:~                        }│{1:~                       }|
                                                           |
       ]])
 
@@ -162,9 +162,9 @@ describe('startup defaults', function()
       fn.setcellwidths({ { 0x2502, 0x2502, 2 } })
       screen:expect([[
         1                        |1                       |
-        ^+--  2 lines: 2----------|+--  2 lines: 2---------|
+        {13:^+--  2 lines: 2----------}|{13:+--  2 lines: 2---------}|
         4                        |4                       |
-        ~                        |~                       |
+        {1:~                        }|{1:~                       }|
                                                           |
       ]])
 
@@ -172,9 +172,9 @@ describe('startup defaults', function()
       command('set ambiwidth=single')
       screen:expect([[
         1                        |1                       |
-        ^+--  2 lines: 2··········|+--  2 lines: 2·········|
+        {13:^+--  2 lines: 2··········}|{13:+--  2 lines: 2·········}|
         4                        |4                       |
-        ~                        |~                       |
+        {1:~                        }|{1:~                       }|
                                                           |
       ]])
     end)
diff --git a/test/functional/options/shortmess_spec.lua b/test/functional/options/shortmess_spec.lua
index 6bc00ca1c5..e05f231f42 100644
--- a/test/functional/options/shortmess_spec.lua
+++ b/test/functional/options/shortmess_spec.lua
@@ -22,7 +22,7 @@ describe("'shortmess'", function()
       feed(':edit foo<CR>')
       screen:expect([[
         ^                                          |
-        ~                                         |*3
+        {1:~                                         }|*3
         "foo" [New]                               |
       ]])
       eq(1, eval('bufnr("%")'))
@@ -31,7 +31,7 @@ describe("'shortmess'", function()
       feed(':edit bar<CR>')
       screen:expect([[
         ^                                          |
-        ~                                         |*3
+        {1:~                                         }|*3
         :edit bar                                 |
       ]])
       eq(2, eval('bufnr("%")'))
@@ -43,21 +43,21 @@ describe("'shortmess'", function()
       feed(':edit foo<CR>')
       screen:expect([[
         ^                                          |
-        ~                                         |*3
+        {1:~                                         }|*3
         "foo" [New]                               |
       ]])
       eq(1, eval('bufnr("%")'))
       feed(':edit bar<CR>')
       screen:expect([[
         ^                                          |
-        ~                                         |*3
+        {1:~                                         }|*3
         "bar" [New]                               |
       ]])
       eq(2, eval('bufnr("%")'))
       feed(':bprevious<CR>')
       screen:expect([[
         ^                                          |
-        ~                                         |*3
+        {1:~                                         }|*3
         "foo" [New] --No lines in buffer--        |
       ]])
       eq(1, eval('bufnr("%")'))
@@ -66,14 +66,14 @@ describe("'shortmess'", function()
       feed(':bnext<CR>')
       screen:expect([[
         ^                                          |
-        ~                                         |*3
+        {1:~                                         }|*3
         :bnext                                    |
       ]])
       eq(2, eval('bufnr("%")'))
       feed(':bprevious<CR>')
       screen:expect([[
         ^                                          |
-        ~                                         |*3
+        {1:~                                         }|*3
         :bprevious                                |
       ]])
       eq(1, eval('bufnr("%")'))