vim-patch:9.1.0106: Visual highlight hard to read with 'termguicolors'

Problem:  Visual highlight hard to read with 'termguicolors'
          (Maxim Kim)
Solution: Set Visual GUI foreground to black (with background=light)
          and lightgrey (with background=dark)
          (Maxim Kim)

fixes: vim/vim#14024
closes: vim/vim#14025

https://github.com/vim/vim/commit/34e4a05d02a016fe230495be8f6c60ddd56f9567

Co-authored-by: Maxim Kim <habamax@gmail.com>

10 files changed, 11 insertions, 11 deletions

diff --git a/test/functional/legacy/breakindent_spec.lua b/test/functional/legacy/breakindent_spec.lua
index 274fdfe2e2..cf0065f394 100644
--- a/test/functional/legacy/breakindent_spec.lua
+++ b/test/functional/legacy/breakindent_spec.lua
@@ -69,7 +69,7 @@ describe('breakindent', function()
     ]])
     screen:set_default_attr_ids({
       [0] = { bold = true, foreground = Screen.colors.Blue }, -- NonText
-      [1] = { background = Screen.colors.LightGrey }, -- Visual
+      [1] = { background = Screen.colors.LightGrey, foreground = Screen.colors.Black }, -- Visual
       [2] = { bold = true, reverse = true }, -- StatusLine
       [3] = { reverse = true }, -- StatusLineNC
       [4] = { bold = true }, -- ModeMsg
diff --git a/test/functional/legacy/display_spec.lua b/test/functional/legacy/display_spec.lua
index b44e1fd601..153fad2e22 100644
--- a/test/functional/legacy/display_spec.lua
+++ b/test/functional/legacy/display_spec.lua
@@ -33,7 +33,7 @@ describe('display', function()
     screen:attach()
     screen:set_default_attr_ids({
       [1] = { bold = true }, -- ModeMsg
-      [2] = { background = Screen.colors.LightGrey }, -- Visual
+      [2] = { background = Screen.colors.LightGrey, foreground = Screen.colors.Black }, -- Visual
       [3] = { background = Screen.colors.Grey, foreground = Screen.colors.DarkBlue }, -- SignColumn
     })
 
diff --git a/test/functional/legacy/highlight_spec.lua b/test/functional/legacy/highlight_spec.lua
index 2416477673..3d06bf3978 100644
--- a/test/functional/legacy/highlight_spec.lua
+++ b/test/functional/legacy/highlight_spec.lua
@@ -101,7 +101,7 @@ describe('Visual selection highlight', function()
     local screen = Screen.new(60, 6)
     screen:set_default_attr_ids({
       [0] = { bold = true, foreground = Screen.colors.Blue }, -- NonText
-      [1] = { background = Screen.colors.LightGrey }, -- Visual
+      [1] = { background = Screen.colors.LightGrey, foreground = Screen.colors.Black }, -- Visual
       [2] = { bold = true }, -- ModeMsg
     })
     screen:attach()
diff --git a/test/functional/legacy/listlbr_spec.lua b/test/functional/legacy/listlbr_spec.lua
index fb5fb24380..50628e5ef9 100644
--- a/test/functional/legacy/listlbr_spec.lua
+++ b/test/functional/legacy/listlbr_spec.lua
@@ -206,7 +206,7 @@ describe('listlbr', function()
     local screen = Screen.new(60, 6)
     screen:set_default_attr_ids({
       [0] = { bold = true, foreground = Screen.colors.Blue }, -- NonText
-      [1] = { background = Screen.colors.LightGrey }, -- Visual
+      [1] = { background = Screen.colors.LightGrey, foreground = Screen.colors.Black }, -- Visual
       [2] = { background = Screen.colors.Red, foreground = Screen.colors.White }, -- ErrorMsg
     })
     screen:attach()
diff --git a/test/functional/legacy/listlbr_utf8_spec.lua b/test/functional/legacy/listlbr_utf8_spec.lua
index 2788e7ae9f..8e5d9b88bc 100644
--- a/test/functional/legacy/listlbr_utf8_spec.lua
+++ b/test/functional/legacy/listlbr_utf8_spec.lua
@@ -216,7 +216,7 @@ describe('linebreak', function()
     local screen = Screen.new(60, 8)
     screen:set_default_attr_ids({
       [0] = { bold = true, foreground = Screen.colors.Blue }, -- NonText
-      [1] = { background = Screen.colors.LightGrey }, -- Visual
+      [1] = { background = Screen.colors.LightGrey, foreground = Screen.colors.Black }, -- Visual
       [2] = { bold = true }, -- ModeMsg
     })
     screen:attach()
diff --git a/test/functional/legacy/matchparen_spec.lua b/test/functional/legacy/matchparen_spec.lua
index bdc6cb77a2..b03107deb0 100644
--- a/test/functional/legacy/matchparen_spec.lua
+++ b/test/functional/legacy/matchparen_spec.lua
@@ -14,7 +14,7 @@ describe('matchparen', function()
     screen:attach()
     screen:set_default_attr_ids({
       [1] = { bold = true },
-      [2] = { background = Screen.colors.LightGrey },
+      [2] = { background = Screen.colors.LightGrey, foreground = Screen.colors.Black },
     })
 
     exec([[
diff --git a/test/functional/legacy/search_spec.lua b/test/functional/legacy/search_spec.lua
index 70748c9d27..2fda341123 100644
--- a/test/functional/legacy/search_spec.lua
+++ b/test/functional/legacy/search_spec.lua
@@ -772,9 +772,9 @@ describe('Search highlight', function()
     screen:set_default_attr_ids({
       [1] = { bold = true, foreground = Screen.colors.Blue }, -- NonText
       [2] = { bold = true }, -- ModeMsg, Search
-      [3] = { background = Screen.colors.LightGrey }, -- Visual
+      [3] = { background = Screen.colors.LightGrey, foreground = Screen.colors.Black }, -- Visual
       [4] = { background = Screen.colors.Yellow, bold = true }, -- Search
-      [5] = { background = Screen.colors.LightGrey, bold = true }, -- Visual + Search
+      [5] = { background = Screen.colors.LightGrey, bold = true, foreground = Screen.colors.Black },
     })
     screen:attach()
     exec([[
diff --git a/test/functional/legacy/statusline_spec.lua b/test/functional/legacy/statusline_spec.lua
index 1330d63dbd..567e829879 100644
--- a/test/functional/legacy/statusline_spec.lua
+++ b/test/functional/legacy/statusline_spec.lua
@@ -70,7 +70,7 @@ describe('statusline', function()
   it('showcmdloc=statusline works', function()
     screen:set_default_attr_ids({
       [0] = { bold = true, foreground = Screen.colors.Blue }, -- NonText
-      [1] = { background = Screen.colors.LightGrey }, -- Visual
+      [1] = { background = Screen.colors.LightGrey, foreground = Screen.colors.Black }, -- Visual
       [2] = { bold = true }, -- MoreMsg
       [3] = { bold = true, reverse = true }, -- StatusLine
       [5] = { background = Screen.colors.LightGrey, foreground = Screen.colors.DarkBlue }, -- Folded
diff --git a/test/functional/legacy/tabline_spec.lua b/test/functional/legacy/tabline_spec.lua
index 07e64d1d4a..683c7d9bd7 100644
--- a/test/functional/legacy/tabline_spec.lua
+++ b/test/functional/legacy/tabline_spec.lua
@@ -18,7 +18,7 @@ describe('tabline', function()
   it('showcmdloc=tabline works', function()
     screen:set_default_attr_ids({
       [0] = { bold = true, foreground = Screen.colors.Blue }, -- NonText
-      [1] = { background = Screen.colors.LightGrey }, -- Visual
+      [1] = { background = Screen.colors.LightGrey, foreground = Screen.colors.Black }, -- Visual
       [2] = { bold = true }, -- MoreMsg, TabLineSel
       [3] = { reverse = true }, -- TabLineFill
       [4] = { background = Screen.colors.LightGrey, underline = true }, -- TabLine
diff --git a/test/functional/legacy/visual_spec.lua b/test/functional/legacy/visual_spec.lua
index 924ab8dbbe..151e5874e1 100644
--- a/test/functional/legacy/visual_spec.lua
+++ b/test/functional/legacy/visual_spec.lua
@@ -15,7 +15,7 @@ describe('Visual highlight', function()
     screen:set_default_attr_ids({
       [0] = { foreground = Screen.colors.Blue, bold = true }, -- NonText
       [1] = { bold = true }, -- ModeMsg
-      [2] = { background = Screen.colors.LightGrey }, -- Visual
+      [2] = { background = Screen.colors.LightGrey, foreground = Screen.colors.Black }, -- Visual
     })
     screen:attach()
   end)