fix: updated deprecated vim.diagnostic.disable to vim.diagnostic.enable - #122
Open
b0o wants to merge 1 commit into
Open
fix: updated deprecated vim.diagnostic.disable to vim.diagnostic.enable#122b0o wants to merge 1 commit into
b0o wants to merge 1 commit into
Conversation
|
Neovim v0.12 got released recently. Please let's merge this if it solves the issue? It's happening to me regularly now. |
RLovelett
added a commit
to RLovelett/dotfiles
that referenced
this pull request
Apr 14, 2026
Adds akinsho/git-conflict.nvim, lazy-loaded on BufReadPre. Default
mappings are disabled in favor of buffer-local keymaps registered
under <leader>g only when a conflict is detected, and removed on
resolution. This keeps the mappings out of non-conflict buffers.
Diagnostics are disabled per-buffer on conflict detection and
re-enabled on resolution. This works around a git-conflict.nvim
incompatibility with the Neovim 0.10+ diagnostic API
(vim.diagnostic.enable(false, { bufnr }) vs the deprecated
vim.diagnostic.disable(bufnr)). Both the autocmd workaround and the
note in the keybind setup should be removed once
akinsho/git-conflict.nvim#122 is merged.
Dracula theme overrides are added for all GitConflict highlight groups
(Current, Incoming, Ancestor, and their Label variants) using the
existing palette: cyan/green/orange for the three conflict sides,
selection/visual for the background tiers.
samhed
approved these changes
May 23, 2026
samhed
left a comment
samhed
left a comment
There was a problem hiding this comment.
Works well, could we get this merged?
|
I just moved on, you should too |
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
3 participants
Add this suggestion to a batch that can be applied as a single commit.This suggestion is invalid because no changes were made to the code.Suggestions cannot be applied while the pull request is closed.Suggestions cannot be applied while viewing a subset of changes.Only one suggestion per line can be applied in a batch.Add this suggestion to a batch that can be applied as a single commit.Applying suggestions on deleted lines is not supported.You must change the existing code in this line in order to create a valid suggestion.Outdated suggestions cannot be applied.This suggestion has been applied or marked resolved.Suggestions cannot be applied from pending reviews.Suggestions cannot be applied on multi-line comments.Suggestions cannot be applied while the pull request is queued to merge.Suggestion cannot be applied right now. Please check back later.
Fixes #119