gitsigns.nvim now defaults to extmark signs
jacknicklenson opened this issue · comments
I have discribed issue in gitsign repo, however issue closed because not related to that repo, so i am sharing link to the issue in here:
Can further look into this later but statuscol.nvim already support(ed) extmark signs. Instead of filtering by the legacy sign name, you can filter by the extmark namespace. Has this stopped working?
If i change from name to namespace like line 37:
And open a git repo then add new line like in 244, it gives this error:
Cannot reproduce, both legacy signs and extmark signs still working fine. Can you share your config?
init.lua
vim.o.termguicolors = true
local function bootstrap_pckr()
local pckr_path = vim.fn.stdpath("data") .. "/pckr/pckr.nvim"
if not vim.uv.fs_stat(pckr_path) then
vim.fn.system({
'git',
'clone',
"--filter=blob:none",
'https://github.com/lewis6991/pckr.nvim',
pckr_path
})
end
vim.opt.rtp:prepend(pckr_path)
end
bootstrap_pckr()
require('pckr').add {
{
"luukvbaal/statuscol.nvim",
config = function()
local builtin = require("statuscol.builtin")
require("statuscol").setup({
segments = {
{
sign = { name = { "Diagnostic" }, auto = true },
click = "v:lua.ScSa"
},
{
sign = { name = { "Dap*" }, auto = true },
click = "v:lua.ScSa"
},
{ text = { builtin.lnumfunc, " " }, click = "v:lua.ScLa", },
{
sign = { namespace = { "gitsign*" } },
click = "v:lua.ScSa"
}
}
})
end,
},
'HiPhish/rainbow-delimiters.nvim',
{
'j-hui/fidget.nvim',
tag = 'legacy',
config = function()
require("fidget").setup()
end,
},
'bluz71/vim-moonfly-colors',
'neovim/nvim-lspconfig',
{
'nvim-treesitter/nvim-treesitter',
run = function()
local ts_update = require('nvim-treesitter.install').update({ with_sync = true })
ts_update()
end,
},
'lukas-reineke/indent-blankline.nvim',
'mg979/vim-visual-multi',
'nvim-tree/nvim-web-devicons',
{ 'stevearc/overseer.nvim', config = function() require('overseer').setup({ dap = false, }) end },
'Bekaboo/dropbar.nvim',
{ 'norcalli/nvim-colorizer.lua', config = function() require 'colorizer'.setup() end },
'nvim-treesitter/nvim-treesitter-textobjects',
'ggandor/leap.nvim',
'lewis6991/gitsigns.nvim',
'nvim-lua/plenary.nvim',
'NeogitOrg/neogit',
{ 'nvim-telescope/telescope-fzf-native.nvim', run = 'make' },
{
'nvim-telescope/telescope.nvim',
tag = '0.1.3',
requires = {
{ 'nvim-lua/plenary.nvim' } }
},
{ 'numToStr/Comment.nvim', config = function() require 'Comment'.setup {} end },
{ 'windwp/nvim-autopairs', config = function() require("nvim-autopairs").setup {} end },
'nvim-lualine/lualine.nvim',
{ 'sindrets/diffview.nvim', config = function() require 'diffview'.setup { _icon = true } end },
{ 'kylechui/nvim-surround', config = function() require("nvim-surround").setup() end },
'theHamsta/nvim-dap-virtual-text',
'mfussenegger/nvim-dap',
'rcarriga/nvim-dap-ui',
{ 'karb94/neoscroll.nvim', config = function() require "neoscroll".setup() end },
{ 'williamboman/mason.nvim', run = ":MasonUpdate" },
{ 'williamboman/mason-lspconfig.nvim' },
'hrsh7th/cmp-nvim-lsp',
'hrsh7th/cmp-buffer',
'hrsh7th/cmp-path',
'hrsh7th/cmp-cmdline',
'hrsh7th/nvim-cmp',
'hrsh7th/cmp-nvim-lsp-signature-help',
'L3MON4D3/LuaSnip',
'rafamadriz/friendly-snippets',
'saadparwaiz1/cmp_luasnip',
{ 'stevearc/oil.nvim', config = function() require('oil').setup { view_options = { show_hidden = true } } end },
{ 'RRethy/vim-illuminate' },
{ 'VonHeikemen/lsp-zero.nvim', branch = 'v3.x' },
}
vim.g.loaded_netrw = 1
vim.wo.wrap = false
vim.wo.number = true
vim.g.updatetime = 200
vim.g.loaded_netrwPlugin = 1
vim.o.cmdheight = 0
vim.o.sessionoptions = "blank,buffers,curdir,folds,help,tabpages,winsize,winpos,terminal,localoptions"
vim.g.moonflyWinSeparator = 2
vim.cmd [[
if exists('&cursorlineopt')
set cursorlineopt=number
set cursorline
endif
]]
vim.cmd [[colorscheme moonfly]]
vim.cmd('au TextYankPost * silent! lua vim.highlight.on_yank {higroup="IncSearch", timeout=500}')
vim.api.nvim_set_hl(0, "IlluminatedWordText", { link = "ColorColumn" })
vim.api.nvim_set_hl(0, "IlluminatedWordRead", { link = "ColorColumn" })
vim.api.nvim_set_hl(0, "IlluminatedWordWrite", { link = "ColorColumn" })
vim.bo.tabstop = 2
vim.o.tabstop = 2
vim.bo.shiftwidth = 2
vim.o.shiftwidth = 2
vim.bo.softtabstop = 2
vim.o.softtabstop = 2
vim.bo.expandtab = true
vim.o.expandtab = true
vim.o.showmode = false
vim.o.splitbelow = true
vim.o.splitright = true
vim.o.swapfile = false
vim.bo.swapfile = false
vim.o.smartcase = true
vim.o.ignorecase = true
vim.o.smartindent = true
vim.o.autoindent = true
vim.o.showmatch = true
vim.o.hidden = true
vim.g.mapleader = ' '
vim.keymap.set('n', '<Leader><CR>', ':nohlsearch<CR>')
vim.keymap.set('n', '<Leader>g', '<Cmd>Neogit<CR>')
vim.keymap.set('n', 'j', 'gj')
vim.keymap.set('n', 'k', 'gk')
vim.keymap.set('n', '<Up>', 'gk')
vim.keymap.set('n', '<Down>', 'gj')
vim.keymap.set('n', 'gl', '$')
vim.keymap.set('n', '<leader>t', '<Cmd>sp term://bash<CR>')
vim.cmd [[autocmd BufEnter * if &buftype == 'terminal' | :startinsert | endif]]
vim.keymap.set('n', 'gn', ':bn<CR>')
vim.keymap.set('n', 'gp', ':bp<CR>')
vim.keymap.set('n', '<leader>m', require('oil').open_float)
vim.keymap.set('n', 'gh', '0')
vim.keymap.set('i', '<C-k>', '<Up>')
vim.keymap.set('i', '<C-j>', '<Down>')
vim.keymap.set('i', '<C-h>', '<Left>')
vim.keymap.set('i', '<C-l>', '<Right>')
vim.keymap.set('c', '<C-j>', '<Down>')
vim.keymap.set('c', '<C-k>', '<Up>')
vim.keymap.set('c', '<C-h>', '<Left>')
vim.keymap.set('c', '<C-l>', '<Right>')
vim.keymap.set('n', '<A-j>', '<C-w>j')
vim.keymap.set('n', '<A-k>', '<C-w>k')
vim.keymap.set('n', '<A-h>', '<C-w>h')
vim.keymap.set('n', '<A-l>', '<C-w>l')
vim.keymap.set('i', '<A-j>', '<C-\\><C-N><C-w>j')
vim.keymap.set('i', '<A-k>', '<C-\\><C-N><C-w>k')
vim.keymap.set('i', '<A-h>', '<C-\\><C-N><C-w>h')
vim.keymap.set('i', '<A-l>', '<C-\\><C-N><C-w>l')
vim.keymap.set('t', '<A-j>', '<C-\\><C-N><C-w>j')
vim.keymap.set('t', '<A-k>', '<C-\\><C-N><C-w>k')
vim.keymap.set('t', '<A-h>', '<C-\\><C-N><C-w>h')
vim.keymap.set('t', '<A-l>', '<C-\\><C-N><C-w>l')
vim.keymap.set('t', '<Esc>', '<C-\\><C-N>')
vim.keymap.set({ 'n', 'x' }, '<leader>ca', '<Cmd>lua vim.lsp.buf.code_action()<CR>')
vim.keymap.set({ 'n', 'x' }, '<leader>F', '<Cmd>lua vim.lsp.buf.format({async=true})<CR>')
vim.keymap.set('n', '<leader>r', '<Cmd>lua vim.lsp.buf.rename()<CR>')
require("dapui").setup()
local dap, dapui = require("dap"), require("dapui")
require("nvim-dap-virtual-text").setup()
dap.adapters.codelldb = {
type = 'server',
port = "13000",
executable = {
command = vim.fn.stdpath('data') .. '/mason/bin/codelldb',
args = { "--port", "13000" },
-- On windows you may have to uncomment this:
-- detached = false,
}
}
require 'dap.ext.vscode'.json_decode = require "overseer.json".decode
require 'dap.ext.vscode'.load_launchjs(nil, { codelldb = { 'c', 'cpp', 'rust' } })
require 'overseer'.patch_dap(true)
dap.listeners.after.event_initialized["dapui_config"] = function()
dapui.open()
end
dap.listeners.before.event_terminated["dapui_config"] = function()
dapui.close()
end
dap.listeners.before.event_exited["dapui_config"] = function()
dapui.close()
end
vim.keymap.set('n', '<leader>dc', function() require('dap').continue() end)
vim.keymap.set('n', '<leader>dj', function() require('dap').step_over() end)
vim.keymap.set('n', '<leader>dk', function() require('dap').step_into() end)
vim.keymap.set('n', '<F12>', function() require('dap').step_out() end)
vim.keymap.set('n', '<Leader>b', function() require('dap').toggle_breakpoint() end)
vim.keymap.set('n', '<Leader>B', function() require('dap').set_breakpoint() end)
vim.keymap.set('n', '<Leader>lp',
function() require('dap').set_breakpoint(nil, nil, vim.fn.input('Log point message: ')) end)
vim.keymap.set('n', '<Leader>dr', function() require('dap').repl.open() end)
vim.keymap.set('n', '<Leader>dl', function() require('dap').run_last() end)
vim.keymap.set({ 'n', 'v' }, '<Leader>dh', function() require('dap.ui.widgets').hover() end)
vim.keymap.set({ 'n', 'v' }, '<Leader>dp', function() require('dap.ui.widgets').preview() end)
vim.keymap.set('n', '<Leader>dd', function()
local widgets = require('dap.ui.widgets')
widgets.centered_float(widgets.frames)
end)
vim.keymap.set('n', '<Leader>ds', function()
local widgets = require('dap.ui.widgets')
widgets.centered_float(widgets.scopes)
end)
local builtin = require('telescope.builtin')
require('leap').add_default_mappings()
require('lualine').setup { options = {
component_separators = { left = '', right = '' },
section_separators = { left = '', right = '' },
}, sections = {
lualine_a = { 'branch' },
lualine_b = { 'diff', 'diagnostics' },
lualine_c = { 'filename' },
lualine_x = { '', '', '' },
lualine_y = { '' },
lualine_z = { 'searchcount' },
} }
require('telescope').setup {
pickers = {
buffers = {
mappings = {
i = { ["<c-d>"] = "delete_buffer" },
n = { ["d"] = "delete_buffer" },
}
}
}
}
require('telescope').load_extension('fzf')
vim.keymap.set('n', 'gr', '<cmd>Telescope lsp_references<CR>', { noremap = false, silent = true })
vim.keymap.set('n', '<leader>S', '<cmd>Telescope lsp_workspace_symbols<CR>', { noremap = false, silent = true })
vim.keymap.set('n', '<leader>ff', builtin.find_files, {})
vim.keymap.set('n', '<leader>fl', builtin.live_grep, {})
vim.keymap.set('n', '<leader>fg', builtin.git_files, {})
vim.keymap.set('n', '<leader>fb', builtin.buffers, {})
vim.keymap.set('n', '<leader>fd', builtin.diagnostics, {})
vim.keymap.set('n', '<leader>fk', builtin.keymaps, {})
vim.keymap.set('n', '<leader>fh', builtin.help_tags, {})
require 'neogit'.setup { integrations = { diffview = true }, use_telescope = true }
require 'nvim-treesitter.configs'.setup {
ensure_installed = { "c", "lua", "cpp", "cmake", "rust", "gdscript", "meson", "toml" },
textobjects = {
lsp_interop = {
enable = true,
border = 'none',
floating_preview_opts = {},
peek_definition_code = {
["<leader>df"] = "@function.outer",
["<leader>dF"] = "@class.outer",
},
},
move = {
enable = true,
set_jumps = true, -- whether to set jumps in the jumplist
goto_next_start = {
["]m"] = "@function.outer",
["]]"] = { query = "@class.outer", desc = "Next class start" },
["]o"] = "@loop.*",
["]s"] = { query = "@scope", query_group = "locals", desc = "Next scope" },
["]z"] = { query = "@fold", query_group = "folds", desc = "Next fold" },
},
goto_next_end = {
["]M"] = "@function.outer",
["]["] = "@class.outer",
},
goto_previous_start = {
["[m"] = "@function.outer",
["[["] = "@class.outer",
},
goto_previous_end = {
["[M"] = "@function.outer",
["[]"] = "@class.outer",
},
goto_next = {
["]d"] = "@conditional.outer",
},
goto_previous = {
["[d"] = "@conditional.outer",
}
},
swap = {
enable = true,
swap_next = {
["<leader>a"] = "@parameter.inner",
},
swap_previous = {
["<leader>A"] = "@parameter.inner",
},
},
select = {
enable = true,
lookahead = true,
keymaps = {
["af"] = "@function.outer",
["if"] = "@function.inner",
["ac"] = "@class.outer",
["ic"] = { query = "@class.inner", desc = "Select inner part of a class region" },
["as"] = { query = "@scope", query_group = "locals", desc = "Select language scope" },
},
selection_modes = {
['@parameter.outer'] = 'v', -- charwise
['@function.outer'] = 'V', -- linewise
['@class.outer'] = '<c-v>', -- blockwise
},
include_surrounding_whitespace = true,
},
},
highlight = {
enable = true,
additional_vim_regex_highlighting = false,
},
}
require('gitsigns').setup {
word_diff = true,
on_attach = function(bufnr)
local gs = package.loaded.gitsigns
local function map(mode, l, r, opts)
opts = opts or {}
opts.buffer = bufnr
vim.keymap.set(mode, l, r, opts)
end
map('n', '<leader>hj', function()
if vim.wo.diff then return ']c' end
vim.schedule(function() gs.next_hunk() end)
return '<Ignore>'
end, { expr = true })
map('n', '<leader>hk', function()
if vim.wo.diff then return '[c' end
vim.schedule(function() gs.prev_hunk() end)
return '<Ignore>'
end, { expr = true })
vim.keymap.set('n', '<leader>hs', gs.stage_hunk)
vim.keymap.set('n', '<leader>hr', gs.reset_hunk)
vim.keymap.set('v', '<leader>hs', function() gs.stage_hunk { vim.fn.line('.'), vim.fn.line('v') } end)
vim.keymap.set('v', '<leader>hr', function() gs.reset_hunk { vim.fn.line('.'), vim.fn.line('v') } end)
vim.keymap.set('n', '<leader>hS', gs.stage_buffer)
vim.keymap.set('n', '<leader>hu', gs.undo_stage_hunk)
vim.keymap.set('n', '<leader>hR', gs.reset_buffer)
vim.keymap.set('n', '<leader>hp', gs.preview_hunk)
vim.keymap.set('n', '<leader>hb', function() gs.blame_line { full = true } end)
vim.keymap.set('n', '<leader>hd', gs.diffthis)
vim.keymap.set('n', '<leader>hD', function() gs.diffthis('~') end)
-- Text object
vim.keymap.set({ 'o', 'x' }, 'ih', ':<C-U>Gitsigns select_hunk<CR>')
end
}
local lsp_zero = require('lsp-zero')
lsp_zero.on_attach(function(client, bufnr)
-- see :help lsp-zero-keybindings
-- to learn the available actions
lsp_zero.default_keymaps({ buffer = bufnr })
end)
require('mason').setup({})
require('mason-lspconfig').setup({
ensure_installed = { "lua_ls", "rust_analyzer", "clangd" },
handlers = {
lsp_zero.default_setup,
lua_ls = function()
local lua_opts = lsp_zero.nvim_lua_ls()
require('lspconfig').lua_ls.setup(lua_opts)
require('lspconfig').lua_ls.setup({
on_attach = function(client, bufnr)
vim.lsp.inlay_hint(bufnr, true)
end,
settings = {
Lua = {
hint = {
enable = true,
},
},
},
})
end,
}
})
require 'cmp'.setup({
snippet = {
expand = function(args)
require('luasnip').lsp_expand(args.body) -- For `luasnip` users.
end,
},
mapping = {
['<CR>'] = require 'cmp'.mapping.confirm({ select = false }),
['<C-Space>'] = require 'cmp'.mapping.complete(),
['<C-u>'] = require 'cmp'.mapping.scroll_docs(-4),
['<C-d>'] = require 'cmp'.mapping.scroll_docs(4),
},
sources = require 'cmp'.config.sources({ { name = 'path' }, { name = 'nvim_lsp' }, { name = 'buffer' },
{ name = 'luasnip' }, { name = 'nvim_lsp_signature_help' }
}),
})
require 'cmp'.setup.cmdline({ '/', '?' }, {
mapping = require 'cmp'.mapping.preset.cmdline(),
sources = {
{ name = 'buffer' }
}
})
require 'cmp'.setup.cmdline(':', {
mapping = require 'cmp'.mapping.preset.cmdline(),
sources = require 'cmp'.config.sources({
{ name = 'path' }
}, {
{ name = 'cmdline' }
})
})
require 'lspconfig'.clangd.setup { cmd = { "clangd",
"--background-index",
"--clang-tidy",
"--all-scopes-completion",
"--completion-style=detailed",
"--header-insertion-decorators",
"--header-insertion=never" } }
vim.keymap.set('n', '<space>e', '<cmd>lua vim.diagnostic.open_float()<CR>', { noremap = false, silent = true })
vim.keymap.set("x", "<leader>vp", [["_dP]])
vim.keymap.set({ "n", "v" }, "<leader>vd", [["_d]])
vim.keymap.set({ "n", "v" }, "<leader>p", [["+p]])
vim.keymap.set({ "n", "v" }, "<leader>P", [["+P]])
vim.keymap.set({ "n", "v" }, "<leader>y", [["+y]])
vim.keymap.set({ "n", "v" }, "<leader>Y", [["+Y]])
vim.keymap.set("n", "<leader>s", [[:%s/\<<C-r><C-w>\>/<C-r><C-w>/gI<Left><Left><Left>]])
vim.g.rainbow_delimiters = {
strategy = {
[''] = require 'rainbow-delimiters'.strategy['global'],
vim = require 'rainbow-delimiters'.strategy['local'],
},
query = { [''] = 'rainbow-delimiters', lua = 'rainbow-blocks', },
highlight = {
'RainbowDelimiterRed', 'RainbowDelimiterYellow', 'RainbowDelimiterBlue', 'RainbowDelimiterOrange',
'RainbowDelimiterGreen', 'RainbowDelimiterViolet', 'RainbowDelimiterCyan', },
}
local signs = { Error = " ", Warn = " ", Hint = " ", Info = " " }
for type, icon in pairs(signs) do
local hl = "DiagnosticSign" .. type
vim.fn.sign_define(hl, { text = icon, texthl = hl, numhl = hl })
end
vim.fn.sign_define('DapBreakpoint', { text = '⚫', texthl = 'red', linehl = '', numhl = '' })
local highlight = {
"RainbowRed",
"RainbowYellow",
"RainbowBlue",
"RainbowOrange",
"RainbowGreen",
"RainbowViolet",
"RainbowCyan",
}
local hooks = require "ibl.hooks"
-- create the highlight groups in the highlight setup hook, so they are reset
-- every time the colorscheme changes
hooks.register(hooks.type.HIGHLIGHT_SETUP, function()
vim.api.nvim_set_hl(0, "RainbowRed", { fg = "#E06C75" })
vim.api.nvim_set_hl(0, "RainbowYellow", { fg = "#E5C07B" })
vim.api.nvim_set_hl(0, "RainbowBlue", { fg = "#61AFEF" })
vim.api.nvim_set_hl(0, "RainbowOrange", { fg = "#D19A66" })
vim.api.nvim_set_hl(0, "RainbowGreen", { fg = "#98C379" })
vim.api.nvim_set_hl(0, "RainbowViolet", { fg = "#C678DD" })
vim.api.nvim_set_hl(0, "RainbowCyan", { fg = "#56B6C2" })
end)
vim.g.rainbow_delimiters = { highlight = highlight }
require("ibl").setup { scope = { highlight = highlight } }
hooks.register(hooks.type.SCOPE_HIGHLIGHT, hooks.builtin.scope_highlight_from_extmark)
vim.api.nvim_create_autocmd('LspAttach', {
once = true,
callback = function(ev)
if vim.lsp.get_client_by_id(ev.data.client_id).server_capabilities.inlayHintProvider then
vim.lsp.inlay_hint(0, true)
end
end,
})Oh btw i use neovim nightly from AUR to be able to use dropbar.nvim plugin and new inlay hint feature:
https://aur.archlinux.org/packages/neovim-nightly-bin
Output of nvim --version :
NVIM v0.10.0-dev-3af59a4
Build type: RelWithDebInfo
LuaJIT 2.1.1695653777
Run "nvim -V1 -v" for more info
Thanks (I just meant the config of statuscol.nvim in text instead of printscreen). Could reproduce the error which helped reveal the typo fixed in 47c0768 (issue only revealed itself with more than 2 sign segments).
thx it's been solved. however small issue appered, both git changes & additions are same color which is confusing:
Screencast.from.2023-10-07.03-03-49.webm
but i think its related to gitsign itself. Thanks anyway ❤️
I think the issue is with statuscol.nvim, and the extmark sign implementation specifically. The highlight groups appear correctly when disabling the statuscolumn (:set stc=). I'll look into it.
Though I'm not sure anything can be done about it. Legacy signs are defined and distinguishable by their name, and thus statuscol.nvim can assign it's appropriate highlight group when placing the sign.
Extmark signs are not distinguishable by anything other than the sign text itself, so if you use the same sign text for the added and modified gitsign they will have the same highlight group currently.
Again not sure it can be avoided, this is just a drawback of extmark signs imo. Your best bet might be to just rely on legacy signs as long as gitsigns supports it (_extmark_signs = false).
Perhaps I lied, been a while since I worked on this plugin. I think the above is only true for clicking the signs. I see no reason why we can't (and apparently don't always currently) distinguish the signs when placing them, and thus with the proper highlight group. I'll look into it tomorrow.
Should be fixed, thanks for reporting.
thx solved
@luukvbaal it would be good to update README according to changes in gitsigns. I spent more than hour on bisecting my config and guessing where (and when) the issue happened. Maybe this will save someone else time.
What do you think should be added? The README contains all the necessary information regarding extmark signs.
Sorry, it's my mistake. I was referring to an example that existed elsewhere. Nonetheless, knowledge about the way of displaying signs used by concrete version of gitsings seems to be not obvious for a user that does not track commits of gitsigns.