nvim-pack
/
gitsigns.nvim
mirror of https://github.com/lewis6991/gitsigns.nvim
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

fix: don't set default for GitSignsDeleteLn 

Setting GitSignsDeleteLn to anything by default doesn't make much sense
since it ends up highlighting lines not related to the hunk. This is
especially confusing when show_deleted is enabled.

+ Fix incorrect docs.

Fixes #565
This commit is contained in:
Lewis Russell 2022-05-21 09:48:28 +01:00 committed by Lewis Russell
parent 32763586ab
commit 13f811e8eb
8 changed files with 17 additions and 16 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
doc/gitsigns.txt
View File

@ -559,7 +559,7 @@ show_deleted *gitsigns-config-show_deleted*
Show the old version of hunks inline in the buffer (via virtual lines).
Note: Virtual lines currently use the highlight `GitSignsDeleteLn`.
Note: Virtual lines currently use the highlight `GitSignsDeleteVirtLn`.
diff_opts *gitsigns-config-diff_opts*
Type: `table[extended]`, Default: derived from 'diffopt'

2
lua/gitsigns/config.lua generated
View File

@ -269,7 +269,7 @@ M.schema = {
description = [[
Show the old version of hunks inline in the buffer (via virtual lines).
Note: Virtual lines currently use the highlight `GitSignsDeleteLn`.
Note: Virtual lines currently use the highlight `GitSignsDeleteVirtLn`.
]],
},

5
lua/gitsigns/highlight.lua generated
View File

@ -19,7 +19,8 @@ local hls = {
{ GitSignsAddLn = { 'GitGutterAddLine', 'SignifyLineAdd', 'DiffAdd' } },
{ GitSignsChangeLn = { 'GitGutterChangeLine', 'SignifyLineChange', 'DiffChange' } },
{ GitSignsDeleteLn = { 'GitGutterDeleteLine', 'SignifyLineDelete', 'DiffDelete' } },
{ GitSignsCurrentLineBlame = { 'NonText' } },
@ -33,7 +34,7 @@ local hls = {
{ GitSignsAddLnVirtLn = { 'GitSignsAddLn' } },
{ GitSignsChangeVirtLn = { 'GitSignsChangeLn' } },
{ GitSignsDeleteVirtLn = { 'GitSignsDeleteLn' } },
{ GitSignsDeleteVirtLn = { 'GitGutterDeleteLine', 'SignifyLineDelete', 'DiffDelete' } },
{ GitSignsAddLnVirtLnInLine = { 'GitSignsAddLnInline' } },
{ GitSignsChangeVirtLnInLine = { 'GitSignsChangeLnInline' } },

8
lua/gitsigns/manager.lua generated
View File

@ -187,19 +187,19 @@ local function show_deleted(bufnr)
if rline > 1 then
break
end
vline[#vline + 1] = { line:sub(last_ecol, scol - 1), 'GitsignsDeleteVirtLn' }
vline[#vline + 1] = { line:sub(scol, ecol - 1), 'GitsignsDeleteVirtLnInline' }
vline[#vline + 1] = { line:sub(last_ecol, scol - 1), 'GitSignsDeleteVirtLn' }
vline[#vline + 1] = { line:sub(scol, ecol - 1), 'GitSignsDeleteVirtLnInline' }
last_ecol = ecol
end
end
if #line > 0 then
vline[#vline + 1] = { line:sub(last_ecol, -1), 'GitsignsDeleteVirtLn' }
vline[#vline + 1] = { line:sub(last_ecol, -1), 'GitSignsDeleteVirtLn' }
end
local padding = string.rep(' ', VIRT_LINE_LEN - #line)
vline[#vline + 1] = { padding, 'GitsignsDeleteVirtLn' }
vline[#vline + 1] = { padding, 'GitSignsDeleteVirtLn' }
virt_lines[i] = vline
end

2
teal/gitsigns/config.tl
View File

@ -269,7 +269,7 @@ M.schema = {
description = [[
Show the old version of hunks inline in the buffer (via virtual lines).
Note: Virtual lines currently use the highlight `GitSignsDeleteLn`.
Note: Virtual lines currently use the highlight `GitSignsDeleteVirtLn`.
]]
},

5
teal/gitsigns/highlight.tl
View File

@ -19,7 +19,8 @@ local hls: {{string:{string}}} = {
{GitSignsAddLn = {'GitGutterAddLine' , 'SignifyLineAdd' , 'DiffAdd' }},
{GitSignsChangeLn = {'GitGutterChangeLine', 'SignifyLineChange', 'DiffChange'}},
{GitSignsDeleteLn = {'GitGutterDeleteLine', 'SignifyLineDelete', 'DiffDelete'}},
-- Don't set GitSignsDeleteLn by default
-- {GitSignsDeleteLn = {}},
{GitSignsCurrentLineBlame = {'NonText'}},
@ -33,7 +34,7 @@ local hls: {{string:{string}}} = {
{GitSignsAddLnVirtLn = {'GitSignsAddLn' }},
{GitSignsChangeVirtLn = {'GitSignsChangeLn'}},
{GitSignsDeleteVirtLn = {'GitSignsDeleteLn'}},
{GitSignsDeleteVirtLn = {'GitGutterDeleteLine', 'SignifyLineDelete', 'DiffDelete'}},
{GitSignsAddLnVirtLnInLine = {'GitSignsAddLnInline' }},
{GitSignsChangeVirtLnInLine = {'GitSignsChangeLnInline'}},

8
teal/gitsigns/manager.tl
View File

@ -187,19 +187,19 @@ local function show_deleted(bufnr: integer)
if rline > 1 then
break
end
vline[#vline+1] = { line:sub(last_ecol, scol-1), 'GitsignsDeleteVirtLn'}
vline[#vline+1] = { line:sub(scol, ecol-1), 'GitsignsDeleteVirtLnInline'}
vline[#vline+1] = { line:sub(last_ecol, scol-1), 'GitSignsDeleteVirtLn'}
vline[#vline+1] = { line:sub(scol, ecol-1), 'GitSignsDeleteVirtLnInline'}
last_ecol = ecol
end
end
if #line > 0 then
vline[#vline+1] = { line:sub(last_ecol, -1), 'GitsignsDeleteVirtLn'}
vline[#vline+1] = { line:sub(last_ecol, -1), 'GitSignsDeleteVirtLn'}
end
-- Add extra padding so the entire line is highlighted
local padding = string.rep(' ', VIRT_LINE_LEN-#line)
vline[#vline+1] = { padding, 'GitsignsDeleteVirtLn'}
vline[#vline+1] = { padding, 'GitSignsDeleteVirtLn'}
virt_lines[i] = vline
end

1
test/highlights_spec.lua
View File

@ -69,7 +69,6 @@ describe('highlights', function()
p'Deriving GitSignsChangeLn from DiffChange',
p'Deriving GitSignsChangeNr from GitSignsChange',
p'Deriving GitSignsDelete from DiffDelete',
p'Deriving GitSignsDeleteLn from DiffDelete',
p'Deriving GitSignsDeleteNr from GitSignsDelete',
})
end)