From 0c59771e314d6faaad69676985cd2a11c157ee37 Mon Sep 17 00:00:00 2001
From: bfredl <bjorn.linse@gmail.com>
Date: Fri, 22 Mar 2024 11:02:52 +0100
Subject: 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)
---
 test/functional/api/extmark_spec.lua | 31 ++++++++++++++++---------------
 1 file changed, 16 insertions(+), 15 deletions(-)

(limited to 'test/functional/api/extmark_spec.lua')

diff --git a/test/functional/api/extmark_spec.lua b/test/functional/api/extmark_spec.lua
index 2acfbfc949..4cf96a4af6 100644
--- a/test/functional/api/extmark_spec.lua
+++ b/test/functional/api/extmark_spec.lua
@@ -460,7 +460,7 @@ describe('API/extmarks', function()
     -- This shouldn't seg fault
     screen:expect([[
       12345^ 1        |
-      ~              |*8
+      {1:~              }|*8
                      |
     ]])
   end)
@@ -513,7 +513,7 @@ describe('API/extmarks', function()
     insert('abc')
     screen:expect([[
       ab^c12345       |
-      ~              |*8
+      {1:~              }|*8
                      |
     ]])
     local rv = get_extmark_by_id(ns, marks[1])
@@ -1734,16 +1734,17 @@ describe('API/extmarks', function()
     command('d2')
     screen:expect([[
       S2^aaa bbb ccc                           |
-        aaa bbb ccc                           |*3
-                                              |*2
+      {7:  }aaa bbb ccc                           |*3
+      {7:  }                                      |
+                                              |
     ]])
     -- mark is restored with undo_restore == true
     command('silent undo')
     screen:expect([[
-      S1  ^aaa bbb ccc                         |
+      S1{7:  }^aaa bbb ccc                         |
       S1S2aaa bbb ccc                         |
-      S2  aaa bbb ccc                         |
-          aaa bbb ccc                         |*2
+      S2{7:  }aaa bbb ccc                         |
+      {7:    }aaa bbb ccc                         |*2
                                               |
     ]])
     -- decor is not removed twice
@@ -1964,7 +1965,7 @@ describe('API/win_extmark', function()
       grid = [[
       non ui-watched line |
       ui-watched lin^e     |
-      ~                   |
+      {1:~                   }|
                           |
     ]],
       extmarks = {
@@ -2052,7 +2053,7 @@ describe('API/win_extmark', function()
       grid = [[
       ui-watched linupdat^e|
       e                   |
-      ~                   |
+      {1:~                   }|
                           |
     ]],
       extmarks = {
@@ -2079,9 +2080,9 @@ describe('API/win_extmark', function()
       grid = [[
         ## grid 1
           [4:--------------------]|*3
-          [No Name] [+]       |
+          {3:[No Name] [+]       }|
           [2:--------------------]|*2
-          [No Name] [+]       |
+          {2:[No Name] [+]       }|
           [3:--------------------]|
         ## grid 2
           non ui-watched line |
@@ -2091,7 +2092,7 @@ describe('API/win_extmark', function()
         ## grid 4
           non ui-watched line |
           ui-watched lin^e     |
-          ~                   |
+          {1:~                   }|
     ]],
       extmarks = {
         [2] = {
@@ -2112,13 +2113,13 @@ describe('API/win_extmark', function()
       grid = [[
         ## grid 1
           [4:--------------------]|*3
-          [No Name] [+]       |
+          {3:[No Name] [+]       }|
           [2:--------------------]|*2
-          [No Name] [+]       |
+          {2:[No Name] [+]       }|
           [3:--------------------]|
         ## grid 2
           non ui-watched line |
-          ui-watched linupd@@@|
+          ui-watched linupd{1:@@@}|
         ## grid 3
                               |
         ## grid 4
-- 
cgit