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/vim_spec.lua | 12 ++++++------
 1 file changed, 6 insertions(+), 6 deletions(-)

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

diff --git a/test/functional/api/vim_spec.lua b/test/functional/api/vim_spec.lua
index ef602b3a51..d98308ee87 100644
--- a/test/functional/api/vim_spec.lua
+++ b/test/functional/api/vim_spec.lua
@@ -1269,7 +1269,7 @@ describe('API', function()
       api.nvim_paste('', true, 3)
       screen:expect([[
                             |
-        ~                   |*2
+        {1:~                   }|*2
         :Foo^                |
       ]])
     end)
@@ -1280,8 +1280,8 @@ describe('API', function()
       api.nvim_paste('normal! \023\022\006\027', true, -1)
       screen:expect([[
                             |
-        ~                   |*2
-        :normal! ^W^V^F^[^   |
+        {1:~                   }|*2
+        :normal! {18:^W^V^F^[}^   |
       ]])
     end)
     it('crlf=false does not break lines at CR, CRLF', function()
@@ -1981,9 +1981,9 @@ describe('API', function()
       -- Make any RPC request (can be non-async: op-pending does not block).
       api.nvim_get_current_buf()
       screen:expect([[
-       ^a$                  |
-       b$                  |
-       c$                  |
+       ^a{1:$}                  |
+       b{1:$}                  |
+       c{1:$}                  |
                            |
       ]])
     end)
-- 
cgit