From fd2a3fb4a7e6bbbd24b84808e90172fb31b9e2e1 Mon Sep 17 00:00:00 2001 From: xiaoshihou Date: Sat, 15 Mar 2025 12:37:34 +0000 Subject: [PATCH] fix: deprecated API in 0.10 --- lua/git-conflict.lua | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/lua/git-conflict.lua b/lua/git-conflict.lua index 7e22434..a3fa6ca 100644 --- a/lua/git-conflict.lua +++ b/lua/git-conflict.lua @@ -652,7 +652,7 @@ function M.setup(user_config) pattern = 'GitConflictDetected', callback = function() local bufnr = api.nvim_get_current_buf() - if config.disable_diagnostics then vim.diagnostic.disable(bufnr) end + if config.disable_diagnostics then vim.diagnostic.enable(false, { bufnr = bufnr }) end if config.default_mappings then setup_buffer_mappings(bufnr) end end, }) @@ -662,7 +662,7 @@ function M.setup(user_config) pattern = 'GitConflictResolved', callback = function() local bufnr = api.nvim_get_current_buf() - if config.disable_diagnostics then vim.diagnostic.enable(bufnr) end + if config.disable_diagnostics then vim.diagnostic.enable(true, { bufnr = bufnr }) end if config.default_mappings then clear_buffer_mappings(bufnr) end end, })