fix(hl): highlights for Nvim v0.9

Resolves #939

Author: lewis6991

doc/gitsigns.txt

@@ -922,17 +922,17 @@ searching for other defined highlights in order.
 GitSignsAdd
         Used for the text of 'add' signs.
 
-        Fallbacks: `GitGutterAdd`, `SignifySignAdd`, `DiffAddedGutter`, `Added`, `DiffAdd`
+        Fallbacks: `GitGutterAdd`, `SignifySignAdd`, `DiffAddedGutter`, `diffAdded`, `DiffAdd`
                                                         *hl-GitSignsChange*
 GitSignsChange
         Used for the text of 'change' signs.
 
-        Fallbacks: `GitGutterChange`, `SignifySignChange`, `DiffModifiedGutter`, `Changed`, `DiffChange`
+        Fallbacks: `GitGutterChange`, `SignifySignChange`, `DiffModifiedGutter`, `diffChanged`, `DiffChange`
                                                         *hl-GitSignsDelete*
 GitSignsDelete
         Used for the text of 'delete' signs.
 
-        Fallbacks: `GitGutterDelete`, `SignifySignDelete`, `DiffRemovedGutter`, `Removed`, `DiffDelete`
+        Fallbacks: `GitGutterDelete`, `SignifySignDelete`, `DiffRemovedGutter`, `diffRemoved`, `DiffDelete`
                                                         *hl-GitSignsChangedelete*
 GitSignsChangedelete
         Used for the text of 'changedelete' signs.

lua/gitsigns.lua

@@ -183,7 +183,6 @@ M.setup = async.void(function(cfg)
     require('gitsigns.git')._set_version(config._git_version)
   end
 
-
   if config.auto_attach then
     setup_attach()
   end

lua/gitsigns/highlight.lua

@@ -7,6 +7,8 @@ local api = vim.api
 --- @field fg_factor number
 --- @field bg_factor number
 
+local nvim10 = vim.fn.has('nvim-0.10') > 0
+
 local M = {}
 
 --- Use array of dict so we can iterate deterministically
@@ -18,7 +20,7 @@ M.hls = {
       'GitGutterAdd',
       'SignifySignAdd',
       'DiffAddedGutter',
-      'Added',
+      nvim10 and 'Added' or 'diffAdded',
       'DiffAdd',
       desc = "Used for the text of 'add' signs.",
     },
@@ -29,7 +31,7 @@ M.hls = {
       'GitGutterChange',
       'SignifySignChange',
       'DiffModifiedGutter',
-      'Changed',
+      nvim10 and 'Changed' or 'diffChanged',
       'DiffChange',
       desc = "Used for the text of 'change' signs.",
     },
@@ -40,7 +42,7 @@ M.hls = {
       'GitGutterDelete',
       'SignifySignDelete',
       'DiffRemovedGutter',
-      'Removed',
+      nvim10 and 'Removed' or 'diffRemoved',
       'DiffDelete',
       desc = "Used for the text of 'delete' signs.",
     },

test/gitsigns_spec.lua

@@ -60,7 +60,8 @@ describe('gitsigns (with screen)', function()
       command('colorscheme vim')
     else
       default_attrs[2] = { background = Screen.colors.LightMagenta }
-      default_attrs[4] = { background = Screen.colors.LightCyan1, bold = true, foreground = Screen.colors.Blue1 }
+      default_attrs[4] =
+        { background = Screen.colors.LightCyan1, bold = true, foreground = Screen.colors.Blue1 }
     end
 
     screen:set_default_attr_ids(default_attrs)

test/highlights_spec.lua

@@ -40,7 +40,8 @@ describe('highlights', function()
       command('colorscheme vim')
     else
       default_attrs[2] = { background = Screen.colors.LightMagenta }
-      default_attrs[4] = { background = Screen.colors.LightCyan1, bold = true, foreground = Screen.colors.Blue1 }
+      default_attrs[4] =
+        { background = Screen.colors.LightCyan1, bold = true, foreground = Screen.colors.Blue1 }
     end
 
     screen:set_default_attr_ids(default_attrs)
@@ -79,9 +80,8 @@ describe('highlights', function()
         p('Deriving GitSignsChangeLn from DiffChange'),
         p('Deriving GitSignsChangeNr from GitSignsChange'),
         -- TODO(lewis6991): huh?
-        nvim10 and
-          p('Deriving GitSignsDelete from Removed') or
-          p('Deriving GitSignsDelete from DiffDelete'),
+        nvim10 and p('Deriving GitSignsDelete from Removed')
+          or p('Deriving GitSignsDelete from DiffDelete'),
         p('Deriving GitSignsDeleteNr from GitSignsDelete'),
       })
     end)