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)

1 files changed, 27 insertions, 26 deletions

diff --git a/test/functional/ex_cmds/map_spec.lua b/test/functional/ex_cmds/map_spec.lua
index d3b027e6f4..cc863d45cb 100644
--- a/test/functional/ex_cmds/map_spec.lua
+++ b/test/functional/ex_cmds/map_spec.lua
@@ -109,19 +109,19 @@ describe('Screen', function()
     command('map <expr> x input("> ")')
     screen:expect([[
       ^                    |
-      ~                   |*3
+      {1:~                   }|*3
                           |
     ]])
     feed('x')
     screen:expect([[
                           |
-      ~                   |*3
+      {1:~                   }|*3
       > ^                  |
     ]])
     feed('\n')
     screen:expect([[
       ^                    |
-      ~                   |*3
+      {1:~                   }|*3
       >                   |
     ]])
   end)
@@ -131,20 +131,20 @@ describe('Screen', function()
     feed('i')
     screen:expect([[
       ^                    |
-      ~                   |*3
-      -- INSERT --        |
+      {1:~                   }|*3
+      {5:-- INSERT --}        |
     ]])
     feed('x')
     screen:expect([[
                           |
-      ~                   |*3
+      {1:~                   }|*3
       > ^                  |
     ]])
     feed('\n')
     screen:expect([[
       ^                    |
-      ~                   |*3
-      -- INSERT --        |
+      {1:~                   }|*3
+      {5:-- INSERT --}        |
     ]])
   end)
 
@@ -153,7 +153,7 @@ describe('Screen', function()
     feed(':<F2>')
     screen:expect([[
                           |
-      ~                   |*3
+      {1:~                   }|*3
       :^                   |
     ]])
   end)
@@ -181,7 +181,7 @@ describe('Screen', function()
       one                 |
       ^two                 |
       three               |
-      [on]                |
+      {9:[on]                }|
                           |
     ]])
   end)
@@ -191,15 +191,16 @@ describe('Screen', function()
     command('nmap <expr> <F2> execute("throw 42")')
     feed('<F2>')
     screen:expect([[
-                                              |*2
-      Error detected while processing :       |
-      E605: Exception not caught: 42          |
-      Press ENTER or type command to continue^ |
+                                              |
+      {3:                                        }|
+      {9:Error detected while processing :}       |
+      {9:E605: Exception not caught: 42}          |
+      {6:Press ENTER or type command to continue}^ |
     ]])
     feed('<CR>')
     screen:expect([[
       ^                                        |
-      ~                                       |*3
+      {1:~                                       }|*3
                                               |
     ]])
   end)
@@ -210,32 +211,32 @@ describe('Screen', function()
     feed(':echo "foo')
     screen:expect([[
                                               |
-      ~                                       |*3
+      {1:~                                       }|*3
       :echo "foo^                              |
     ]])
     feed('<F2>')
     screen:expect([[
-                                              |
+      {3:                                        }|
       :echo "foo                              |
-      Error detected while processing :       |
-      E605: Exception not caught: 42          |
+      {9:Error detected while processing :}       |
+      {9:E605: Exception not caught: 42}          |
       :echo "foo^                              |
     ]])
     feed('"')
     screen:expect([[
-                                              |
+      {3:                                        }|
       :echo "foo                              |
-      Error detected while processing :       |
-      E605: Exception not caught: 42          |
+      {9:Error detected while processing :}       |
+      {9:E605: Exception not caught: 42}          |
       :echo "foo"^                             |
     ]])
     feed('\n')
     screen:expect([[
       :echo "foo                              |
-      Error detected while processing :       |
-      E605: Exception not caught: 42          |
+      {9:Error detected while processing :}       |
+      {9:E605: Exception not caught: 42}          |
       foo                                     |
-      Press ENTER or type command to continue^ |
+      {6:Press ENTER or type command to continue}^ |
     ]])
   end)
 
@@ -246,7 +247,7 @@ describe('Screen', function()
     feed(':                      nmap a<CR>')
     screen:expect([[
       ^                                        |
-      ~                                       |*3
+      {1:~                                       }|*3
       n  a             b                      |
     ]])
   end)