mirrors/neovim
1
0
Fork 0
mirror of https://github.com/neovim/neovim.git synced 2025-09-15 07:48:18 +00:00
Code Issues Packages Projects Releases Wiki Activity

fix(runtime): add "Added", "Changed", "Removed" to "vim" colorscheme (#35704)

Browse Source 
These were added to syncolor.vim in Vim patch 9.1.0016.
This commit is contained in:
zeertzjq
2025-09-11 06:55:43 +08:00
committed by GitHub
parent e084a99040
commit 9076fdc123
2 changed files with 10 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
runtime/colors/vim.lua
View File

@@ -256,6 +256,9 @@ if vim.o.background == 'light' then
hi('Type', { fg = 'SeaGreen', bold = true, ctermfg = 'DarkGreen' }) hi('Type', { fg = 'SeaGreen', bold = true, ctermfg = 'DarkGreen' })
hi('Underlined', { fg = 'SlateBlue', underline = true, ctermfg = 'DarkMagenta', cterm = { underline = true } }) hi('Underlined', { fg = 'SlateBlue', underline = true, ctermfg = 'DarkMagenta', cterm = { underline = true } })
hi('Ignore', { ctermfg = 'White' }) hi('Ignore', { ctermfg = 'White' })
hi('Added', { fg = 'SeaGreen', ctermfg = 'DarkGreen' })
hi('Changed', { fg = 'DodgerBlue', ctermfg = 'Blue' })
hi('Removed', { fg = 'Red', ctermfg = 'Red' })
else else
-- Default colors only used with a dark background. -- Default colors only used with a dark background.
hi('ColorColumn', { bg = 'DarkRed', ctermbg = 'DarkRed' }) hi('ColorColumn', { bg = 'DarkRed', ctermbg = 'DarkRed' })
@@ -297,5 +300,8 @@ else
hi('Type', { fg = '#60ff60', bold = true, ctermfg = 'LightGreen' }) hi('Type', { fg = '#60ff60', bold = true, ctermfg = 'LightGreen' })
hi('Underlined', { fg = '#80a0ff', underline = true, ctermfg = 'LightBlue', cterm = { underline = true } }) hi('Underlined', { fg = '#80a0ff', underline = true, ctermfg = 'LightBlue', cterm = { underline = true } })
hi('Ignore', { ctermfg = 'Black' }) hi('Ignore', { ctermfg = 'Black' })
hi('Added', { fg = 'LimeGreen', ctermfg = 'Green' })
hi('Changed', { fg = 'DodgerBlue', ctermfg = 'Blue' })
hi('Removed', { fg = 'Red', ctermfg = 'Red' })
end end
--stylua: ignore end --stylua: ignore end

9
test/functional/plugin/pack_spec.lua
View File

@@ -860,13 +860,13 @@ describe('vim.pack', function()
), ),
' |', ' |',
'Pending updates: |', 'Pending updates: |',
('{104:< %s │ Commit from `main` to be removed} |'):format( ('{19:< %s │ Commit from `main` to be removed} |'):format(
hashes.fetch_head hashes.fetch_head
), ),
('{105:> %s │ Commit to be added 2} |'):format( ('{104:> %s │ Commit to be added 2} |'):format(
hashes.fetch_new hashes.fetch_new
), ),
('{105:> %s │ Commit to be added 1 (tag: dev-tag)} |'):format( ('{104:> %s │ Commit to be added 1 (tag: dev-tag)} |'):format(
hashes.fetch_new_prev hashes.fetch_new_prev
), ),
' |', ' |',
@@ -891,8 +891,7 @@ describe('vim.pack', function()
[101] = { foreground = Screen.colors.Orange }, [101] = { foreground = Screen.colors.Orange },
[102] = { foreground = Screen.colors.LightGray }, [102] = { foreground = Screen.colors.LightGray },
[103] = { foreground = Screen.colors.LightBlue }, [103] = { foreground = Screen.colors.LightBlue },
[104] = { foreground = Screen.colors.NvimDarkRed }, [104] = { foreground = Screen.colors.SeaGreen },
[105] = { foreground = Screen.colors.NvimDarkGreen },
}) })
-- NOTE: Non LuaJIT reports errors differently due to 'coxpcall' -- NOTE: Non LuaJIT reports errors differently due to 'coxpcall'
if is_jit() then if is_jit() then